diff options
| author | dhewg | 2011-03-19 15:02:36 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-19 16:04:54 +0100 |
| commit | a42360ce3d32213cf6aa0d0e3057630edd0047d7 (patch) | |
| tree | 8873608b8e6daa92a513bfffdc2502ecdcdbbb86 /engines | |
| parent | dc6c88f3502ba4a4c5c535aff3e03aece4f6ebb5 (diff) | |
| download | scummvm-rg350-a42360ce3d32213cf6aa0d0e3057630edd0047d7.tar.gz scummvm-rg350-a42360ce3d32213cf6aa0d0e3057630edd0047d7.tar.bz2 scummvm-rg350-a42360ce3d32213cf6aa0d0e3057630edd0047d7.zip | |
MADE: Cleanup syncSoundSettings()
And respect global mute settings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/made/made.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/made/made.cpp b/engines/made/made.cpp index 11f7734495..1c8d54aada 100644 --- a/engines/made/made.cpp +++ b/engines/made/made.cpp @@ -146,11 +146,15 @@ MadeEngine::~MadeEngine() { } void MadeEngine::syncSoundSettings() { - _music->setVolume(ConfMan.getInt("music_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); + Engine::syncSoundSettings(); + + bool mute = false; + if (ConfMan.hasKey("mute")) + mute = ConfMan.getBool("mute"); + + _music->setVolume(mute ? 0 : ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, + mute ? 0 : ConfMan.getInt("sfx_volume")); } int16 MadeEngine::getTicks() { |