aboutsummaryrefslogtreecommitdiff
path: root/sword2/logic.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-12-14 16:33:27 +0000
committerTorbjörn Andersson2003-12-14 16:33:27 +0000
commit4420b15d9f59227cc57bb60d5b38c73639437a62 (patch)
tree0516b8935d48adc82ea6d758e154af1b75fcbc44 /sword2/logic.h
parentce04dd9f7e77fe1c31eb14aebde2f69c16d33684 (diff)
downloadscummvm-rg350-4420b15d9f59227cc57bb60d5b38c73639437a62.tar.gz
scummvm-rg350-4420b15d9f59227cc57bb60d5b38c73639437a62.tar.bz2
scummvm-rg350-4420b15d9f59227cc57bb60d5b38c73639437a62.zip
Mostly cleanups, but I believe this also fixes an endian problem in the
"restart script" opcode. To actually verify this, though, I'd need to find a case where any other script than script 0 at offset 0 is restarted... svn-id: r11638
Diffstat (limited to 'sword2/logic.h')
-rw-r--r--sword2/logic.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/sword2/logic.h b/sword2/logic.h
index 8a2dfbab86..86d67df318 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -30,6 +30,8 @@
namespace Sword2 {
+#define STACK_SIZE 10
+
#define MAX_events 10
// There won't be many, will there? Probably 2 at most i reckon
@@ -59,14 +61,6 @@ private:
// Set this to turn debugging on
bool _debugFlag;
- typedef int32 (Logic::*OpcodeProc)(int32 *);
- struct OpcodeEntry {
- OpcodeProc proc;
- const char *desc;
- };
-
- const OpcodeEntry *_opcodes;
-
// denotes the res id of the game-object-list in current use
uint32 _currentRunList;
@@ -76,7 +70,6 @@ private:
// each object has one of these tacked onto the beginning
_object_hub *_curObjectHub;
- void setupOpcodes(void);
void processKillList(void);
// Stores resource id of the wav to use as lead-out from smacker
@@ -180,7 +173,6 @@ public:
memset(_eventList, 0, sizeof(_eventList));
memset(_syncList, 0, sizeof(_syncList));
_router = new Router(_vm);
- setupOpcodes();
initStartMenu();
}
@@ -210,8 +202,6 @@ public:
void setGlobalInterpreterVariables(int32 *vars);
int runScript(char *scriptData, char *objectData, uint32 *offset);
- int32 executeOpcode(int op, int32 *params);
-
struct _event_unit {
uint32 id;
uint32 interact_id;