aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-04-06 19:13:48 +0200
committerWillem Jan Palenstijn2013-04-06 20:31:34 +0200
commitda3583f5691ba45be7b82ac3930cf0fc36e938f0 (patch)
tree1b05ef9cd0eb0bc2cff1713d2e4377a50b067e78 /engines/sci/sound
parent5a2ef39335291fb7408a5552cda4ea0fcea292c0 (diff)
downloadscummvm-rg350-da3583f5691ba45be7b82ac3930cf0fc36e938f0.tar.gz
scummvm-rg350-da3583f5691ba45be7b82ac3930cf0fc36e938f0.tar.bz2
scummvm-rg350-da3583f5691ba45be7b82ac3930cf0fc36e938f0.zip
SCI: Revert "Clarify comment from rev 5654e12 further"
This reverts commit 9f74a6eda2355bb09b9b963be41509ed67016a6c.
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/soundcmd.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 65dcf575ad..54c602c731 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -398,15 +398,10 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) {
musicSlot->fadeStep = volume > musicSlot->fadeTo ? -5 : 5;
musicSlot->fadeTickerStep = argv[2].toUint16() * 16667 / _music->soundGetTempo();
musicSlot->fadeTicker = 0;
-
- if (argc == 5) {
- // TODO: We currently treat this argument as a boolean, but may
- // have to handle different non-zero values differently. (e.g.,
- // some KQ6 scripts pass 3 here)
- musicSlot->stopAfterFading = (argv[4].toUint16() != 0);
- } else {
- musicSlot->stopAfterFading = false;
- }
+ // TODO: We handle this as a bit field (i.e. containing values 0 and 1),
+ // but some games pass other values here as well (e.g. some KQ6 scripts
+ // pass 3 here)
+ musicSlot->stopAfterFading = (argc == 5) ? (argv[4].toUint16() != 0) : false;
// WORKAROUND/HACK: In the labyrinth in KQ6, when falling in the pit and
// lighting the lantern, the game scripts perform a fade in of the game