aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2012-05-31 00:05:05 +1000
committerTravis Howell2012-05-31 00:05:05 +1000
commitde904c59c4bde9060efeb36896f7105f4e286e27 (patch)
treeb89fd38c2c2e6be462679153cb3c4c630ea499dd
parentae31469a9aa7163c4ed42414fbb2c6c95e2d7e8a (diff)
downloadscummvm-rg350-de904c59c4bde9060efeb36896f7105f4e286e27.tar.gz
scummvm-rg350-de904c59c4bde9060efeb36896f7105f4e286e27.tar.bz2
scummvm-rg350-de904c59c4bde9060efeb36896f7105f4e286e27.zip
SCUMM: Fix global script 255 never been resumed by runScriptNested. Thanks to clone2727 for tracking down the problem in baseball2003.
-rw-r--r--engines/scumm/script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 39420ee974..a26c64e690 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -318,7 +318,7 @@ void ScummEngine::runScriptNested(int script) {
nest = &vm.nest[vm.numNestedScripts];
if (_currentScript == 0xFF) {
- nest->number = 0xFF;
+ nest->number = 0;
nest->where = 0xFF;
} else {
// Store information about the currently running script
@@ -338,7 +338,7 @@ void ScummEngine::runScriptNested(int script) {
if (vm.numNestedScripts != 0)
vm.numNestedScripts--;
- if (nest->number != 0xFF) {
+ if (nest->number) {
// Try to resume the script which called us, if its status has not changed
// since it invoked us. In particular, we only resume it if it hasn't been
// stopped in the meantime, and if it did not already move on.