[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.428,2.429 script_v100he.cpp,2.116,2.117 script_v90he.cpp,2.219,2.220

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7741/scumm

Modified Files:
	intern.h script_v100he.cpp script_v90he.cpp 
Log Message:

Add opcode for chase, playable now.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.428
retrieving revision 2.429
diff -u -d -r2.428 -r2.429
--- intern.h	9 Apr 2005 06:26:12 -0000	2.428
+++ intern.h	9 Apr 2005 06:39:20 -0000	2.429
@@ -1079,6 +1079,7 @@
 	void o90_mod();
 	void o90_shl();
 	void o90_shr();
+	void o90_xor();
 	void o90_findAllObjectsWithClassOf();
 	void o90_getPolygonOverlap();
 	void o90_cond();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.116
retrieving revision 2.117
diff -u -d -r2.116 -r2.117
--- script_v100he.cpp	9 Apr 2005 06:26:12 -0000	2.116
+++ script_v100he.cpp	9 Apr 2005 06:39:20 -0000	2.117
@@ -54,7 +54,7 @@
 		OPCODE(o6_delayFrames),
 		OPCODE(o90_shl),
 		OPCODE(o90_shr),
-		OPCODE(o6_invalid),
+		OPCODE(o90_xor),
 		/* 0C */
 		OPCODE(o6_setCameraAt),
 		OPCODE(o6_actorFollowCamera),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.219
retrieving revision 2.220
diff -u -d -r2.219 -r2.220
--- script_v90he.cpp	9 Apr 2005 06:26:12 -0000	2.219
+++ script_v90he.cpp	9 Apr 2005 06:39:20 -0000	2.220
@@ -104,7 +104,7 @@
 		OPCODE(o90_mod),
 		OPCODE(o90_shl),
 		OPCODE(o90_shr),
-		OPCODE(o6_invalid),
+		OPCODE(o90_xor),
 		/* 34 */
 		OPCODE(o90_findAllObjectsWithClassOf),
 		OPCODE(o90_getPolygonOverlap),
@@ -1684,6 +1684,11 @@
 	push(pop() >> a);
 }
 
+void ScummEngine_v90he::o90_xor() {
+	int a = pop();
+	push(pop() ^ a);
+}
+
 void ScummEngine_v90he::o90_mod() {
 	int a = pop();
 	if (a == 0)
@@ -1976,7 +1981,7 @@
 	int a1_dim2end = pop();
 	int a1_dim2start = pop();
 
-	push(0);
+	push(1);
 	debug(1,"o90_unknown39 stub array1 %d (%d, %d, %d, %d) array2 %d (%d, %d, %d, %d)", array1, a2_dim2start, a2_dim2end, a2_dim1start, a2_dim1end, array2, a1_dim2start, a1_dim2end, a1_dim1start, a1_dim1end);
 }