Merge pull request #414 from hackgrid/fix-sound-mapping
translation mapping for all sounds (fix #405)
This commit is contained in:
commit
438e45895a
|
@ -198,7 +198,6 @@ void cutsceneRunnerStartStep(struct CutsceneRunner* runner) {
|
||||||
break;
|
break;
|
||||||
case CutsceneStepTypeQueueSound:
|
case CutsceneStepTypeQueueSound:
|
||||||
{
|
{
|
||||||
step->queueSound.soundId = mapLocaleSound(step->queueSound.soundId);
|
|
||||||
cutsceneQueueSoundInChannel(step->queueSound.soundId, step->queueSound.volume * (1.0f / 255.0f), step->queueSound.channel, step->queueSound.subtitleId);
|
cutsceneQueueSoundInChannel(step->queueSound.soundId, step->queueSound.volume * (1.0f / 255.0f), step->queueSound.channel, step->queueSound.subtitleId);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -709,6 +708,8 @@ void cutsceneSerializeRead(struct Serializer* serializer) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void cutsceneQueueSoundInChannel(int soundId, float volume, int channel, int subtitleId) {
|
void cutsceneQueueSoundInChannel(int soundId, float volume, int channel, int subtitleId) {
|
||||||
|
soundId = mapLocaleSound(soundId);
|
||||||
|
|
||||||
if (!gCutsceneSoundQueues[channel] && !soundPlayerIsPlaying(gCutsceneCurrentSound[channel]) && channel == CH_GLADOS) {
|
if (!gCutsceneSoundQueues[channel] && !soundPlayerIsPlaying(gCutsceneCurrentSound[channel]) && channel == CH_GLADOS) {
|
||||||
cutsceneQueueSound(soundsIntercom[0], volume, channel, subtitleId);
|
cutsceneQueueSound(soundsIntercom[0], volume, channel, subtitleId);
|
||||||
}
|
}
|
||||||
|
@ -725,4 +726,4 @@ int cutsceneIsSoundQueued(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return soundQueued;
|
return soundQueued;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue