From 9d3ed96738f984132123cba82ba5240fb0aa71f8 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 16 Feb 2004 05:53:17 +0000
Subject: Rename opcode

svn-id: r12914
---
 scumm/intern.h        | 2 +-
 scumm/script_v6.cpp   | 8 ++++----
 scumm/script_v6he.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'scumm')

diff --git a/scumm/intern.h b/scumm/intern.h
index 6a0a0dcf03..a20d529288 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -521,7 +521,7 @@ protected:
 	void o6_pickVarRandom();
 	void o6_getDateTime();
 	void o6_unknownE1();
-	void o6_set_box_set();
+	void o6_setBoxSet();
 	void o6_shuffle();
 
 	byte VAR_VIDEONAME;
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index b2e8256374..216c201f7f 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -334,7 +334,7 @@ void ScummEngine_v6::setupOpcodes() {
 		OPCODE(o6_invalid),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
-		OPCODE(o6_set_box_set),
+		OPCODE(o6_setBoxSet),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -3098,7 +3098,7 @@ void ScummEngine_v6::o6_unknownE1() {
 	push(area);
 }
 
-void ScummEngine_v6::o6_set_box_set() {
+void ScummEngine_v6::o6_setBoxSet() {
 	int arg = pop();
 	const byte *room = getResourceAddress(rtRoom, _roomResource);
 	const byte *boxd = NULL, *boxm = NULL;
@@ -3109,7 +3109,7 @@ void ScummEngine_v6::o6_set_box_set() {
 		boxd = boxds.findNext(MKID('BOXD'));
 
 	if (!boxd)
-		error("ScummEngine_v6::o6_set_box_set: Can't find dboxes for set %d", arg);
+		error("ScummEngine_v6::o6_setBoxSet: Can't find dboxes for set %d", arg);
 
 	dboxSize = READ_BE_UINT32(boxd + 4);
 	byte *matrix = createResource(rtMatrix, 2, dboxSize);
@@ -3122,7 +3122,7 @@ void ScummEngine_v6::o6_set_box_set() {
 		boxm = boxms.findNext(MKID('BOXM'));
 
 	if (!boxm)
-		error("ScummEngine_v6::o6_set_box_set: Can't find mboxes for set %d", arg);
+		error("ScummEngine_v6::o6_setBoxSet: Can't find mboxes for set %d", arg);
 
 	mboxSize = READ_BE_UINT32(boxd + 4);
 	matrix = createResource(rtMatrix, 1, mboxSize);
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 44da63560c..f8ed2965df 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -332,7 +332,7 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_localizeArray),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
-		OPCODE(o6_set_box_set),
+		OPCODE(o6_setBoxSet),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-- 
cgit v1.2.3