aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
authorMax Horn2002-09-08 01:08:12 +0000
committerMax Horn2002-09-08 01:08:12 +0000
commit523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36 (patch)
tree01c96c7b834d32b05cf33b15b6631614d22da187 /scumm/script.cpp
parent943de561bf51d4e553be44fe612eab94e5c00391 (diff)
downloadscummvm-rg350-523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36.tar.gz
scummvm-rg350-523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36.tar.bz2
scummvm-rg350-523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36.zip
rewrote config class; cleanup; code restructuring
svn-id: r4903
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 7440e783a0..e28fa2395e 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -24,6 +24,7 @@
#include "scumm.h"
#include "actor.h"
#include "resource.h"
+#include "common/util.h"
/* Script status type (slot.status) */
enum {
@@ -70,6 +71,7 @@ void Scumm::runScript(int script, int a, int b, int16 *lvarptr)
s->unk1 = a;
s->unk2 = b;
s->freezeCount = 0;
+
s->delayFrameCount = 0;
initializeLocals(slot, lvarptr);
@@ -621,7 +623,9 @@ void Scumm::runExitScript()
vm.slot[slot].unk1 = 0;
vm.slot[slot].unk2 = 0;
vm.slot[slot].freezeCount = 0;
+
vm.slot[slot].delayFrameCount = 0;
+
runScriptNested(slot);
}
if (_vars[VAR_EXIT_SCRIPT2])