Procházet zdrojové kódy

Compile issue fixed - it's temporary solution.

DjWarmonger před 14 roky
rodič
revize
2f4aabca52
2 změnil soubory, kde provedl 2 přidání a 2 odebrání
  1. 1 1
      client/mapHandler.cpp
  2. 1 1
      global.h

+ 1 - 1
client/mapHandler.cpp

@@ -535,7 +535,7 @@ void CMapHandler::terrainRect( int3 top_tile, unsigned char anim, const std::vec
 				static const int notBlittedInPuzzleMode[] = {124};
 
 				//don't print flaggable objects in puzzle mode
-				if(puzzleMode && (obj->isVisitable() || vstd::contains(notBlittedInPuzzleMode, obj->ID)))
+				if(puzzleMode && (obj->isVisitable() || std::find(notBlittedInPuzzleMode, notBlittedInPuzzleMode+1, obj->ID) != notBlittedInPuzzleMode+1)) //?
 					continue;
 
  				SDL_Rect sr2(sr); 

+ 1 - 1
global.h

@@ -431,7 +431,7 @@ namespace vstd
 	template <typename Item, size_t N>
 	bool contains(const Item (&c)[N], const Item &i) //returns true if given array contains item i
 	{
-		return std::find(c, c+N, i) != c+N;
+		return std::find(c, c+N, i) != c+N; //TODO: find out why template is not resolved
 	}
 	template <typename Container1, typename Container2>
 	typename Container2::iterator findFirstNot(Container1 &c1, Container2 &c2)//returns first element of c2 not present in c1