aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2009-12-27 18:24:48 +0000
committerMartin Kiewitz2009-12-27 18:24:48 +0000
commit3b30b1dcfa8ec4017157b661ff2a52e558cc6c5f (patch)
tree2330114e354d7c2c82b2693033769bcdf622e189 /engines
parent3e915d9ec5b7b57d1d1914f18946a60bd4c93529 (diff)
downloadscummvm-rg350-3b30b1dcfa8ec4017157b661ff2a52e558cc6c5f.tar.gz
scummvm-rg350-3b30b1dcfa8ec4017157b661ff2a52e558cc6c5f.tar.bz2
scummvm-rg350-3b30b1dcfa8ec4017157b661ff2a52e558cc6c5f.zip
SCI/newmusic: fix getting of mastervolume. cause of rounding we will otherwise decrease mastervolume by 1 on every access resulting in no sound after a while :) (fixes lb2, sq4cd and others)
svn-id: r46654
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sfx/music.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp
index 9da4b2acbf..1931bf8757 100644
--- a/engines/sci/sfx/music.cpp
+++ b/engines/sci/sfx/music.cpp
@@ -478,8 +478,7 @@ void SciMusic::soundPause(MusicEntry *pSnd) {
//---------------------------------------------
uint16 SciMusic::soundGetMasterVolume() {
- return _pMixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) * 0xF
- / Audio::Mixer::kMaxMixerVolume;
+ return (_pMixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) + 8) * 0xF / Audio::Mixer::kMaxMixerVolume;
}
//---------------------------------------------
void SciMusic::soundSetMasterVolume(uint16 vol) {