aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Management
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-03-03 15:39:19 +0100
committerShauren <shauren.trinity@gmail.com>2018-03-25 19:28:36 +0300
commit8f53ba385474e51b4e2ebf29e33d7661a2848669 (patch)
tree2c3a2ee08d085b096996fdfd349097b151e783f6 /src/common/Collision/Management
parent3743d042017d72435d2ff8135f66808988beaf9e (diff)
Core/Phasing: Rewrite GetTerrainMapId
Diffstat (limited to 'src/common/Collision/Management')
-rw-r--r--src/common/Collision/Management/IVMapManager.h2
-rw-r--r--src/common/Collision/Management/VMapManager2.cpp9
-rw-r--r--src/common/Collision/Management/VMapManager2.h2
3 files changed, 0 insertions, 13 deletions
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
index 922549f53da..cec5657f5ed 100644
--- a/src/common/Collision/Management/IVMapManager.h
+++ b/src/common/Collision/Management/IVMapManager.h
@@ -94,8 +94,6 @@ namespace VMAP
*/
virtual bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const=0;
virtual bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const=0;
-
- virtual int32 GetDistanceToClosestPrimaryTile(uint32 mapId, int32 x, int32 y) const = 0;
};
}
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index 9e5955b8794..ae8052c83c4 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -306,15 +306,6 @@ namespace VMAP
return false;
}
- int32 VMapManager2::GetDistanceToClosestPrimaryTile(uint32 mapId, int32 x, int32 y) const
- {
- auto instanceTree = GetMapTree(mapId);
- if (instanceTree != iInstanceMapTrees.end())
- return instanceTree->second->GetDistanceToClosestPrimaryTile(x, y);
-
- return std::numeric_limits<int32>::max();
- }
-
WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename)
{
//! Critical section, thread safe access to iLoadedModelFiles
diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index fb23f6e239f..5bb556ccf64 100644
--- a/src/common/Collision/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
@@ -123,8 +123,6 @@ namespace VMAP
bool getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const override;
bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const override;
- int32 GetDistanceToClosestPrimaryTile(uint32 mapId, int32 x, int32 y) const override;
-
WorldModel* acquireModelInstance(const std::string& basepath, const std::string& filename);
void releaseModelInstance(const std::string& filename);