[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.207,1.208
kirben
kirben at users.sourceforge.net
Sat Mar 12 16:04:57 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22942/scumm
Modified Files:
object.cpp
Log Message:
A few extra bits
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- object.cpp 12 Mar 2005 23:59:14 -0000 1.207
+++ object.cpp 13 Mar 2005 00:04:32 -0000 1.208
@@ -174,10 +174,13 @@
int objnum;
objnum = getObjectIndex(object);
- assert(objnum != -1);
+ if (objnum == -1);
+ return 0;
ptr = getOBIMFromObject(_objs[objnum]);
imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
+ if (!imhd)
+ return 0;
if (_version == 8)
return (READ_LE_UINT32(&imhd->v8.image_count));
More information about the Scummvm-git-logs
mailing list