[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.136,2.137

Travis Howell kirben at users.sourceforge.net
Wed Sep 29 23:58:03 CEST 2004


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

Modified Files:
	script_v72he.cpp 
Log Message:

Change to warnings for now.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.136
retrieving revision 2.137
diff -u -d -r2.136 -r2.137
--- script_v72he.cpp	29 Sep 2004 11:25:21 -0000	2.136
+++ script_v72he.cpp	30 Sep 2004 06:57:18 -0000	2.137
@@ -1532,12 +1532,16 @@
 	const uint8 *dataPtr = getResourceAddress(restype, pwi->resNum);
 	if (dataPtr) {
 		const uint8 *wizh = findWrappedBlock(MKID('WIZH'), dataPtr, pwi->state, 0);
-		assert(wizh);
+		if (!wizh) {
+			warning("WIZH not found");
+			return 0;
+		}
 		uint32 comp   = READ_LE_UINT32(wizh + 0x0);
 		uint32 width  = READ_LE_UINT32(wizh + 0x4);
 		uint32 height = READ_LE_UINT32(wizh + 0x8);
 		if (comp != 1) {
 			warning("%d has invalid compression type %d", pwi->resNum, comp);
+			return 0;
 		}
 		const uint8 *wizd = findWrappedBlock(MKID('WIZD'), dataPtr, pwi->state, 0);
 		assert(wizd);





More information about the Scummvm-git-logs mailing list