[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.141,2.142 script_v2.cpp,2.230,2.231 script_v5.cpp,1.227,1.228

[Travis Howell]

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

Modified Files:
	intern.h script_v2.cpp script_v5.cpp 
Log Message:

This should fix zak lotto bug correctly.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.141
retrieving revision 2.142
diff -u -d -r2.141 -r2.142
--- intern.h	20 Feb 2004 00:32:29 -0000	2.141
+++ intern.h	22 Feb 2004 16:08:13 -0000	2.142
@@ -289,6 +289,7 @@
 	void o2_setState04();
 	void o2_setState08();
 	void o2_startScript();
+	void o2_stopScript();
 	void o2_subtract();
 	void o2_subIndirect();
 	void o2_switchCostumeSet();

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.230
retrieving revision 2.231
diff -u -d -r2.230 -r2.231
--- script_v2.cpp	15 Jan 2004 19:25:17 -0000	2.230
+++ script_v2.cpp	22 Feb 2004 16:08:13 -0000	2.231
@@ -158,7 +158,7 @@
 		/* 60 */
 		OPCODE(o2_cursorCommand),
 		OPCODE(o2_putActor),
-		OPCODE(o5_stopScript),
+		OPCODE(o2_stopScript),
 		OPCODE(o5_getActorFacing),
 		/* 64 */
 		OPCODE(o2_loadRoomWithEgo),
@@ -318,7 +318,7 @@
 		/* E0 */
 		OPCODE(o2_cursorCommand),
 		OPCODE(o2_putActor),
-		OPCODE(o5_stopScript),
+		OPCODE(o2_stopScript),
 		OPCODE(o5_getActorFacing),
 		/* E4 */
 		OPCODE(o2_loadRoomWithEgo),
@@ -1114,6 +1114,20 @@
 	runScript(script, 0, 0, 0);
 }
 
+void ScummEngine_v2::o2_stopScript() {
+	int script;
+
+	script = getVarOrDirectByte(PARAM_1);
+
+	if (script == 0)
+		script = vm.slot[_currentScript].number;
+
+	if (_currentScript != 0) {
+		if (vm.slot[_currentScript].number == script)
+			stopScript(script);
+	}
+}
+
 void ScummEngine_v2::o2_panCameraTo() {
 	panCameraTo(getVarOrDirectByte(PARAM_1) * 8, 0);
 }

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- script_v5.cpp	22 Feb 2004 15:00:49 -0000	1.227
+++ script_v5.cpp	22 Feb 2004 16:08:13 -0000	1.228
@@ -2308,14 +2308,6 @@
 
 	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)
 		stopObjectCode();
 	else