[Scummvm-cvs-logs] scummvm master -> 6f3c83bd51d6e09321796dc748ce446c4f9878ee

wjp wjp at usecode.org
Sat Apr 6 22:29:56 CEST 2013


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:
6f3c83bd51 SCI: Minor cleanup


Commit: 6f3c83bd51d6e09321796dc748ce446c4f9878ee
    https://github.com/scummvm/scummvm/commit/6f3c83bd51d6e09321796dc748ce446c4f9878ee
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-04-06T13:28:42-07:00

Commit Message:
SCI: Minor cleanup

(Thanks waltervn)

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



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 143a2d5..6fe35be 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:






More information about the Scummvm-git-logs mailing list