aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-02-16 05:15:31 +0000
committerTravis Howell2004-02-16 05:15:31 +0000
commit7cc3bc357f8356cff3e300fc0e99d94195323264 (patch)
treedf2252f64e564e0b99c1f9b919178c3d67b5471e /scumm
parent42dd31d9f37ccd8822b9930ec7d460349bc04109 (diff)
downloadscummvm-rg350-7cc3bc357f8356cff3e300fc0e99d94195323264.tar.gz
scummvm-rg350-7cc3bc357f8356cff3e300fc0e99d94195323264.tar.bz2
scummvm-rg350-7cc3bc357f8356cff3e300fc0e99d94195323264.zip
Rename opcode
svn-id: r12913
Diffstat (limited to 'scumm')
-rw-r--r--scumm/intern.h2
-rw-r--r--scumm/script_v6.cpp8
-rw-r--r--scumm/script_v6he.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 0b006e8db4..6a0a0dcf03 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_unknownE4();
+ void o6_set_box_set();
void o6_shuffle();
byte VAR_VIDEONAME;
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index f773547023..b2e8256374 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_unknownE4),
+ OPCODE(o6_set_box_set),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
@@ -3098,7 +3098,7 @@ void ScummEngine_v6::o6_unknownE1() {
push(area);
}
-void ScummEngine_v6::o6_unknownE4() {
+void ScummEngine_v6::o6_set_box_set() {
int arg = pop();
const byte *room = getResourceAddress(rtRoom, _roomResource);
const byte *boxd = NULL, *boxm = NULL;
@@ -3109,7 +3109,7 @@ void ScummEngine_v6::o6_unknownE4() {
boxd = boxds.findNext(MKID('BOXD'));
if (!boxd)
- error("ScummEngine_v6::o6_unknownE4: Can't find dboxes for set %d", arg);
+ error("ScummEngine_v6::o6_set_box_set: 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_unknownE4() {
boxm = boxms.findNext(MKID('BOXM'));
if (!boxm)
- error("ScummEngine_v6::o6_unknownE4: Can't find mboxes for set %d", arg);
+ error("ScummEngine_v6::o6_set_box_set: 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 047826cc04..44da63560c 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_unknownE4),
+ OPCODE(o6_set_box_set),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_invalid),