[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.293,2.294 script_v72he.cpp,2.157,2.158 script_v80he.cpp,2.49,2.50 script_v90he.cpp,2.82,2.83

[Travis Howell]

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

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

Match opcode names with SCUMM8.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.293
retrieving revision 2.294
diff -u -d -r2.293 -r2.294
--- intern.h	5 Oct 2004 05:52:48 -0000	2.293
+++ intern.h	8 Oct 2004 07:13:13 -0000	2.294
@@ -730,8 +730,8 @@
 	void o72_unknown50();
 	void o72_findObjectWithClassOf();
 	void o72_wordArrayInc();
-	void o72_objectX();
-	void o72_objectY();
+	void o72_getObjectImageX();
+	void o72_getObjectImageY();
 	void o72_unknown56();
 	void o72_getTimer();
 	void o72_setTimer();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -d -r2.157 -r2.158
--- script_v72he.cpp	8 Oct 2004 00:37:29 -0000	2.157
+++ script_v72he.cpp	8 Oct 2004 07:13:13 -0000	2.158
@@ -150,8 +150,8 @@
 		OPCODE(o72_findObjectWithClassOf),
 		OPCODE(o72_wordArrayInc),
 		/* 54 */
-		OPCODE(o72_objectX),
-		OPCODE(o72_objectY),
+		OPCODE(o72_getObjectImageX),
+		OPCODE(o72_getObjectImageY),
 		OPCODE(o72_unknown56),
 		OPCODE(o6_wordVarDec),
 		/* 58 */
@@ -753,7 +753,7 @@
 	writeArray(var, 0, base, readArray(var, 0, base) - 1);
 }
 
-void ScummEngine_v72he::o72_objectX() {
+void ScummEngine_v72he::o72_getObjectImageX() {
 	int object = pop();
 	int objnum = getObjectIndex(object);
 
@@ -766,7 +766,7 @@
 }
 
 
-void ScummEngine_v72he::o72_objectY() {
+void ScummEngine_v72he::o72_getObjectImageY() {
 	int object = pop();
 	int objnum = getObjectIndex(object);
 

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- script_v80he.cpp	5 Oct 2004 05:52:48 -0000	2.49
+++ script_v80he.cpp	8 Oct 2004 07:13:13 -0000	2.50
@@ -149,8 +149,8 @@
 		OPCODE(o72_findObjectWithClassOf),
 		OPCODE(o72_wordArrayInc),
 		/* 54 */
-		OPCODE(o72_objectX),
-		OPCODE(o72_objectY),
+		OPCODE(o72_getObjectImageX),
+		OPCODE(o72_getObjectImageY),
 		OPCODE(o72_unknown56),
 		OPCODE(o6_wordVarDec),
 		/* 58 */

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -d -r2.82 -r2.83
--- script_v90he.cpp	6 Oct 2004 10:13:05 -0000	2.82
+++ script_v90he.cpp	8 Oct 2004 07:13:13 -0000	2.83
@@ -149,8 +149,8 @@
 		OPCODE(o72_findObjectWithClassOf),
 		OPCODE(o72_wordArrayInc),
 		/* 54 */
-		OPCODE(o72_objectX),
-		OPCODE(o72_objectY),
+		OPCODE(o72_getObjectImageX),
+		OPCODE(o72_getObjectImageY),
 		OPCODE(o72_unknown56),
 		OPCODE(o6_wordVarDec),
 		/* 58 */