[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.134,1.135

Max Horn fingolfin at users.sourceforge.net
Mon May 26 15:38:06 CEST 2003


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

Modified Files:
	script_v6.cpp 
Log Message:
tightened hack condition a bit

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- script_v6.cpp	26 May 2003 01:01:47 -0000	1.134
+++ script_v6.cpp	26 May 2003 22:37:36 -0000	1.135
@@ -1004,7 +1004,7 @@
 		a->startWalkActor(x, y, dir);
 	} else {
 		a2 = derefActorSafe(obj, "o6_walkActorToObj(2)");
-		if (a2 == 0) {
+		if (_gameId == GID_SAMNMAX && a2 == 0) {
 			// FIXME: This is a hack to work around bug #742676 SAM: Fish Farm.
 			// Note quite sure why it happens, though, if it's normal or due to
 			// a bug in the ScummVM code.





More information about the Scummvm-git-logs mailing list