Core/Phasing: Rewrite GetTerrainMapId

5 files changed, 0 insertions, 32 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);
 
diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp
index 55ff1711a54..6404c6ce4bb 100644
--- a/src/common/Collision/Maps/MapTree.cpp
+++ b/src/common/Collision/Maps/MapTree.cpp
@@ -242,7 +242,6 @@ namespace VMAP
         TileFileOpenResult result;
         result.Name = basePath + getTileFileName(mapID, tileX, tileY);
         result.File = fopen(result.Name.c_str(), "rb");
-        result.IsPrimary = true;
         if (!result.File)
         {
             int32 parentMapId = vm->getParentMapId(mapID);
@@ -250,7 +249,6 @@ namespace VMAP
             {
                 result.Name = basePath + getTileFileName(parentMapId, tileX, tileY);
                 result.File = fopen(result.Name.c_str(), "rb");
-                result.IsPrimary = false;
             }
         }
 
@@ -372,7 +370,6 @@ namespace VMAP
         }
         iLoadedSpawns.clear();
         iLoadedTiles.clear();
-        iLoadedPrimaryTiles.clear();
     }
 
     //=========================================================
@@ -447,8 +444,6 @@ namespace VMAP
                 }
             }
             iLoadedTiles[packTileID(tileX, tileY)] = true;
-            if (fileResult.IsPrimary)
-                iLoadedPrimaryTiles.emplace_back(tileX, tileY);
             fclose(fileResult.File);
         }
         else
@@ -512,8 +507,6 @@ namespace VMAP
             }
         }
         iLoadedTiles.erase(tile);
-        iLoadedPrimaryTiles.erase(std::remove_if(iLoadedPrimaryTiles.begin(), iLoadedPrimaryTiles.end(),
-            [tileX, tileY](std::pair<uint32, uint32> const& p) { return p.first == tileX && p.second == tileY; }), iLoadedPrimaryTiles.end());
         TC_METRIC_EVENT("map_events", "UnloadMapTile",
             "Map: " + std::to_string(iMapID) + " TileX: " + std::to_string(tileX) + " TileY: " + std::to_string(tileY));
     }
@@ -523,13 +516,4 @@ namespace VMAP
         models = iTreeValues;
         count = iNTreeValues;
     }
-
-    int32 StaticMapTree::GetDistanceToClosestPrimaryTile(int32 x, int32 y) const
-    {
-        int32 minDistance = std::numeric_limits<int32>::max();
-        for (std::pair<int32, int32> const& primaryTile : iLoadedPrimaryTiles)
-            minDistance = std::min(minDistance, (primaryTile.first - x) * (primaryTile.first - x) + (primaryTile.second - y) * (primaryTile.second - y));
-
-        return minDistance;
-    }
 }
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index bf991c547c9..d762f804132 100644
--- a/src/common/Collision/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
@@ -62,7 +62,6 @@ namespace VMAP
             {
                 FILE* File;
                 std::string Name;
-                bool IsPrimary;
             };
 
         private:
@@ -92,8 +91,6 @@ namespace VMAP
             uint32 numLoadedTiles() const { return uint32(iLoadedTiles.size()); }
             void getModelInstances(ModelInstance* &models, uint32 &count);
 
-            int32 GetDistanceToClosestPrimaryTile(int32 x, int32 y) const;
-
         private:
             StaticMapTree(StaticMapTree const& right) = delete;
             StaticMapTree& operator=(StaticMapTree const& right) = delete;