diff options
Diffstat (limited to 'engines/sword2/sword2.cpp')
| -rw-r--r-- | engines/sword2/sword2.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 3cdab2bd2b..b3b688771a 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -326,18 +326,24 @@ void Sword2Engine::registerDefaultSettings() { } void Sword2Engine::syncSoundSettings() { - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); + bool mute = ConfMan.getBool("mute"); + + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, mute ? 0 : ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : ConfMan.getInt("speech_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, mute ? 0 : ConfMan.getInt("sfx_volume")); setSubtitles(ConfMan.getBool("subtitles")); // Our own settings dialog can mute the music, speech and sound effects // individually. ScummVM's settings dialog has one master mute setting. - if (ConfMan.getBool("mute")) { - ConfMan.setBool("music_mute", true); - ConfMan.setBool("speech_mute", true); - ConfMan.setBool("sfx_mute", true); + if (ConfMan.hasKey("mute")) { + ConfMan.setBool("music_mute", ConfMan.getBool("mute")); + ConfMan.setBool("speech_mute", ConfMan.getBool("mute")); + ConfMan.setBool("sfx_mute", ConfMan.getBool("mute")); + + if (!mute) // it is false + // So remove it in order to let individual volumes work + ConfMan.removeKey("mute", ConfMan.getActiveDomainName()); } _sound->muteMusic(ConfMan.getBool("music_mute")); |