From 948c97f31bf9d5c6b80b35739964ec5edcbb3102 Mon Sep 17 00:00:00 2001 From: dhewg Date: Sun, 20 Mar 2011 12:01:27 +0100 Subject: QUEEN: Fix the journal's music volume slider Another regression from b5af1568 --- engines/queen/sound.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'engines/queen') diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 6a9254da81..a34af99ec3 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -192,7 +192,12 @@ Sound *Sound::makeSoundInstance(Audio::Mixer *mixer, QueenEngine *vm, uint8 comp } void Sound::setVolume(int vol) { - _musicVolume = vol; + if (ConfMan.hasKey("mute") && ConfMan.getBool("mute")) + _musicVolume = 0; + else + _musicVolume = vol; + + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _musicVolume); } void Sound::saveState(byte *&ptr) { -- cgit v1.2.3