diff options
| author | Johannes Schickel | 2011-03-21 00:30:22 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-04-13 23:48:51 +0200 |
| commit | f61eff4404751ad4bf53e8295ea4d5b77847bbed (patch) | |
| tree | 035cb2cc3998d328e1124498c6b5f9293cef8736 | |
| parent | 507dd88f9c43a8a038da519bdfe2e9b62456e7fe (diff) | |
| download | scummvm-rg350-f61eff4404751ad4bf53e8295ea4d5b77847bbed.tar.gz scummvm-rg350-f61eff4404751ad4bf53e8295ea4d5b77847bbed.tar.bz2 scummvm-rg350-f61eff4404751ad4bf53e8295ea4d5b77847bbed.zip | |
DRACI: Adapt to new muting style.
| -rw-r--r-- | engines/draci/sound.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp index c8646fff67..c1ec235246 100644 --- a/engines/draci/sound.cpp +++ b/engines/draci/sound.cpp @@ -417,15 +417,16 @@ void Sound::setVolume() { } else { _muteSound = _muteVoice = true; } + if (ConfMan.getBool("mute")) { _muteSound = _muteVoice = true; } - const int soundVolume = _muteSound ? 0: ConfMan.getInt("sfx_volume"); - const int speechVolume = _muteVoice ? 0 : ConfMan.getInt("speech_volume"); + _mixer->setMuteForSoundType(Audio::Mixer::kSFXSoundType, _muteSound); + _mixer->setMuteForSoundType(Audio::Mixer::kSpeechSoundType, _muteVoice); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolume); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, speechVolume); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); } } // End of namespace Draci |