[Scummvm-cvs-logs] SF.net SVN: scummvm: [24575] scummvm/trunk/engines/scumm

kirben at users.sourceforge.net kirben at users.sourceforge.net
Mon Oct 30 02:53:25 CET 2006


Revision: 24575
          http://svn.sourceforge.net/scummvm/?rev=24575&view=rev
Author:   kirben
Date:     2006-10-29 17:53:19 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
Fix bug #771499 - ZAK: Lotto numbers never picked. The freezeCount isn't checked in runScriptNested(), when restarting script in SCUMM 1/2.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/script_v2.cpp

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-10-29 22:19:13 UTC (rev 24574)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-10-30 01:53:19 UTC (rev 24575)
@@ -346,7 +346,8 @@
 		// stopped in the meantime, and if it did not already move on.
 		slot = &vm.slot[nest->slot];
 		if (slot->number == nest->number && slot->where == nest->where &&
-				slot->status != ssDead && slot->freezeCount == 0) {
+				slot->status != ssDead && (slot->freezeCount == 0 ||
+				_game.version <= 2)) {
 			_currentScript = nest->slot;
 			getScriptBaseAddress();
 			getScriptEntryPoint();

Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp	2006-10-29 22:19:13 UTC (rev 24574)
+++ scummvm/trunk/engines/scumm/script_v2.cpp	2006-10-30 01:53:19 UTC (rev 24575)
@@ -1174,14 +1174,6 @@
 
 	script = getVarOrDirectByte(PARAM_1);
 
-	if (_game.id == GID_ZAK && _roomResource == 7 && vm.slot[_currentScript].number == 10001) {
-	// FIXME: Nasty hack for bug #771499
-	// Don't let the exit script for room 7 stop the buy script (24), when
-	// switching to the number selection keypad (script 15)
-		if ((script == 24) && isScriptRunning(15))
-			return;
-	}
-
 	if (_game.id == GID_MANIAC && _roomResource == 26 && vm.slot[_currentScript].number == 10001) {
 	// FIXME: Nasty hack for bug #915575
 	// Don't let the exit script for room 26 stop the script (116), when


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list