[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.137,1.138

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10391/scumm

Modified Files:
	script_v5.cpp 
Log Message:
Forward-port ZakV2 hacks from 0.5.0 branch


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- script_v5.cpp	24 Jul 2003 17:44:00 -0000	1.137
+++ script_v5.cpp	31 Jul 2003 15:32:57 -0000	1.138
@@ -1303,6 +1303,14 @@
 	// and others. OTOH, it seems to cause a problem in newer games.
 	if (!(_features & GF_SMALL_HEADER) || room != _currentRoom)
 		startScene(room, 0, 0);
+
+        // FIXME: Incredibly nasty evil hack to fix bug #770699 (During meeting
+        // with Guru, script 42 changes between room 0 and room 19 to create
+        // 'some time later' effects. On switching back to room 19, the camera
+        // reverts to 0,0 - Added for 0.5.0, should be fixed properly
+        if (_gameId == GID_ZAK && (vm.slot[_currentScript].number == 42) && (room == 19))
+                setCameraAt(480, 0);
+
 	_fullRedraw = 1;
 }
 
@@ -2130,6 +2138,16 @@
 	int script;
 
 	script = getVarOrDirectByte(0x80);
+
+        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