diff options
| author | Max Horn | 2009-04-19 01:00:31 +0000 |
|---|---|---|
| committer | Max Horn | 2009-04-19 01:00:31 +0000 |
| commit | 31eeb37107031d36073f6fed460f2ab5ea159da1 (patch) | |
| tree | 8a0a8c1b9fb5abe8405b5bb66cce6f89901dfabf /engines/scumm/script_v2.cpp | |
| parent | b32e9f00b0ba73e26ca170c20dc20832807d1930 (diff) | |
| download | scummvm-rg350-31eeb37107031d36073f6fed460f2ab5ea159da1.tar.gz scummvm-rg350-31eeb37107031d36073f6fed460f2ab5ea159da1.tar.bz2 scummvm-rg350-31eeb37107031d36073f6fed460f2ab5ea159da1.zip | |
SCUMM: Moved ScummEngine_v2::o2_setBoxFlags to ScummEngine_v3::o3_setBoxFlags
svn-id: r40010
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index fcb3878eb4..5a7a3f138a 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -98,7 +98,7 @@ void ScummEngine_v2::setupOpcodes() { OPCODE(0x2e, o2_delay); OPCODE(0x2f, o2_ifNotState04); /* 30 */ - OPCODE(0x30, o2_setBoxFlags); + OPCODE(0x30, o3_setBoxFlags); OPCODE(0x31, o2_getBitVar); OPCODE(0x32, o2_setCameraAt); OPCODE(0x33, o2_roomOps); @@ -258,7 +258,7 @@ void ScummEngine_v2::setupOpcodes() { OPCODE(0xae, o2_waitForMessage); OPCODE(0xaf, o2_ifNotState04); /* B0 */ - OPCODE(0xb0, o2_setBoxFlags); + OPCODE(0xb0, o3_setBoxFlags); OPCODE(0xb1, o2_getBitVar); OPCODE(0xb2, o2_setCameraAt); OPCODE(0xb3, o2_roomOps); @@ -1404,14 +1404,6 @@ void ScummEngine_v2::o2_delay() { o5_breakHere(); } -void ScummEngine_v2::o2_setBoxFlags() { - int a, b; - - a = getVarOrDirectByte(PARAM_1); - b = fetchScriptByte(); - setBoxFlags(a, b); -} - void ScummEngine_v2::o2_setCameraAt() { setCameraAtEx(getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER); } @@ -1595,8 +1587,8 @@ void ScummEngine_v2::o2_getActorWalkBox() { } void ScummEngine_v2::o2_dummy() { - // Opcode 238 is used in maniac and zak but has no purpose - if (_opcode != 238) + // Opcode 0xEE is used in maniac and zak but has no purpose + if (_opcode != 0xEE) warning("o2_dummy invoked (opcode %d)", _opcode); } |