[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.71,2.72 script_v2.cpp,2.35,2.36 script_v5.cpp,1.62,1.63

[Max Horn]

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

Modified Files:
	intern.h script_v2.cpp script_v5.cpp 
Log Message:
o5_dummy -> o2_dummy (it's not used by the V5 code at all...)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.71
retrieving revision 2.72
diff -u -d -r2.71 -r2.72
--- intern.h	3 May 2003 15:08:09 -0000	2.71
+++ intern.h	4 May 2003 00:29:51 -0000	2.72
@@ -67,7 +67,6 @@
 	void o5_doSentence();
 	void o5_drawBox();
 	void o5_drawObject();
-	void o5_dummy();
 	void o5_endCutscene();
 	void o5_equalZero();
 	void o5_expression();
@@ -271,6 +270,7 @@
 	void o2_endCutscene();
 	void o2_drawSentence();
 	void o2_delay();
+	void o2_dummy();
 };
 
 class Scumm_v4 : public Scumm_v3 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- script_v2.cpp	4 May 2003 00:26:39 -0000	2.35
+++ script_v2.cpp	4 May 2003 00:29:52 -0000	2.36
@@ -148,7 +148,7 @@
 		OPCODE(o5_add),
 		OPCODE(o2_setBitVar),
 		/* 5C */
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		OPCODE(o2_ifClassOfIs),
 		OPCODE(o2_walkActorTo),
 		OPCODE(o2_ifNotState02),
@@ -166,11 +166,11 @@
 		OPCODE(o5_isScriptRunning),
 		OPCODE(o2_setOwnerOf),
 		OPCODE(o2_subDirect),
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		/* 6C */
 		OPCODE(o2_getObjY),
 		OPCODE(o5_putActorInRoom),
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		OPCODE(o2_ifState04),
 		/* 70 */
 		OPCODE(o5_lights),
@@ -246,7 +246,7 @@
 		OPCODE(o2_notEqualZero),
 		OPCODE(o2_setOwnerOf),
 		OPCODE(o2_addDirect),
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		/* AC */
 		OPCODE(o2_drawSentence),
 		OPCODE(o5_putActorInRoom),
@@ -308,7 +308,7 @@
 		OPCODE(o5_add),
 		OPCODE(o2_setBitVar),
 		/* DC */
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		OPCODE(o2_ifClassOfIs),
 		OPCODE(o2_walkActorTo),
 		OPCODE(o2_ifNotState02),
@@ -326,11 +326,11 @@
 		OPCODE(o5_isScriptRunning),
 		OPCODE(o2_setOwnerOf),
 		OPCODE(o2_subDirect),
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		/* EC */
 		OPCODE(o2_getObjY),
 		OPCODE(o5_putActorInRoom),
-		OPCODE(o5_dummy),
+		OPCODE(o2_dummy),
 		OPCODE(o2_ifState04),
 		/* F0 */
 		OPCODE(o5_lights),
@@ -1184,5 +1184,9 @@
 	o5_breakHere();
 
 	warning("TODO: o2_delay(%d)", delay);
+}
+
+void Scumm_v2::o2_dummy() {
+	warning("o2_dummy invoked (opcode %d)", _opcode);
 }
 

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- script_v5.cpp	3 May 2003 20:49:52 -0000	1.62
+++ script_v5.cpp	4 May 2003 00:29:52 -0000	1.63
@@ -830,10 +830,6 @@
 	error("o5_saveLoadVars not yet implemented");
 }
 
-void Scumm_v5::o5_dummy() {
-	warning("o5_dummy invoked (opcode %d)", _opcode);
-}
-
 void Scumm_v5::o5_expression() {
 	int dst, i;