aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMartin Kiewitz2009-12-03 22:32:48 +0000
committerMartin Kiewitz2009-12-03 22:32:48 +0000
commite149a88b990bfad8d65e4780f22435d63e2c1f01 (patch)
treee4fb61cb3c6427aae0076e2168205279685cf1e6 /engines
parentc70a9e2cac5b26440310098a9f04623a1b84247c (diff)
downloadscummvm-rg350-e149a88b990bfad8d65e4780f22435d63e2c1f01.tar.gz
scummvm-rg350-e149a88b990bfad8d65e4780f22435d63e2c1f01.tar.bz2
scummvm-rg350-e149a88b990bfad8d65e4780f22435d63e2c1f01.zip
SCI: Don't call SciMusic for volume changes when using old code
svn-id: r46247
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sfx/soundcmd.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index 352f61c307..3b95ba28e3 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -479,9 +479,11 @@ void SoundCommandParser::cmdMuteSound(reg_t obj, SongHandle handle, int value) {
}
void SoundCommandParser::cmdVolume(reg_t obj, SongHandle handle, int value) {
- if (_argc > 1)
- _music->soundSetMasterVolume(obj.toSint16());
- _acc = make_reg(0, _music->soundGetMasterVolume());
+ #ifndef USE_OLD_MUSIC_FUNCTIONS
+ if (_argc > 1)
+ _music->soundSetMasterVolume(obj.toSint16());
+ _acc = make_reg(0, _music->soundGetMasterVolume());
+ #endif
}
void SoundCommandParser::cmdFadeHandle(reg_t obj, SongHandle handle, int value) {