diff --git a/CDefHandler.cpp b/CDefHandler.cpp index fd1e6e699..afe59e836 100644 Binary files a/CDefHandler.cpp and b/CDefHandler.cpp differ diff --git a/int3.h b/int3.h index 0eeae9a8c..1a1b219e1 100644 --- a/int3.h +++ b/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 (zspriteh->giveDef("TSHRC.DEF"); - partialHide = CGameInfo::mainObj->sspriteh->giveDef("TSHRE.DEF"); + partialHide = CGameInfo::mainObj->spriteh->giveDef("TSHRE.DEF"); for(int i=0; iourImages.size(); ++i) { diff --git a/mapHandler.h b/mapHandler.h index 1d2fabd6b..639be955c 100644 --- a/mapHandler.h +++ b/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 > visibility; //true means that pointed place is visible std::vector< std::vector > undVisibility; //true means that pointed place is visible