Browse Source

Cleanup CDefHandler

AlexVinS 10 years ago
parent
commit
e80c8d16a6
2 changed files with 4 additions and 10 deletions
  1. 0 6
      client/CDefHandler.cpp
  2. 4 4
      client/CDefHandler.h

+ 0 - 6
client/CDefHandler.cpp

@@ -122,12 +122,6 @@ void CDefHandler::openFromMemory(ui8 *table, const std::string & name)
 	}
 }
 
-void CDefHandler::expand(ui8 N,ui8 & BL, ui8 & BR)
-{
-	BL = (N & 0xE0) >> 5;
-	BR = N & 0x1F;
-}
-
 SDL_Surface * CDefHandler::getSprite (int SIndex, const ui8 * FDef, const SDL_Color * palette) const
 {
 	SDL_Surface * ret=nullptr;

+ 4 - 4
client/CDefHandler.h

@@ -85,7 +85,9 @@ private:
 		int group;
 	} ;
 	std::vector<SEntry> SEntries ;
-
+	
+	void openFromMemory(ui8 * table, const std::string & name);	
+	SDL_Surface * getSprite (int SIndex, const ui8 * FDef, const SDL_Color * palette) const;
 public:
 	int width, height; //width and height
 	std::string defName;
@@ -94,9 +96,7 @@ public:
 
 	CDefHandler(); //c-tor
 	~CDefHandler(); //d-tor
-	SDL_Surface * getSprite (int SIndex, const ui8 * FDef, const SDL_Color * palette) const; //saves picture with given number to "testtt.bmp"
-	static void expand(ui8 N,ui8 & BL, ui8 & BR);
-	void openFromMemory(ui8 * table, const std::string & name);
+	
 	CDefEssential * essentialize();
 
 	static CDefHandler * giveDef(const std::string & defName);