games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Reverted r2382; add zvs to the game data (linux); simplified BitmapHandler::loadBitmap().

Browse Source
This commit is contained in:
Frank Zago
2011-09-14 05:27:49 +00:00
parent 479a714dbf
commit 0cfb2deeaf
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/CBitmapHandler.cpp
View File

@@ -203,15 +203,12 @@ SDL_Surface * BitmapHandler::loadBitmapFromLod(CLodHandler *lod, std::string fna
SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
{
if (bitmaph->haveFile(fname, FILE_GRAPHICS))
return loadBitmapFromLod(bitmaph, fname, setKey);
SDL_Surface *bitmap;
if (bitmaph_ab->haveFile(fname, FILE_GRAPHICS))
return loadBitmapFromLod(bitmaph_ab, fname, setKey);
if (!(bitmap = loadBitmapFromLod(bitmaph, fname, setKey)) &&
!(bitmap = loadBitmapFromLod(bitmaph_ab, fname, setKey)) &&
!(bitmap = loadBitmapFromLod(spriteh, fname, setKey)))
tlog1<<"Failed to find file "<<fname<<"\n";
if (spriteh->haveFile(fname, FILE_GRAPHICS))
return loadBitmapFromLod(spriteh, fname, setKey);
tlog1<<"Failed to find file "<<fname<<"\n";
return NULL;
}
return bitmap;
}