[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.16,1.17 script_v5.cpp,1.3,1.4 script_v6.cpp,1.8,1.9 scumm.h,1.88,1.89
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 22 11:15:03 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,NONE,2.1 script_v8.cpp,NONE,2.1 module.mk,1.4,1.5 resource.cpp,1.31,1.32 resource_v2.cpp,1.7,1.8 resource_v3.cpp,1.4,1.5 resource_v4.cpp,1.3,1.4 saveload.cpp,1.34,1.35 script_v5.cpp,1.4,1.5 script_v6.cpp,1.9,1.10 scumm.h,1.89,1.90 scummvm.cpp,2.1,2.2 vars.cpp,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15694
Modified Files:
script.cpp script_v5.cpp script_v6.cpp scumm.h
Log Message:
minor cleanup
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- script.cpp 16 Dec 2002 12:12:31 -0000 1.16
+++ script.cpp 22 Dec 2002 19:14:52 -0000 1.17
@@ -287,28 +287,6 @@
CHECK_HEAP;
}
-void Scumm_v5::executeOpcode(int i)
-{
- OpcodeProcV5 op = _opcodesV5[i].proc;
- (this->*op) ();
-}
-
-const char *Scumm_v5::getOpcodeDesc(int i)
-{
- return _opcodesV5[i].desc;
-}
-
-void Scumm_v6::executeOpcode(int i)
-{
- OpcodeProcV6 op = _opcodesV6[i].proc;
- (this->*op) ();
-}
-
-const char *Scumm_v6::getOpcodeDesc(int i)
-{
- return _opcodesV6[i].desc;
-}
-
byte Scumm::fetchScriptByte()
{
if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- script_v5.cpp 16 Dec 2002 12:12:31 -0000 1.3
+++ script_v5.cpp 22 Dec 2002 19:14:53 -0000 1.4
@@ -162,7 +162,7 @@
OPCODE(o5_getClosestObjActor),
OPCODE(o5_dummy),
/* 68 */
- OPCODE(o5_getScriptRunning),
+ OPCODE(o5_isScriptRunning),
OPCODE(o5_setOwnerOf),
OPCODE(o5_startScript),
OPCODE(o5_debug),
@@ -322,7 +322,7 @@
OPCODE(o5_getClosestObjActor),
OPCODE(o5_dummy),
/* E8 */
- OPCODE(o5_getScriptRunning),
+ OPCODE(o5_isScriptRunning),
OPCODE(o5_setOwnerOf),
OPCODE(o5_startScript),
OPCODE(o5_debug),
@@ -356,6 +356,17 @@
_opcodesV5 = opcodes;
}
+void Scumm_v5::executeOpcode(int i)
+{
+ OpcodeProcV5 op = _opcodesV5[i].proc;
+ (this->*op) ();
+}
+
+const char *Scumm_v5::getOpcodeDesc(int i)
+{
+ return _opcodesV5[i].desc;
+}
+
void Scumm_v5::o5_actorFollowCamera()
{
actorFollowCamera(getVarOrDirectByte(0x80));
@@ -1137,7 +1148,7 @@
setResult(_rnd.getRandomNumber(getVarOrDirectByte(0x80)));
}
-void Scumm_v5::o5_getScriptRunning()
+void Scumm_v5::o5_isScriptRunning()
{
getResultPos();
setResult(isScriptRunning(getVarOrDirectByte(0x80)));
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- script_v6.cpp 22 Dec 2002 04:07:41 -0000 1.8
+++ script_v6.cpp 22 Dec 2002 19:14:53 -0000 1.9
@@ -57,7 +57,7 @@
OPCODE(o6_wordArrayIndexedRead),
/* 0C */
OPCODE(o6_dup),
- OPCODE(o6_zero),
+ OPCODE(o6_not),
OPCODE(o6_eq),
OPCODE(o6_neq),
/* 10 */
@@ -214,7 +214,7 @@
OPCODE(o6_getRandomNumberRange),
OPCODE(o6_invalid),
OPCODE(o6_getActorMoving),
- OPCODE(o6_getScriptRunning),
+ OPCODE(o6_isScriptRunning),
/* 8C */
OPCODE(o6_getActorRoom),
OPCODE(o6_getObjectX),
@@ -364,6 +364,18 @@
_opcodesV6 = opcodes;
}
+
+void Scumm_v6::executeOpcode(int i)
+{
+ OpcodeProcV6 op = _opcodesV6[i].proc;
+ (this->*op) ();
+}
+
+const char *Scumm_v6::getOpcodeDesc(int i)
+{
+ return _opcodesV6[i].desc;
+}
+
void Scumm_v6::o6_setBlastObjectWindow()
{ // Set BOMP processing window
int a, b, c, d;
@@ -508,7 +520,7 @@
push(a);
}
-void Scumm_v6::o6_zero()
+void Scumm_v6::o6_not()
{
push(pop() == 0);
}
@@ -1228,7 +1240,7 @@
push(derefActorSafe(pop(), "o6_getActorMoving")->moving);
}
-void Scumm_v6::o6_getScriptRunning()
+void Scumm_v6::o6_isScriptRunning()
{
push(isScriptRunning(pop()));
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- scumm.h 21 Dec 2002 12:34:16 -0000 1.88
+++ scumm.h 22 Dec 2002 19:14:53 -0000 1.89
@@ -34,8 +34,6 @@
class Dialog;
class ConsoleDialog;
class Scumm;
-class Scumm_v5;
-class Scumm_v6;
class IMuse;
class IMuseDigital;
class Actor;
@@ -45,19 +43,6 @@
class Serializer;
struct FindObjectInRoom;
-typedef void (Scumm_v5::*OpcodeProcV5)();
-typedef void (Scumm_v6::*OpcodeProcV6)();
-
-struct OpcodeEntryV5 {
- OpcodeProcV5 proc;
- const char *desc;
-};
-
-struct OpcodeEntryV6 {
- OpcodeProcV6 proc;
- const char *desc;
-};
-
// Use g_scumm from error() ONLY
extern Scumm *g_scumm;
@@ -1081,6 +1066,12 @@
class Scumm_v5 : public Scumm
{
protected:
+ typedef void (Scumm_v5::*OpcodeProcV5)();
+ struct OpcodeEntryV5 {
+ OpcodeProcV5 proc;
+ const char *desc;
+ };
+
const OpcodeEntryV5 *_opcodesV5;
public:
@@ -1141,7 +1132,7 @@
void o5_getObjectOwner();
void o5_getObjectState();
void o5_getRandomNr();
- void o5_getScriptRunning();
+ void o5_isScriptRunning();
void o5_getVerbEntrypoint();
void o5_ifClassOfIs();
void o5_increment();
@@ -1236,6 +1227,12 @@
class Scumm_v6 : public Scumm
{
protected:
+ typedef void (Scumm_v6::*OpcodeProcV6)();
+ struct OpcodeEntryV6 {
+ OpcodeProcV6 proc;
+ const char *desc;
+ };
+
const OpcodeEntryV6 *_opcodesV6;
public:
@@ -1264,7 +1261,7 @@
void o6_byteArrayIndexedRead();
void o6_wordArrayIndexedRead();
void o6_dup();
- void o6_zero();
+ void o6_not();
void o6_eq();
void o6_neq();
void o6_gt();
@@ -1334,7 +1331,7 @@
void o6_getRandomNumber();
void o6_getRandomNumberRange();
void o6_getActorMoving();
- void o6_getScriptRunning();
+ void o6_isScriptRunning();
void o6_getActorRoom();
void o6_getObjectX();
void o6_getObjectY();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,NONE,2.1 script_v8.cpp,NONE,2.1 module.mk,1.4,1.5 resource.cpp,1.31,1.32 resource_v2.cpp,1.7,1.8 resource_v3.cpp,1.4,1.5 resource_v4.cpp,1.3,1.4 saveload.cpp,1.34,1.35 script_v5.cpp,1.4,1.5 script_v6.cpp,1.9,1.10 scumm.h,1.89,1.90 scummvm.cpp,2.1,2.2 vars.cpp,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list