From d96c5ce81e148764f0f2efe739fc985dec5b630d Mon Sep 17 00:00:00 2001 From: westonCoder Date: Wed, 18 Oct 2023 16:15:36 -0500 Subject: [PATCH] Fixes Sound Slider Issue Fixes #321 --- src/audio/soundplayer.c | 4 ++-- src/menu/audio_options.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audio/soundplayer.c b/src/audio/soundplayer.c index ebb97dd..e11be42 100644 --- a/src/audio/soundplayer.c +++ b/src/audio/soundplayer.c @@ -269,7 +269,7 @@ float soundClipDuration(int soundClipId, float pitch) { return soundPlayerEstimateLength(alSound, pitch); } -void soundPlayerGameVolumeUpdate(enum SoundType type) { +void soundPlayerGameVolumeUpdate() { int index = 0; while (index < gActiveSoundCount) { struct ActiveSound* sound = &gActiveSounds[index]; @@ -279,7 +279,7 @@ void soundPlayerGameVolumeUpdate(enum SoundType type) { } float newVolume = sound->originalVolume * gSaveData.audio.soundVolume/0xFFFF; - if (type == SoundTypeMusic){ + if (sound->soundType == SoundTypeMusic){ newVolume = newVolume* gSaveData.audio.musicVolume/0xFFFF; } diff --git a/src/menu/audio_options.c b/src/menu/audio_options.c index 7f5e4c4..bc2b01a 100644 --- a/src/menu/audio_options.c +++ b/src/menu/audio_options.c @@ -141,11 +141,11 @@ enum MenuDirection audioOptionsUpdate(struct AudioOptions* audioOptions) { switch (audioOptions->selectedItem) { case AudioOptionGameVolume: audioOptionsHandleSlider(audioOptions->selectedItem, &gSaveData.audio.soundVolume, &audioOptions->gameVolume.value); - soundPlayerGameVolumeUpdate(SoundTypeAll); + soundPlayerGameVolumeUpdate(); break; case AudioOptionMusicVolume: audioOptionsHandleSlider(audioOptions->selectedItem, &gSaveData.audio.musicVolume, &audioOptions->musicVolume.value); - soundPlayerGameVolumeUpdate(SoundTypeMusic); + soundPlayerGameVolumeUpdate(); break; case AudioOptionSubtitlesEnabled: if (controllerGetButtonDown(0, A_BUTTON)) {