aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-04-06 22:28:42 +0200
committerWillem Jan Palenstijn2013-04-06 22:28:42 +0200
commit6f3c83bd51d6e09321796dc748ce446c4f9878ee (patch)
treecc3fe3e22fa5491fd1ade2fc3ddf8942324f2b6b
parent1e1cc7309f7ee098f8af8f85b47265676dd2899b (diff)
downloadscummvm-rg350-6f3c83bd51d6e09321796dc748ce446c4f9878ee.tar.gz
scummvm-rg350-6f3c83bd51d6e09321796dc748ce446c4f9878ee.tar.bz2
scummvm-rg350-6f3c83bd51d6e09321796dc748ce446c4f9878ee.zip
SCI: Minor cleanup
(Thanks waltervn)
-rw-r--r--engines/sci/sound/soundcmd.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 143a2d56e1..6fe35be91f 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -407,7 +407,10 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) {
// but SSCI only checks for zero/non-zero. (Verified in KQ6.)
// KQ6 room 460 even passes an object, but treating this as 'true'
// seems fine in that case.
- musicSlot->stopAfterFading = (argc == 5) ? (argv[4].toUint16() != 0) : false;
+ if (argc == 5)
+ musicSlot->stopAfterFading = !argv[4].isNull();
+ else
+ musicSlot->stopAfterFading = false;
break;
default: