aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-07-07 09:52:04 +0000
committerTravis Howell2005-07-07 09:52:04 +0000
commit56b766f001c6c06fa0dc5a0daf6e102446ffeb96 (patch)
treea140081ee45037f98a262bc2b57a30f280df8909 /scumm
parenta89e9ce188b078c6a45ac0c6dae5ddf3c63eebf1 (diff)
downloadscummvm-rg350-56b766f001c6c06fa0dc5a0daf6e102446ffeb96.tar.gz
scummvm-rg350-56b766f001c6c06fa0dc5a0daf6e102446ffeb96.tar.bz2
scummvm-rg350-56b766f001c6c06fa0dc5a0daf6e102446ffeb96.zip
Add patch:
1233352 - Fix hanging descheduled entry/exit scripts svn-id: r18510
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index ad2e2f0366..96b7952d58 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -820,8 +820,8 @@ void ScummEngine::runExitScript() {
vm.slot[slot].freezeResistant = false;
vm.slot[slot].recursive = false;
vm.slot[slot].freezeCount = 0;
-
vm.slot[slot].delayFrameCount = 0;
+ vm.slot[slot].cycle = 1;
// FIXME: the exit script of room 7 in indy3 only seems to have a size
// and tag not actual data not even a 00 (stop code). Maybe we should
@@ -855,6 +855,7 @@ void ScummEngine::runEntryScript() {
vm.slot[slot].recursive = false;
vm.slot[slot].freezeCount = 0;
vm.slot[slot].delayFrameCount = 0;
+ vm.slot[slot].cycle = 1;
initializeLocals(slot, 0);
runScriptNested(slot);
}