Ticket #4930: sword2_mute.patch

engines/sword2/sword2.cpp

@@ -326 +326 @@
 }
 
 void Sword2Engine::syncSoundSettings() {
+        // Sync the engine with the config manager
+        int soundVolumeMusic = ConfMan.getInt("music_volume");
+        int soundVolumeSFX = ConfMan.getInt("sfx_volume");
+        int soundVolumeSpeech = ConfMan.getInt("speech_volume");
+
+        bool mute = false;
+        if (ConfMan.hasKey("mute"))
+                mute = ConfMan.getBool("mute");
+
         // Sound settings. At the time of writing, not all of these can be set
         // by the global options dialog, but it seems silly to split them up.
-        _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"));
+        _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : soundVolumeMusic));
+        _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, (mute ? 0 : soundVolumeSFX));
+        _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, (mute ? 0 : soundVolumeSpeech));
+
         setSubtitles(ConfMan.getBool("subtitles"));
-        _sound->muteMusic(ConfMan.getBool("music_mute"));
-        _sound->muteSpeech(ConfMan.getBool("speech_mute"));
-        _sound->muteFx(ConfMan.getBool("sfx_mute"));
+
+        _sound->muteMusic((mute ? true : ConfMan.getBool("music_mute")));
+        _sound->muteSpeech((mute ? true : ConfMan.getBool("speech_mute")));
+        _sound->muteFx((mute ? true : ConfMan.getBool("sfx_mute")));
+
         _sound->setReverseStereo(ConfMan.getBool("reverse_stereo"));
 }