group startScript/Object codes (no code change)

svn-id: r6180

3 files changed, 25 insertions, 25 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index f26b1fd936..fcf819e313 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -257,7 +257,7 @@ protected:
 	void o6_jump();
 	void o6_startScriptEx();
 	void o6_startScript();
-	void o6_startObject();
+	void o6_startObjectEx();
 	void o6_setObjectState();
 	void o6_setObjectXY();
 	void o6_stopObjectCode();
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index c44477cf01..800405e540 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -163,7 +163,7 @@ void Scumm_v6::setupOpcodes()
 		OPCODE(o6_startScriptEx),
 		OPCODE(o6_startScript),
 		/* 60 */
-		OPCODE(o6_startObject),
+		OPCODE(o6_startObjectEx),
 		OPCODE(o6_setObjectState),
 		OPCODE(o6_setObjectXY),
 		OPCODE(o6_drawBlastObject),
@@ -737,7 +737,7 @@ void Scumm_v6::o6_jumpToScript()
 	getStackList(args, sizeof(args) / sizeof(args[0]));
 	script = pop();
 	flags = pop();
-	o6_stopObjectCode();
+	stopObjectCode();
 	runScript(script, flags & 1, flags & 2, args);
 }
 
@@ -750,7 +750,16 @@ void Scumm_v6::o6_startScript()
 	runScript(script, 0, 0, args);
 }
 
-void Scumm_v6::o6_startObject()
+void Scumm_v6::o6_startScriptQuick()
+{
+	int args[16];
+	int script;
+	getStackList(args, sizeof(args) / sizeof(args[0]));
+	script = pop();
+	runScript(script, 0, 1, args);
+}
+
+void Scumm_v6::o6_startObjectEx()
 {
 	int args[16];
 	int script, entryp;
@@ -762,6 +771,16 @@ void Scumm_v6::o6_startObject()
 	runVerbCode(script, entryp, flags & 1, flags & 2, args);
 }
 
+void Scumm_v6::o6_startObjectQuick()
+{
+	int args[16];
+	int script, entryp;
+	getStackList(args, sizeof(args) / sizeof(args[0]));
+	entryp = pop();
+	script = pop();
+	runVerbCode(script, entryp, 0, 1, args);
+}
+
 void Scumm_v6::o6_setObjectState()
 {
 	int a = pop();
@@ -2328,25 +2347,6 @@ void Scumm_v6::o6_dummy()
 	/* nothing */
 }
 
-void Scumm_v6::o6_startObjectQuick()
-{
-	int args[16];
-	int script, entryp;
-	getStackList(args, sizeof(args) / sizeof(args[0]));
-	entryp = pop();
-	script = pop();
-	runVerbCode(script, entryp, 0, 1, args);
-}
-
-void Scumm_v6::o6_startScriptQuick()
-{
-	int args[16];
-	int script;
-	getStackList(args, sizeof(args) / sizeof(args[0]));
-	script = pop();
-	runScript(script, 0, 1, args);
-}
-
 void Scumm_v6::o6_dim2()
 {
 	int a, b, data;
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 2b1e39c6fb..c98bc8bb12 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -201,7 +201,7 @@ void Scumm_v8::setupOpcodes()
 		OPCODE(o6_stopScript),
 		OPCODE(o6_jumpToScript),		// FIXME - is this right? "O_CHAIN_SCRIPT"
 		OPCODE(o6_dummy),				// FIXME - O_RETURN ? WTF is this, why don't they use the stack?
-		OPCODE(o6_startObject),
+		OPCODE(o6_startObjectEx),
 		/* 80 */
 		OPCODE(o6_stopObjectScript),	// FIXME - is this right?
 		OPCODE(o6_cutscene),
@@ -294,7 +294,7 @@ void Scumm_v8::setupOpcodes()
 		OPCODE(o6_invalid),
 		/* C8 */
 		OPCODE(o6_startScript),	// FIXME - this function returns something in V8 !
-		OPCODE(o6_startObject),
+		OPCODE(o6_startObjectEx),
 		OPCODE(o6_pickOneOf),
 		OPCODE(o6_pickOneOfDefault),
 		/* CC */