From f61eff4404751ad4bf53e8295ea4d5b77847bbed Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 21 Mar 2011 00:30:22 +0100
Subject: DRACI: Adapt to new muting style.

---
 engines/draci/sound.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines')

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
-- 
cgit v1.2.3