aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/sky.cpp
diff options
context:
space:
mode:
authorMax Horn2007-02-10 18:10:55 +0000
committerMax Horn2007-02-10 18:10:55 +0000
commit063e09be0246320124d197db6da3cb1a73245ffe (patch)
tree92bcd7b2e63e3f5cf5a324ec7d7a7f97e5b0b2df /engines/sky/sky.cpp
parenta14e90478c3e45a2fdc8eaf9edb975cf42fc5742 (diff)
downloadscummvm-rg350-063e09be0246320124d197db6da3cb1a73245ffe.tar.gz
scummvm-rg350-063e09be0246320124d197db6da3cb1a73245ffe.tar.bz2
scummvm-rg350-063e09be0246320124d197db6da3cb1a73245ffe.zip
Patch #1656801 (BASS: various control panel fixes), which fixes bug #1548779 (BASS: Control panel inconsistency for FX/Music button texts)
svn-id: r25473
Diffstat (limited to 'engines/sky/sky.cpp')
-rw-r--r--engines/sky/sky.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index dd8c800c29..375f484d8e 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -357,6 +357,9 @@ int SkyEngine::init() {
if (ConfMan.getBool("sfx_mute")) {
SkyEngine::_systemVars.systemFlags |= SF_FX_OFF;
}
+ if (ConfMan.getBool("music_mute")) {
+ SkyEngine::_systemVars.systemFlags |= SF_MUS_OFF;
+ }
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_floppyIntro = ConfMan.getBool("alt_intro");