*Merge.

--HG--
branch : trunk

1 files changed, 0 insertions, 19 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index cdc78ca41a5..c90effba476 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1287,25 +1287,6 @@ float Map::GetVmapHeight(float x, float y, float z, bool useMaps) const
 
 uint16 Map::GetAreaFlag(float x, float y, float z) const
 {
-	float mapHeight;
-	float vmapHeight;
-	if (useMaps)
-	{
-		mapHeight = GetHeight(x, y, z, false);
-		if (fabs(mapHeight - z) < 0.1)
-			return mapHeight;
-	}
-	else
-		mapHeight = INVALID_HEIGHT;
-	VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
-	if (vmgr->isLineOfSightCalcEnabled())
-		bool result = vmgr->getObjectHitPos(GetId(), x, y, z + 2.0f, x, y, mapHeight, x, y, vmapHeight, 0);
-	else
-		return INVALID_HEIGHT;
-	return vmapHeight;
-}
-
-{
     //local x,y coords
     float lx,ly;
     int gx,gy;