[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.490,2.491 script_c64.cpp,2.2,2.3

[kirben]

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

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

Another difference in C64 maniac.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.490
retrieving revision 2.491
diff -u -d -r2.490 -r2.491
--- intern.h	18 May 2005 15:30:30 -0000	2.490
+++ intern.h	18 May 2005 15:42:35 -0000	2.491
@@ -410,6 +410,7 @@
 	void o_unknown53();
 	void o_cursorCommand();
 	void o_lights();
+	void o_getObjectOwner();
 
 	void o_subtract();
 };

Index: script_c64.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_c64.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- script_c64.cpp	18 May 2005 15:30:31 -0000	2.2
+++ script_c64.cpp	18 May 2005 15:42:35 -0000	2.3
@@ -179,7 +179,7 @@
 		OPCODE(o_lights),
 		OPCODE(o5_getActorCostume),
 		OPCODE(o5_loadRoom),
-		OPCODE(o2_roomOps),
+		OPCODE(o_getObjectOwner),
 		/* 74 */
 		OPCODE(o5_getDist),
 		OPCODE(o2_findObject),
@@ -339,7 +339,7 @@
 		OPCODE(o2_lights),
 		OPCODE(o5_getActorCostume),
 		OPCODE(o5_loadRoom),
-		OPCODE(o2_roomOps),
+		OPCODE(o_getObjectOwner),
 		/* F4 */
 		OPCODE(o5_getDist),
 		OPCODE(o2_findObject),
@@ -470,6 +470,11 @@
 	_fullRedraw = 1;
 }
 
+void ScummEngine_c64::o_getObjectOwner() {
+	getResultPos();
+	setResult(getOwner(getVarOrDirectByte(PARAM_1)));
+}
+
 void ScummEngine_c64::o_subtract() {
 	int a;
 	getResultPos();