[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.225,1.226

kirben kirben at users.sourceforge.net
Thu Jul 7 02:54:44 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23397/scumm

Modified Files:
	script.cpp 
Log Message:

Add patch:
1233352 - Fix hanging descheduled entry/exit scripts


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- script.cpp	24 Jun 2005 15:23:14 -0000	1.225
+++ script.cpp	7 Jul 2005 09:52:04 -0000	1.226
@@ -820,8 +820,8 @@
 		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 @@
 		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);
 	}





More information about the Scummvm-git-logs mailing list