From 0ce5658d669ba6574fff7254ccb508a38b473ae1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 4 May 2003 00:29:52 +0000
Subject: o5_dummy -> o2_dummy (it's not used by the V5 code at all...)

svn-id: r7297
---
 scumm/intern.h      |  2 +-
 scumm/script_v2.cpp | 18 +++++++++++-------
 scumm/script_v5.cpp |  4 ----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'scumm')

diff --git a/scumm/intern.h b/scumm/intern.h
index fb40f2080e..2c729ba213 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -67,7 +67,6 @@ protected:
 	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 @@ protected:
 	void o2_endCutscene();
 	void o2_drawSentence();
 	void o2_delay();
+	void o2_dummy();
 };
 
 class Scumm_v4 : public Scumm_v3 {
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 278aefec82..0def310502 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -148,7 +148,7 @@ void Scumm_v2::setupOpcodes() {
 		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 @@ void Scumm_v2::setupOpcodes() {
 		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 @@ void Scumm_v2::setupOpcodes() {
 		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 @@ void Scumm_v2::setupOpcodes() {
 		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 @@ void Scumm_v2::setupOpcodes() {
 		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),
@@ -1186,3 +1186,7 @@ void Scumm_v2::o2_delay() {
 	warning("TODO: o2_delay(%d)", delay);
 }
 
+void Scumm_v2::o2_dummy() {
+	warning("o2_dummy invoked (opcode %d)", _opcode);
+}
+
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 5f773d7f15..04f0b20ef2 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -830,10 +830,6 @@ void Scumm_v5::o5_saveLoadVars() {
 	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;
 
-- 
cgit v1.2.3