diff options
| author | Martin Kiewitz | 2010-09-01 19:20:17 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-09-01 19:20:17 +0000 |
| commit | 64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a (patch) | |
| tree | 3a04871fa771f61bf48ea4d8afae050e8fc6caa7 /engines/sci/sci.cpp | |
| parent | 4b9a8d8899f3e8946f066e6c8d788f9b45418683 (diff) | |
| download | scummvm-rg350-64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a.tar.gz scummvm-rg350-64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a.tar.bz2 scummvm-rg350-64313cd7f10267c29d7e3b963c7bd0ff2e1c7f1a.zip | |
SCI: set master volume correctly
and merge it together with global volume, fixes bug #3053104)
svn-id: r52484
Diffstat (limited to 'engines/sci/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 57f9b41140..4b5888a245 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -45,6 +45,7 @@ #include "sci/engine/selector.h" // for SELECTOR #include "sci/sound/audio.h" +#include "sci/sound/music.h" #include "sci/sound/soundcmd.h" #include "sci/graphics/animate.h" #include "sci/graphics/cache.h" @@ -678,7 +679,7 @@ void SciEngine::syncSoundSettings() { int soundVolumeMusic = (mute ? 0 : ConfMan.getInt("music_volume")); if (_gamestate && g_sci->_soundCmd) { - int vol = (soundVolumeMusic + 1) * SoundCommandParser::kMaxSciVolume / Audio::Mixer::kMaxMixerVolume; + int vol = (soundVolumeMusic + 1) * MUSIC_MASTERVOLUME_MAX / Audio::Mixer::kMaxMixerVolume; g_sci->_soundCmd->setMasterVolume(vol); } } |