[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.204,1.205

Eugene Sandulenko sev at users.sourceforge.net
Mon Feb 14 19:32:55 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31503

Modified Files:
	object.cpp 
Log Message:
Fix crash in updated Russian freddi1.


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- object.cpp	1 Jan 2005 16:09:14 -0000	1.204
+++ object.cpp	15 Feb 2005 03:32:07 -0000	1.205
@@ -760,7 +760,8 @@
 	cdhd = (const CodeHeader *)findResourceData(MKID('CDHD'), searchptr + od->OBCDoffset);
 	if (cdhd == NULL)
 		error("Room %d missing CDHD blocks(s)", _roomResource);
-	imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), room + od->OBIMoffset);
+	if (od->OBIMoffset)
+		imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), room + od->OBIMoffset);
 
 	od->flags = Gdi::dbAllowMaskOr;
 
@@ -806,7 +807,7 @@
 		od->parent = cdhd->v6.parent;
 		od->actordir = cdhd->v6.actordir;
 
-		if (_features & GF_HUMONGOUS)
+		if (_features & GF_HUMONGOUS && imhd)
 			od->flags = ((imhd->old.flags & 1) != 0) ? Gdi::dbAllowMaskOr : 0;
 
 	} else {





More information about the Scummvm-git-logs mailing list