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

[kirben at users.sourceforge.net]

Revision: 24553
          http://svn.sourceforge.net/scummvm/?rev=24553&view=rev
Author:   kirben
Date:     2006-10-28 05:33:49 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
Fix sign issues, that caused combat issues in Elvira 1

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

Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp	2006-10-28 11:34:56 UTC (rev 24552)
+++ scummvm/trunk/engines/agos/script.cpp	2006-10-28 12:33:49 UTC (rev 24553)
@@ -243,14 +243,16 @@
 
 void AGOSEngine::o_gt() {
 	// 15: is greater
-	uint tmp = getNextVarContents();
-	setScriptCondition(tmp > getVarOrWord());
+	int16 tmp1 = getNextVarContents();
+	int16 tmp2 = getVarOrWord();
+	setScriptCondition(tmp1 > tmp2);
 }
 
 void AGOSEngine::o_lt() {
 	// 16: is less
-	uint tmp = getNextVarContents();
-	setScriptCondition(tmp < getVarOrWord());
+	int16 tmp1 = getNextVarContents();
+	int16 tmp2 = getVarOrWord();
+	setScriptCondition(tmp1 < tmp2);
 }
 
 void AGOSEngine::o_eqf() {
@@ -267,14 +269,16 @@
 
 void AGOSEngine::o_ltf() {
 	// 19: is greater f
-	uint tmp = getNextVarContents();
-	setScriptCondition(tmp < getNextVarContents());
+	int16 tmp1 = getNextVarContents();
+	int16 tmp2 = getNextVarContents();
+	setScriptCondition(tmp1 < tmp2);
 }
 
 void AGOSEngine::o_gtf() {
 	// 20: is less f
-	uint tmp = getNextVarContents();
-	setScriptCondition(tmp > getNextVarContents());
+	int16 tmp1 = getNextVarContents();
+	int16 tmp2 = getNextVarContents();
+	setScriptCondition(tmp1 > tmp2);
 }
 
 void AGOSEngine::o_chance() {


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