Merge branch '1.0'

Conflicts:
	src/gui/itempopup.cpp
	src/item.cpp
	src/monster.cpp
	src/net/manaserv/playerhandler.cpp
	src/net/tmwa/partyhandler.cpp
	src/npc.cpp
	src/player.cpp
	src/resources/itemdb.cpp
	src/resources/monsterdb.cpp
	src/resources/monsterinfo.cpp
	src/resources/npcdb.cpp
	src/resources/spritedef.cpp

1 files changed, 6 insertions, 16 deletions

diff --git a/src/map.cpp b/src/map.cpp
index 33bbccb1..f5214420 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -472,25 +472,15 @@ void Map::drawAmbientLayers(Graphics *graphics, LayerType type,
     }
 }
 
-class ContainsGidFunctor
-{
-    public:
-        bool operator() (const Tileset *set) const
-        {
-            return (set->getFirstGid() <= gid &&
-                    gid - set->getFirstGid() < (int)set->size());
-        }
-        int gid;
-} containsGid;
-
 Tileset *Map::getTilesetWithGid(int gid) const
 {
-    containsGid.gid = gid;
-
-    Tilesets::const_iterator i = find_if(mTilesets.begin(), mTilesets.end(),
-            containsGid);
+    Tileset *s = NULL;
+    for (Tilesets::const_iterator it = mTilesets.begin(),
+         it_end = mTilesets.end(); it < it_end && (*it)->getFirstGid() <= gid;
+         it++)
+        s = *it;
 
-    return (i == mTilesets.end()) ? NULL : *i;
+    return s;
 }
 
 void Map::blockTile(int x, int y, BlockType type)