games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

AB campaign selection screen added

Browse Source
This commit is contained in:
beegee1 committed 2011-03-19 14:27:51 +00:00
1 parent 95efcc7cb5
commit fb929fa9b0
8 files changed
+103 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/CBitmapHandler.cpp
+7 -2
View File
@@ -20,6 +20,7 @@
boost::mutex bitmap_handler_mx;
extern DLL_EXPORT CLodHandler *bitmaph;
extern DLL_EXPORT CLodHandler *bitmaph_ab;
void CPCXConv::openPCX(char * PCX, int len)
{
@@ -157,8 +158,12 @@ SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
}
SDL_Surface * ret=NULL;
int size;
unsigned char * file = bitmaph->giveFile(fname, FILE_GRAPHICS, &size);
unsigned char * file = 0;
if (bitmaph->haveFile(fname, FILE_GRAPHICS))
file = bitmaph->giveFile(fname, FILE_GRAPHICS, &size);
else if (bitmaph_ab->haveFile(fname, FILE_GRAPHICS))
file = bitmaph_ab->giveFile(fname, FILE_GRAPHICS, &size);
if (!file)
{
tlog2<<"Entry for file "<<fname<<" was not found"<<std::endl;