[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.78,2.79 script_v2.cpp,2.47,2.48 script_v5.cpp,1.68,1.69

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32057

Modified Files:
	intern.h script_v2.cpp script_v5.cpp 
Log Message:
unified o?_isEqual, too (but not as nice due to hack)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -d -r2.78 -r2.79
--- intern.h	5 May 2003 09:19:14 -0000	2.78
+++ intern.h	5 May 2003 09:25:05 -0000	2.79
@@ -248,7 +248,6 @@
 	void o2_ifClassOfIs();
 	void o2_walkActorTo();
 	void o2_putActor();
-	void o2_isEqual();
 	void o2_startScript();
 	void o2_panCameraTo();
 	void o2_setActorElevation();

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.47
retrieving revision 2.48
diff -u -d -r2.47 -r2.48
--- script_v2.cpp	5 May 2003 09:19:14 -0000	2.47
+++ script_v2.cpp	5 May 2003 09:25:06 -0000	2.48
@@ -123,7 +123,7 @@
 		OPCODE(o5_increment),
 		OPCODE(o2_setState08),
 		/* 48 */
-		OPCODE(o2_isEqual),
+		OPCODE(o5_isEqual),
 		OPCODE(o5_faceActor),
 		OPCODE(o2_chainScript),
 		OPCODE(o2_setObjY),
@@ -283,7 +283,7 @@
 		OPCODE(o5_decrement),
 		OPCODE(o2_clearState08),
 		/* C8 */
-		OPCODE(o2_isEqual),
+		OPCODE(o5_isEqual),
 		OPCODE(o5_faceActor),
 		OPCODE(o2_chainScript),
 		OPCODE(o2_setObjY),
@@ -773,17 +773,6 @@
 		}
 		break;
 	}
-}
-
-void Scumm_v2::o2_isEqual() {
-	int a = getVar();
-	int b = getVarOrDirectWord(0x80);
-
-	if (b == a)
-		ignoreScriptWord();
-	else
-		o5_jumpRelative();
-
 }
 
 void Scumm_v2::o2_doSentence() {

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- script_v5.cpp	5 May 2003 09:19:15 -0000	1.68
+++ script_v5.cpp	5 May 2003 09:25:07 -0000	1.69
@@ -1212,7 +1212,10 @@
 	int16 a, b;
 	int var;
 
-	var = fetchScriptWord();
+	if (_features & GF_AFTER_V2)
+		var = fetchScriptByte();
+	else
+		var = fetchScriptWord();
 	a = readVar(var);
 	b = getVarOrDirectWord(0x80);