games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Removed duplicated code.

Browse Source
This commit is contained in:
Frank Zago 2009-10-10 23:46:42 +00:00
parent 044875d500
commit eee726bd32
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/CBitmapHandler.cpp
View File

@ -230,26 +230,9 @@ SDL_Surface * BitmapHandler::loadBitmap(std::string fname, bool setKey)
}
}
}
bitmap_handler_mx.lock();
bitmaph->LOD.seekg(e->offset, std::ios::beg);
if (e->size==0) //file is not compressed
{
pcx = new unsigned char[e->realSize];
bitmaph->LOD.read((char*)pcx, e->realSize);
bitmap_handler_mx.unlock();
}
else
{
unsigned char * pcd = new unsigned char[e->size];
bitmaph->LOD.read((char*)pcd, e->size);
bitmap_handler_mx.unlock();
int res=bitmaph->infs2(pcd,e->size,e->realSize,pcx);
if(res!=0)
{
tlog2<<"an error "<<res<<" occurred while extracting file "<<fname<<std::endl;
}
delete [] pcd;
}
pcx = bitmaph->giveFile(e->nameStr, NULL);
CPCXConv cp;
cp.openPCX((char*)pcx, e->realSize);
SDL_Surface * ret = cp.getSurface();

5
hch/CLodHandler.h
View File

@ -60,13 +60,14 @@ struct Entry
class DLL_EXPORT CLodHandler
{
public:
std::ifstream LOD;
nodrze<Entry> entries;
unsigned int totalFiles;
boost::mutex *mutex;
std::string myDir; //load files from this dir instead of .lod file
public:
nodrze<Entry> entries;
CLodHandler();
~CLodHandler();
int readNormalNr (const unsigned char* bufor, int bytCon, bool cyclic=false); //lod header reading helper