Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #414 from hackgrid/fix-sound-mapping

Browse source 
translation mapping for all sounds (fix #405)
This commit is contained in:
lambertjamesd 2023-11-11 11:38:36 -07:00 committed by GitHub
parent 335bde9482 92ef7a74dc
commit 438e45895a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/levels/cutscene_runner.c
View file

@ -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);
} }