diff options
| author | dhewg | 2011-03-20 12:01:27 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-20 12:01:27 +0100 |
| commit | 948c97f31bf9d5c6b80b35739964ec5edcbb3102 (patch) | |
| tree | bf68b100ee7c4135e4b76561ae7079a9aa3fe1f2 /engines | |
| parent | aee359811d694ea106ba99b63c83687625a276c9 (diff) | |
| download | scummvm-rg350-948c97f31bf9d5c6b80b35739964ec5edcbb3102.tar.gz scummvm-rg350-948c97f31bf9d5c6b80b35739964ec5edcbb3102.tar.bz2 scummvm-rg350-948c97f31bf9d5c6b80b35739964ec5edcbb3102.zip | |
QUEEN: Fix the journal's music volume slider
Another regression from b5af1568
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/queen/sound.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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) { |