Index: vcminew/client/CBitmapHandler.cpp
===================================================================
--- vcminew/client/CBitmapHandler.cpp	(.../https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk)	(revision 1391)
+++ vcminew/client/CBitmapHandler.cpp	(.../vcminew)	(working copy)
@@ -148,10 +148,12 @@
 		tlog2 << "Call to loadBitmap with void fname!\n";
 		return NULL;
 	}
-	unsigned char * pcx;
+	unsigned char * pcx;
+	std::string filename=fname;
 	std::transform(fname.begin(),fname.end(),fname.begin(),toupper);
 	fname.replace(fname.find_last_of('.'), fname.find_last_of('.')+4, ".PCX");
-	Entry *e = bitmaph->entries.znajdz(fname);
+	Entry *e = bitmaph->entries.znajdz(fname);
+	fname=filename;
 	if(!e)
 	{
 		tlog2<<"File "<<fname<<" not found"<<std::endl;
@@ -159,24 +161,14 @@
 	}
 	if(e->offset<0)
 	{
-		fname.replace(fname.find_last_of('.'),fname.find_last_of('.')+4,".BMP");
 		fname = DATA_DIR "/Data/" + fname;
 		FILE * f = fopen(fname.c_str(),"r");
-		if(f)
-		{
-			fclose(f);
-			return SDL_LoadBMP(fname.c_str());
-		}
-		else  //file .bmp not present, check .pcx
-		{
-			char sign[3];
-			fname.replace(fname.find_last_of('.'),fname.find_last_of('.')+4,".PCX");
-			f = fopen(fname.c_str(),"r");
 			if(!f)
 			{
 				tlog1 << "Cannot open " << fname << " - not present as bmp nor as pcx.\n";
 				return NULL; 
-			}
+			}
+			char sign[3];
 			fread(sign,1,3,f);
 			if(sign[0]=='B' && sign[1]=='M') //BMP named as PCX - people (eg. Kulex) sometimes use such files
 			{
@@ -202,7 +194,6 @@
 				}
 			}
 		}
-	}
 
 	pcx = bitmaph->giveFile(e->nameStr, NULL);