aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/sound.cpp
diff options
context:
space:
mode:
authordhewg2011-03-19 15:07:06 +0100
committerdhewg2011-03-19 16:04:55 +0100
commit2cb664178654e4cbe388bd63ae5bdda62b6640ca (patch)
treee7fe82a5a61b3f357bba237ce2dff49a3679464d /engines/saga/sound.cpp
parentb5af156839c3fc7704e3f49879b8e8dec8e5ece1 (diff)
downloadscummvm-rg350-2cb664178654e4cbe388bd63ae5bdda62b6640ca.tar.gz
scummvm-rg350-2cb664178654e4cbe388bd63ae5bdda62b6640ca.tar.bz2
scummvm-rg350-2cb664178654e4cbe388bd63ae5bdda62b6640ca.zip
SAGA: Cleanup syncSoundSettings()
And respect global mute settings
Diffstat (limited to 'engines/saga/sound.cpp')
-rw-r--r--engines/saga/sound.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 07e8487ee4..8ffce4e6cd 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -175,8 +175,12 @@ void Sound::stopAll() {
}
void Sound::setVolume() {
- _vm->_soundVolume = ConfMan.getInt("sfx_volume");
- _vm->_speechVolume = ConfMan.getInt("speech_volume");
+ bool mute = false;
+ if (ConfMan.hasKey("mute"))
+ mute = ConfMan.getBool("mute");
+
+ _vm->_soundVolume = mute ? 0 : ConfMan.getInt("sfx_volume");
+ _vm->_speechVolume = mute ? 0 : ConfMan.getInt("speech_volume");
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_soundVolume);
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_speechVolume);
}