[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.234,2.235

Travis Howell kirben at users.sourceforge.net
Mon Feb 23 03:29:02 CET 2004


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

Modified Files:
	script_v2.cpp 
Log Message:

Add back hack


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.234
retrieving revision 2.235
diff -u -d -r2.234 -r2.235
--- script_v2.cpp	23 Feb 2004 09:21:22 -0000	2.234
+++ script_v2.cpp	23 Feb 2004 11:15:03 -0000	2.235
@@ -1119,6 +1119,14 @@
 
 	script = getVarOrDirectByte(PARAM_1);
 
+	if ((_gameId == 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),
+	// switching to the number selection keypad (script 15)
+		if ((script == 24) && isScriptRunning(15))
+			return;
+	}
+
 	if (script == 0)
 		script = vm.slot[_currentScript].number;
 





More information about the Scummvm-git-logs mailing list