[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.214,2.215 script_v72he.cpp,2.44,2.45

Travis Howell kirben at users.sourceforge.net
Sat Sep 4 16:59:03 CEST 2004


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

Modified Files:
	intern.h script_v72he.cpp 
Log Message:

Add opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.214
retrieving revision 2.215
diff -u -d -r2.214 -r2.215
--- intern.h	4 Sep 2004 08:13:47 -0000	2.214
+++ intern.h	4 Sep 2004 23:58:14 -0000	2.215
@@ -712,12 +712,13 @@
 	void o72_compareStackList();
 	void o72_unknown1C();
 	void o72_unknown50();
-	void o72_unknown5A();
+	void o72_findObject();
 	void o72_wordArrayInc();
 	void o72_objectX();
 	void o72_objectY();
 	void o72_getTimer();
 	void o72_setTimer();
+	void o72_unknown5A();
 	void o72_wordArrayDec();
 	void o72_startScript();
 	void o72_startObject();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -d -r2.44 -r2.45
--- script_v72he.cpp	4 Sep 2004 09:17:38 -0000	2.44
+++ script_v72he.cpp	4 Sep 2004 23:58:15 -0000	2.45
@@ -148,7 +148,7 @@
 		/* 50 */
 		OPCODE(o72_unknown50),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o72_findObject),
 		OPCODE(o72_wordArrayInc),
 		/* 54 */
 		OPCODE(o72_objectX),
@@ -641,6 +641,16 @@
 	VAR(VAR_OVERRIDE) = 0;
 }
 
+void ScummEngine_v72he::o72_findObject() {
+	int args[16];
+
+	getStackList(args, ARRAYSIZE(args));
+	int y = pop();
+	int x = pop();
+	int r = findObject(x, y);
+	push(r);
+}
+
 void ScummEngine_v72he::o72_wordArrayInc() {
 	int var = fetchScriptWord();
 	int base = pop();





More information about the Scummvm-git-logs mailing list