[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.108,1.109

[Max Horn]

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

Modified Files:
	object.cpp 
Log Message:
work around nexus crash (only in old savegames?)

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- object.cpp	28 May 2003 20:01:44 -0000	1.108
+++ object.cpp	30 May 2003 00:40:58 -0000	1.109
@@ -205,7 +205,13 @@
 			ptr = getResourceAddress(rtRoom, _roomResource);
 			ptr += od->OBIMoffset;
 		}
-		assert(ptr);
+		if (!ptr) {
+			// FIXME: We used to assert here, but it seems that in the nexus
+			// in The Dig, this can happen, at least with old savegames, and
+			// it's safe to continue...
+			warning("getObjectXYPos: Can't find object %d", object);
+			return;
+		}
 		imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
 		if (_features & GF_AFTER_V8) {
 			x = od->x_pos + (int32)READ_LE_UINT32(&imhd->v8.hotspot[state].x);