[Scummvm-cvs-logs] SF.net SVN: scummvm: [24630] scummvm/trunk/engines/agos/script.cpp

[kirben at users.sourceforge.net]

Revision: 24630
          http://svn.sourceforge.net/scummvm/?rev=24630&view=rev
Author:   kirben
Date:     2006-11-05 17:14:26 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
The clear timers script only exists in Simon1

Modified Paths:
--------------
    scummvm/trunk/engines/agos/script.cpp

Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp	2006-11-05 23:58:37 UTC (rev 24629)
+++ scummvm/trunk/engines/agos/script.cpp	2006-11-06 01:14:26 UTC (rev 24630)
@@ -460,7 +460,7 @@
 	// 56: set child2 fr bit
 	SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2);
 	int value = getVarOrByte();
-	if (subObject != NULL && value >= 0x10)
+	if (subObject != NULL && value >= 16)
 		subObject->objectFlags |= (1 << value);
 }
 
@@ -468,7 +468,7 @@
 	// 57: clear child2 fr bit
 	SubObject *subObject = (SubObject *)findChildOfType(getNextItemPtr(), 2);
 	int value = getVarOrByte();
-	if (subObject != NULL && value >= 0x10)
+	if (subObject != NULL && value >= 16)
 		subObject->objectFlags &= ~(1 << value);
 }
 
@@ -927,7 +927,7 @@
 	// 140: clear timers
 	killAllTimers();
 
-	if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2)
+	if (getGameType() == GType_SIMON1)
 		addTimeEvent(3, 160);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.