thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EMI: better detect tile, thanks klusark and somaen

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-05-09 17:05:16 +02:00
parent 0cf157132a
commit 9c0c7a503d
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/grim/bitmap.cpp
View file

@ -42,14 +42,11 @@ static void decompress_codec3(const char *compressed, char *result);
Bitmap::Bitmap(const char *fname, const char *data, int len) :
Object() {
_fname = fname;
printf("Trying to load %s\n", fname);
if (len < 8 || memcmp(data, "BM F\0\0\0", 8) != 0) {
// Should probably just check the filename
if (loadTile(fname, data, len)){
return;
// Everything is fine
}
else if (gDebugLevel == DEBUG_BITMAPS || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL)
if (len > 4 && memcmp(data, "\x1f\x8b\x08\0", 4) == 0) {
loadTile(fname, data, len);
return;
} else if (len < 8 || memcmp(data, "BM F\0\0\0", 8) != 0) {
if (gDebugLevel == DEBUG_BITMAPS || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL)
error("Invalid magic loading bitmap");
}