[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.283,2.284

kirben kirben at users.sourceforge.net
Sun Oct 23 06:35:35 CEST 2005


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

Modified Files:
	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.283
retrieving revision 2.284
diff -u -d -r2.283 -r2.284
--- script_v2.cpp	18 Oct 2005 01:30:21 -0000	2.283
+++ script_v2.cpp	23 Oct 2005 13:34:06 -0000	2.284
@@ -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;





More information about the Scummvm-git-logs mailing list