[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.177,1.178

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed Aug 13 14:58:23 CEST 2003


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

Modified Files:
	script_v6.cpp 
Log Message:
Fix for bug #787841 ("SAM: Crash when using retriever on Max"). For
whatever reason, o6_walkActorToObj() was trying to find the coordinates for
an object that was marked as being in the inventory.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- script_v6.cpp	6 Aug 2003 18:20:15 -0000	1.177
+++ script_v6.cpp	13 Aug 2003 16:38:02 -0000	1.178
@@ -998,8 +998,11 @@
 	a = derefActor(act, "o6_walkActorToObj");
 
 	if (obj >= _numActors) {
-		if (whereIsObject(obj) == WIO_NOT_FOUND)
+		int wio = whereIsObject(obj);
+
+		if (wio != WIO_FLOBJECT && wio != WIO_ROOM)
 			return;
+
 		int dir;
 		getObjectXYPos(obj, x, y, dir);
 		a->startWalkActor(x, y, dir);





More information about the Scummvm-git-logs mailing list