diff options
| author | Johannes Schickel | 2006-03-08 21:21:56 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-03-08 21:21:56 +0000 |
| commit | f5efc8b1696400061a202db614ca02f8a4a8d391 (patch) | |
| tree | f2501725bf2153b02b58f28c92fc72d119a96a93 /engines | |
| parent | 39c9af43ae06814ee8298e7cf91c736a0dafccc8 (diff) | |
| download | scummvm-rg350-f5efc8b1696400061a202db614ca02f8a4a8d391.tar.gz scummvm-rg350-f5efc8b1696400061a202db614ca02f8a4a8d391.tar.bz2 scummvm-rg350-f5efc8b1696400061a202db614ca02f8a4a8d391.zip | |
Commits patch #1437774 ("KYRA1: Game will crash if bitmap is missing").
svn-id: r21146
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/resource.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index f801cdeffd..ff6349a930 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -336,6 +336,7 @@ void KyraEngine::loadBitmap(const char *filename, int tempPage, int dstPage, uin 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); |