diff options
| author | Max Horn | 2003-05-19 11:31:35 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-19 11:31:35 +0000 |
| commit | 18a6b5dcc1215902ccd9313f2a0a827e27107061 (patch) | |
| tree | 7f2d86a2cf5a89841e5898b3b2c90a4b47358032 /scumm/scumm.h | |
| parent | 8f2c1e203c6b52ed03753b783b6eab80e460b2d9 (diff) | |
| download | scummvm-rg350-18a6b5dcc1215902ccd9313f2a0a827e27107061.tar.gz scummvm-rg350-18a6b5dcc1215902ccd9313f2a0a827e27107061.tar.bz2 scummvm-rg350-18a6b5dcc1215902ccd9313f2a0a827e27107061.zip | |
renamed ScriptSlot::unk1/unk2 to freezeResistant/recursive
svn-id: r7688
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index b91e67be64..0239590482 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -91,10 +91,11 @@ struct ScriptSlot { int32 delay; uint16 number; uint16 delayFrameCount; + bool freezeResistant, recursive; + bool didexec; byte status; byte where; - byte unk1, unk2, freezeCount; - bool didexec; + byte freezeCount; byte cutsceneOverride; }; @@ -495,7 +496,7 @@ protected: void startManiac(); public: - void runScript(int script, int a, int b, int *lvarptr); + void runScript(int script, bool freezeResistant, bool recursive, int *lvarptr); void stopScriptNr(int script); protected: @@ -698,7 +699,7 @@ protected: int getVerbEntrypoint(int obj, int entry); int getVerbSlot(int id, int mode); void killVerb(int slot); - void runVerbCode(int script, int entry, int a, int b, int *vars); + void runVerbCode(int script, int entry, bool freezeResistant, bool recursive, int *vars); void setVerbObject(uint room, uint object, uint verb); public: |