Ticket #8412: sky.patch

base/gameDetector.cpp

@@ -144 +144 @@
         ConfMan.registerDefault("platform", Common::kPlatformPC);
         ConfMan.registerDefault("language", "en");
         ConfMan.registerDefault("speech_mute", false);
+        ConfMan.registerDefault("sfx_mute", false);
         ConfMan.registerDefault("subtitles", false);
         ConfMan.registerDefault("boot_param", 0);
         ConfMan.registerDefault("save_slot", -1);

sky/control.cpp

@@ -708 +708 @@
                 pButton->_text = 0x7000 + 86;
                 _statusBar->setToText(0x7000 + 86);
         }
+
+        ConfMan.set("sfx_mute", (SkyEngine::_systemVars.systemFlags & SF_FX_OFF) != 0);
+
         pButton->drawToScreen(WITH_MASK);
         buttonControl(pButton);
         _system->updateScreen();
@@ -731 +734 @@
         }
 
         ConfMan.set("subtitles", (flags & SF_ALLOW_TEXT) != 0);
+        ConfMan.set("speech_mute", (flags & SF_ALLOW_SPEECH) == 0);
 
         SkyEngine::_systemVars.systemFlags |= flags;
 

sky/sky.cpp

@@ -283 +283 @@
         if (!_mixer->isReady())
                 warning("Sound initialisation failed");
 
+        if (ConfMan.getBool("sfx_mute")) {
+                SkyEngine::_systemVars.systemFlags |= SF_FX_OFF;
+        }
          _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
          _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
         _floppyIntro = ConfMan.getBool("alt_intro");
@@ -305 +308 @@
         }
 
         if (isCDVersion()) {
-                _systemVars.systemFlags |= SF_ALLOW_SPEECH;
                 if (ConfMan.hasKey("nosubtitles")) {
                         warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
                         if (!ConfMan.getBool("nosubtitles"))
@@ -314 +316 @@
 
                 if (ConfMan.getBool("subtitles"))
                         _systemVars.systemFlags |= SF_ALLOW_TEXT;
+
+                if (!ConfMan.getBool("speech_mute"))
+                        _systemVars.systemFlags |= SF_ALLOW_SPEECH;
+
         } else
                 _systemVars.systemFlags |= SF_ALLOW_TEXT;