[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.93,1.94 logic.cpp,1.146,1.147

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv15757/queen

Modified Files:
	cutaway.cpp logic.cpp 
Log Message:
only call Logic::executeSpecialMove if asm > 0

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- cutaway.cpp	29 Dec 2003 21:05:33 -0000	1.93
+++ cutaway.cpp	29 Dec 2003 21:31:02 -0000	1.94
@@ -884,7 +884,7 @@
 
 		if (!object.moveToX && 
 				!object.moveToY && 
-				object.specialMove && 
+				object.specialMove > 0 && 
 				object.objectNumber >= 0) {
 			_vm->logic()->executeSpecialMove(object.specialMove);
 			object.specialMove = 0;
@@ -1178,7 +1178,8 @@
 		} // for()
 		
 		int16 specialMove = (int16)READ_BE_UINT16(ptr); ptr += 2;
-		_vm->logic()->executeSpecialMove(specialMove);
+		if (specialMove > 0)
+			_vm->logic()->executeSpecialMove(specialMove);
 
 		_lastSong = (int16)READ_BE_UINT16(ptr); ptr += 2;
 	}

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- logic.cpp	29 Dec 2003 21:05:33 -0000	1.146
+++ logic.cpp	29 Dec 2003 21:31:02 -0000	1.147
@@ -2637,9 +2637,8 @@
 void Logic::executeSpecialMove(uint16 sm) {
 	
 	debug(6, "Special move: %d", sm);
-	if (sm)
-		if (!(this->*_executeASM)(sm))
-			warning("unhandled / invalid special move : %d", sm);
+	if (!(this->*_executeASM)(sm))
+		warning("unhandled / invalid special move : %d", sm);
 }