diff options
author | Jochen Hoenicke | 2003-07-18 18:55:04 +0000 |
---|---|---|
committer | Jochen Hoenicke | 2003-07-18 18:55:04 +0000 |
commit | 077b643ea04188b60c5107610328619cc7f00001 (patch) | |
tree | 0784c23dfd9dfe41de6d53b57c4bcd086a6a52cd /scumm/intern.h | |
parent | dc25058c3e633cf5ac4a369833224d878a05bac4 (diff) | |
download | scummvm-rg350-077b643ea04188b60c5107610328619cc7f00001.tar.gz scummvm-rg350-077b643ea04188b60c5107610328619cc7f00001.tar.bz2 scummvm-rg350-077b643ea04188b60c5107610328619cc7f00001.zip |
Fix recursive calls of object scripts. In V2 for each object two script
can be active at the same time: One 253 script and one normal script.
We misuse the recursive flag to mark 253 scripts. When starting a 253
script we stop a script that has recursive flag set and when starting
a normal script we stop the script that doesn't.
svn-id: r9068
Diffstat (limited to 'scumm/intern.h')
-rw-r--r-- | scumm/intern.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index be7382d01e..1133e84b74 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -217,6 +217,9 @@ protected: void resetSentence(); void setUserState(byte state); + void runObjectScript(int object, int entry, bool freezeResistant, bool recursive, int *vars); + void stopObjectScript(int script, bool recursive); + /* Version 2 script opcodes */ void o2_actorFromPos(); void o2_actorSet(); |