[Scummvm-cvs-logs] scummvm master -> de904c59c4bde9060efeb36896f7105f4e286e27

Kirben kirben at optusnet.com.au
Wed May 30 16:06:06 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
de904c59c4 SCUMM: Fix global script 255 never been resumed by runScriptNested. Thanks to clone2727 for tracking down the problem in


Commit: de904c59c4bde9060efeb36896f7105f4e286e27
    https://github.com/scummvm/scummvm/commit/de904c59c4bde9060efeb36896f7105f4e286e27
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2012-05-30T07:05:05-07:00

Commit Message:
SCUMM: Fix global script 255 never been resumed by runScriptNested. Thanks to clone2727 for tracking down the problem in baseball2003.

Changed paths:
    engines/scumm/script.cpp



diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 39420ee..a26c64e 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.






More information about the Scummvm-git-logs mailing list