[Scummvm-cvs-logs] SF.net SVN: scummvm: [21146] scummvm/trunk/engines/kyra/resource.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Mar 8 13:23:03 CET 2006


Revision: 21146
Author:   lordhoto
Date:     2006-03-08 13:21:56 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21146&view=rev

Log Message:
-----------
Commits patch #1437774 ("KYRA1: Game will crash if bitmap is missing").

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2006-03-08 13:15:13 UTC (rev 21145)
+++ scummvm/trunk/engines/kyra/resource.cpp	2006-03-08 21:21:56 UTC (rev 21146)
@@ -336,6 +336,7 @@
 	debugC( 9, kDebugLevelMain,"KyraEngine::copyBitmap('%s', %d, %d, %p)", filename, tempPage, dstPage, (void *)palData);
 	uint32 fileSize;
 	uint8 *srcData = _res->fileData(filename, &fileSize);
+	assert(srcData);
 	uint8 compType = srcData[2];
 	uint32 imgSize = READ_LE_UINT32(srcData + 4);
 	uint16 palSize = READ_LE_UINT16(srcData + 8);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list