[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.116,1.117

[Torbj?rn Andersson]

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

Modified Files:
	script_v5.cpp 
Log Message:
Hack to avoid bad actor crash in o5_walkActorToActor() when using the camel
in the FOA "wits" path. We have a number of these hacks now...


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- script_v5.cpp	11 Jun 2003 21:45:47 -0000	1.116
+++ script_v5.cpp	13 Jun 2003 17:35:44 -0000	1.117
@@ -2392,6 +2392,16 @@
 		return;
 	}
 
+	if (_gameId == GID_INDY4 && nr == 1 && nr2 == 106 &&
+		dist == 255 && vm.slot[_currentScript].number == 210) {
+		// FIXME: Work around an invalid actor bug when using the
+		// camel in Fate of Atlantis, the "wits" path. The room-65-210
+		// script contains this: walkActorToActor(1,106,255)
+		// Once more this is either a script bug, or there is
+		// some hidden meaning in this odd walk request?
+		return;
+	}
+
 	a = derefActor(nr, "o5_walkActorToActor");
 	if (!a->isInCurrentRoom())
 		return;