thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Moved ScummEngine_v2::o2_setBoxFlags to ScummEngine_v3::o3_setBoxFlags

Browse source 
svn-id: r40010
This commit is contained in:
Max Horn 2009-04-19 01:00:31 +00:00
parent b32e9f00b0
commit 31eeb37107
5 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/scumm/script_v2.cpp
View file

@ -98,7 +98,7 @@ void ScummEngine_v2::setupOpcodes() {
OPCODE(0x2e, o2_delay); OPCODE(0x2e, o2_delay);
OPCODE(0x2f, o2_ifNotState04); OPCODE(0x2f, o2_ifNotState04);
/* 30 */ /* 30 */
OPCODE(0x30, o2_setBoxFlags); OPCODE(0x30, o3_setBoxFlags);
OPCODE(0x31, o2_getBitVar); OPCODE(0x31, o2_getBitVar);
OPCODE(0x32, o2_setCameraAt); OPCODE(0x32, o2_setCameraAt);
OPCODE(0x33, o2_roomOps); OPCODE(0x33, o2_roomOps);
@ -258,7 +258,7 @@ void ScummEngine_v2::setupOpcodes() {
OPCODE(0xae, o2_waitForMessage); OPCODE(0xae, o2_waitForMessage);
OPCODE(0xaf, o2_ifNotState04); OPCODE(0xaf, o2_ifNotState04);
/* B0 */ /* B0 */
OPCODE(0xb0, o2_setBoxFlags); OPCODE(0xb0, o3_setBoxFlags);
OPCODE(0xb1, o2_getBitVar); OPCODE(0xb1, o2_getBitVar);
OPCODE(0xb2, o2_setCameraAt); OPCODE(0xb2, o2_setCameraAt);
OPCODE(0xb3, o2_roomOps); OPCODE(0xb3, o2_roomOps);
@ -1404,14 +1404,6 @@ void ScummEngine_v2::o2_delay() {
o5_breakHere(); o5_breakHere();
} }
void ScummEngine_v2::o2_setBoxFlags() {
int a, b;
a = getVarOrDirectByte(PARAM_1);
b = fetchScriptByte();
setBoxFlags(a, b);
}
void ScummEngine_v2::o2_setCameraAt() { void ScummEngine_v2::o2_setCameraAt() {
setCameraAtEx(getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER); setCameraAtEx(getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER);
} }
@ -1595,8 +1587,8 @@ void ScummEngine_v2::o2_getActorWalkBox() {
} }
void ScummEngine_v2::o2_dummy() { void ScummEngine_v2::o2_dummy() {
// Opcode 238 is used in maniac and zak but has no purpose // Opcode 0xEE is used in maniac and zak but has no purpose
if (_opcode != 238) if (_opcode != 0xEE)
warning("o2_dummy invoked (opcode %d)", _opcode); warning("o2_dummy invoked (opcode %d)", _opcode);
} }

11
engines/scumm/script_v3.cpp
View file

@ -31,6 +31,17 @@ namespace Scumm {
void ScummEngine_v3::setupOpcodes() { void ScummEngine_v3::setupOpcodes() {
ScummEngine_v4::setupOpcodes(); ScummEngine_v4::setupOpcodes();
OPCODE(0x30, o3_setBoxFlags);
OPCODE(0xb0, o3_setBoxFlags);
}
void ScummEngine_v3::o3_setBoxFlags() {
int a, b;
a = getVarOrDirectByte(PARAM_1);
b = fetchScriptByte();
setBoxFlags(a, b);
} }
} // End of namespace Scumm } // End of namespace Scumm

8
engines/scumm/script_v5.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "scumm/actor.h" #include "scumm/actor.h"
#include "scumm/charset.h" #include "scumm/charset.h"
#include "scumm/object.h" #include "scumm/object.h"
@ -1682,13 +1681,6 @@ void ScummEngine_v5::o5_loadRoomWithEgo() {
void ScummEngine_v5::o5_matrixOps() { void ScummEngine_v5::o5_matrixOps() {
int a, b; int a, b;
if (_game.version == 3) {
a = getVarOrDirectByte(PARAM_1);
b = fetchScriptByte();
setBoxFlags(a, b);
return;
}
_opcode = fetchScriptByte(); _opcode = fetchScriptByte();
switch (_opcode & 0x1F) { switch (_opcode & 0x1F) {
case 1: case 1:

1
engines/scumm/scumm_v2.h
View file

@ -143,7 +143,6 @@ protected:
void o2_isLessEqual(); void o2_isLessEqual();
void o2_lights(); void o2_lights();
void o2_loadRoomWithEgo(); void o2_loadRoomWithEgo();
void o2_setBoxFlags();
void o2_panCameraTo(); void o2_panCameraTo();
void o2_pickupObject(); void o2_pickupObject();
void o2_putActor(); void o2_putActor();

3
engines/scumm/scumm_v3.h
View file

@ -62,6 +62,9 @@ protected:
virtual void loadCharset(int no); virtual void loadCharset(int no);
virtual void processKeyboard(Common::KeyState lastKeyHit); virtual void processKeyboard(Common::KeyState lastKeyHit);
/* Version 3 script opcodes */
void o3_setBoxFlags();
}; };
/** /**