[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.8,1.9

Jonathan Gray khalek at users.sourceforge.net
Sun Nov 3 02:34:09 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv4586

Modified Files:
	script.cpp 
Log Message:
hack around what seems to be an empty exit script in indy3 (besides the size and tag) for now, maybe we should be strictly not reading past the size defined in the header of the script?

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- script.cpp	2 Nov 2002 12:21:40 -0000	1.8
+++ script.cpp	3 Nov 2002 10:33:50 -0000	1.9
@@ -626,7 +626,14 @@
 
 		vm.slot[slot].delayFrameCount = 0;
 
-		runScriptNested(slot);
+		// 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 be limiting ourselves to strictly reading the size 
+		// described in the header?
+		if ((_currentRoom == 7) && (_gameId == GID_INDY3_256))
+			printf("skipping specific exit script as its empty, fix properly!\n");
+		else
+			runScriptNested(slot);
 	}
 	if (_vars[VAR_EXIT_SCRIPT2])
 		runScript(_vars[VAR_EXIT_SCRIPT2], 0, 0, 0);





More information about the Scummvm-git-logs mailing list