AlexVinS 9 gadi atpakaļ
vecāks
revīzija
7ca9ab665a
2 mainītis faili ar 9 papildinājumiem un 5 dzēšanām
  1. 8 1
      client/CBitmapHandler.cpp
  2. 1 4
      client/CBitmapHandler.h

+ 8 - 1
client/CBitmapHandler.cpp

@@ -4,7 +4,6 @@
 #include "SDL.h"
 #include "SDL_image.h"
 #include "CBitmapHandler.h"
-#include "CDefHandler.h"
 #include "gui/SDL_Extensions.h"
 #include "../lib/vcmi_endian.h"
 
@@ -18,6 +17,14 @@
  *
  */
 
+
+namespace BitmapHandler
+{
+	SDL_Surface * loadH3PCX(ui8 * data, size_t size);
+
+	SDL_Surface * loadBitmapFromDir(std::string path, std::string fname, bool setKey=true);
+}
+
 bool isPCX(const ui8 *header)//check whether file can be PCX according to header
 {
 	int fSize  = read_le_u32(header + 0);

+ 1 - 4
client/CBitmapHandler.h

@@ -14,9 +14,6 @@ struct SDL_Surface;
 
 namespace BitmapHandler
 {
-	SDL_Surface * loadH3PCX(ui8 * data, size_t size);
-	//Load file from specific LOD
-	SDL_Surface * loadBitmapFromDir(std::string path, std::string fname, bool setKey=true);
-	//Load file from any LODs
+	//Load file from /DATA or /SPRITES
 	SDL_Surface * loadBitmap(std::string fname, bool setKey=true);
 }