[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.282.2.1,2.282.2.2

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	script_v2.cpp 
Log Message:

Add work around for bug:
1252606 - ZAK: crash when trying to fly back to SF


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.282.2.1
retrieving revision 2.282.2.2
diff -u -d -r2.282.2.1 -r2.282.2.2
--- script_v2.cpp	18 Oct 2005 02:11:21 -0000	2.282.2.1
+++ script_v2.cpp	23 Oct 2005 13:34:16 -0000	2.282.2.2
@@ -1104,7 +1104,15 @@
 void ScummEngine_v2::o2_walkActorTo() {
 	int x, y;
 	Actor *a;
-	a = derefActor(getVarOrDirectByte(PARAM_1), "o2_walkActorTo");
+
+	int act = getVarOrDirectByte(PARAM_1);
+
+	// FIXME: Work around for bug #1252606
+	if (_gameId == GID_ZAK && _version == 1 && vm.slot[_currentScript].number == 115 && act == 249) {
+		act = VAR(VAR_EGO);
+	}
+
+	a = derefActor(act, "o2_walkActorTo");
 
 	x = getVarOrDirectByte(PARAM_2) * 8;
 	y = getVarOrDirectByte(PARAM_3) * 2;