[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.81,1.82

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv1418

Modified Files:
	object.cpp 
Log Message:
Fix for 588446 (Zak256: squirrel cave crash)



Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- object.cpp	26 Jul 2002 16:13:04 -0000	1.81
+++ object.cpp	30 Jul 2002 11:43:30 -0000	1.82
@@ -143,8 +143,13 @@
 
 int Scumm::getObjectOrActorXY(int object, int &x, int &y)
 {
-	if (object < NUM_ACTORS)
-		return derefActorSafe(object, "getObjectOrActorXY")->getActorXYPos(x, y);
+	if (object < NUM_ACTORS) {
+		Actor *act = derefActorSafe(object, "getObjectOrActorXY");
+		if (!act) 
+			return 0; 
+		else
+			return act->getActorXYPos(x, y);
+	}
 
 	switch (whereIsObject(object)) {
 	case WIO_NOT_FOUND: