diff options
| author | Sven Hesse | 2010-07-27 17:14:33 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-07-27 17:14:33 +0000 |
| commit | 7424d39a980848e9c6783aae039aae28a4fa2b5a (patch) | |
| tree | 249a59cde3b64f1a245a93b6cbbf7e2ceeeaa9ec /engines/gob | |
| parent | 47f93e9d07e64b8746d9008afb1234744e095914 (diff) | |
| download | scummvm-rg350-7424d39a980848e9c6783aae039aae28a4fa2b5a.tar.gz scummvm-rg350-7424d39a980848e9c6783aae039aae28a4fa2b5a.tar.bz2 scummvm-rg350-7424d39a980848e9c6783aae039aae28a4fa2b5a.zip | |
GOB: Respect mute option on startup (bug #3032781)
svn-id: r51379
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/gob.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index ddeac25baa..f904c8c802 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -126,8 +126,13 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst) { _pauseStart = 0; // Setup mixer - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); + bool muteSFX = ConfMan.getBool("mute") || ConfMan.getBool("sfx_mute"); + bool muteMusic = ConfMan.getBool("mute") || ConfMan.getBool("music_mute"); + + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, + muteSFX ? 0 : ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, + muteMusic ? 0 : ConfMan.getInt("music_volume")); _copyProtection = ConfMan.getBool("copy_protection"); |