2
0
Эх сурвалжийг харах

* handling Def 2 compression (may be a bit buggy)
* small improvement in int3 class

mateuszb 18 жил өмнө
parent
commit
b2d1b4f3e4
4 өөрчлөгдсөн 5 нэмэгдсэн , 5 устгасан
  1. BIN
      CDefHandler.cpp
  2. 3 3
      int3.h
  3. 1 1
      mapHandler.cpp
  4. 1 1
      mapHandler.h

BIN
CDefHandler.cpp


+ 3 - 3
int3.h

@@ -41,11 +41,11 @@ class int3
 		y+=i;
 		z+=i;
 	}	
-	inline bool operator==(const int3 & i)
+	inline bool operator==(const int3 & i) const
 		{return (x==i.x) && (y==i.y) && (z==i.z);}	
-	inline bool operator!=(const int3 & i)
+	inline bool operator!=(const int3 & i) const
 		{return !(*this==i);}
-	inline bool operator<(const int3 & i)
+	inline bool operator<(const int3 & i) const
 	{
 		if (z<i.z)
 			return true;

+ 1 - 1
mapHandler.cpp

@@ -42,7 +42,7 @@ public:
 void CMapHandler::init()
 {
 	fullHide = CGameInfo::mainObj->spriteh->giveDef("TSHRC.DEF");
-	partialHide = CGameInfo::mainObj->sspriteh->giveDef("TSHRE.DEF");
+	partialHide = CGameInfo::mainObj->spriteh->giveDef("TSHRE.DEF");
 
 	for(int i=0; i<partialHide->ourImages.size(); ++i)
 	{

+ 1 - 1
mapHandler.h

@@ -25,7 +25,7 @@ public:
 	SDL_Surface * terrBitmap(int x, int y);
 	SDL_Surface * undTerrBitmap(int x, int y);
 	CDefHandler * fullHide;
-	CSemiDefHandler * partialHide;
+	CDefHandler * partialHide;
 
 	std::vector< std::vector<char> > visibility; //true means that pointed place is visible
 	std::vector< std::vector<char> > undVisibility; //true means that pointed place is visible