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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sun Nov 19 01:38:37 CET 2006


Revision: 24741
          http://svn.sourceforge.net/scummvm/?rev=24741&view=rev
Author:   kirben
Date:     2006-11-18 16:38:37 -0800 (Sat, 18 Nov 2006)

Log Message:
-----------
The script freezeCount isn't used by SCUMM 1/2 games at all

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

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-11-18 21:47:49 UTC (rev 24740)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-11-19 00:38:37 UTC (rev 24741)
@@ -346,8 +346,7 @@
 		// 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 ||
-				_game.version <= 2)) {
+				slot->status != ssDead && slot->freezeCount == 0) {
 			_currentScript = nest->slot;
 			getScriptBaseAddress();
 			getScriptEntryPoint();
@@ -859,7 +858,6 @@
 		for (i = 0; i < NUM_SCRIPT_SLOT; i++) {
 			if (_currentScript != i && vm.slot[i].status != ssDead && !vm.slot[i].freezeResistant) {
 				vm.slot[i].status |= 0x80;
-				vm.slot[i].freezeCount = 1;
 			}
 		}
 		return;
@@ -887,7 +885,6 @@
 	if (_game.version <= 2) {
 		for (i = 0; i < NUM_SCRIPT_SLOT; i++) {
 			vm.slot[i].status &= 0x7F;
-			vm.slot[i].freezeCount = 0;
 		}
 		return;
 	}


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