[Scummvm-cvs-logs] SF.net SVN: scummvm:[40010] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Apr 19 03:00:31 CEST 2009
Revision: 40010
http://scummvm.svn.sourceforge.net/scummvm/?rev=40010&view=rev
Author: fingolfin
Date: 2009-04-19 01:00:31 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
SCUMM: Moved ScummEngine_v2::o2_setBoxFlags to ScummEngine_v3::o3_setBoxFlags
Modified Paths:
--------------
scummvm/trunk/engines/scumm/script_v2.cpp
scummvm/trunk/engines/scumm/script_v3.cpp
scummvm/trunk/engines/scumm/script_v5.cpp
scummvm/trunk/engines/scumm/scumm_v2.h
scummvm/trunk/engines/scumm/scumm_v3.h
Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp 2009-04-19 01:00:11 UTC (rev 40009)
+++ scummvm/trunk/engines/scumm/script_v2.cpp 2009-04-19 01:00:31 UTC (rev 40010)
@@ -98,7 +98,7 @@
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 @@
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 @@
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_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);
}
Modified: scummvm/trunk/engines/scumm/script_v3.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v3.cpp 2009-04-19 01:00:11 UTC (rev 40009)
+++ scummvm/trunk/engines/scumm/script_v3.cpp 2009-04-19 01:00:31 UTC (rev 40010)
@@ -31,6 +31,17 @@
void ScummEngine_v3::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
Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp 2009-04-19 01:00:11 UTC (rev 40009)
+++ scummvm/trunk/engines/scumm/script_v5.cpp 2009-04-19 01:00:31 UTC (rev 40010)
@@ -23,7 +23,6 @@
*
*/
-
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/object.h"
@@ -1682,13 +1681,6 @@
void ScummEngine_v5::o5_matrixOps() {
int a, b;
- if (_game.version == 3) {
- a = getVarOrDirectByte(PARAM_1);
- b = fetchScriptByte();
- setBoxFlags(a, b);
- return;
- }
-
_opcode = fetchScriptByte();
switch (_opcode & 0x1F) {
case 1:
Modified: scummvm/trunk/engines/scumm/scumm_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v2.h 2009-04-19 01:00:11 UTC (rev 40009)
+++ scummvm/trunk/engines/scumm/scumm_v2.h 2009-04-19 01:00:31 UTC (rev 40010)
@@ -143,7 +143,6 @@
void o2_isLessEqual();
void o2_lights();
void o2_loadRoomWithEgo();
- void o2_setBoxFlags();
void o2_panCameraTo();
void o2_pickupObject();
void o2_putActor();
Modified: scummvm/trunk/engines/scumm/scumm_v3.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v3.h 2009-04-19 01:00:11 UTC (rev 40009)
+++ scummvm/trunk/engines/scumm/scumm_v3.h 2009-04-19 01:00:31 UTC (rev 40010)
@@ -62,6 +62,9 @@
virtual void loadCharset(int no);
virtual void processKeyboard(Common::KeyState lastKeyHit);
+
+ /* Version 3 script opcodes */
+ void o3_setBoxFlags();
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list