[Scummvm-cvs-logs] scummvm master -> 9f74a6eda2355bb09b9b963be41509ed67016a6c

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f74a6eda2 SCI: Clarify comment from rev 5654e12 further


Commit: 9f74a6eda2355bb09b9b963be41509ed67016a6c
    https://github.com/scummvm/scummvm/commit/9f74a6eda2355bb09b9b963be41509ed67016a6c
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-04-28T03:03:10-07:00

Commit Message:
SCI: Clarify comment from rev 5654e12 further

Changed paths:
    engines/sci/sound/soundcmd.cpp



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 1be16f1..a2b09ea 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -345,10 +345,15 @@ 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;
-		// 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;
+
+		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;
+		}
 
 		// 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