From 16a06346aea16ffd6ee84081cedfdb0c75ac0b38 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 23 Jul 2022 19:13:33 +0200
Subject: Core/Maps: Move terrain data handling out of Map class

Partial port of cmangos/mangos-wotlk@ff5232c64809207b5fa59d62e9870f58a36b6f3f
---
 src/common/Collision/Management/MMapManager.cpp | 51 -------------------------
 1 file changed, 51 deletions(-)

(limited to 'src/common/Collision/Management/MMapManager.cpp')

diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index 01e1489825a..ab51cd3e7ba 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -37,7 +37,6 @@ namespace MMAP
 
     void MMapManager::InitializeThreadUnsafe(std::unordered_map<uint32, std::vector<uint32>> const& mapData)
     {
-        childMapData = mapData;
         // the caller must pass the list of all mapIds that will be used in the VMapManager2 lifetime
         for (std::pair<uint32 const, std::vector<uint32>> const& mapId : mapData)
         {
@@ -118,21 +117,6 @@ namespace MMAP
     }
 
     bool MMapManager::loadMap(std::string const& basePath, uint32 mapId, int32 x, int32 y)
-    {
-        if (!loadMapImpl(basePath, mapId, x, y))
-            return false;
-
-        bool success = true;
-        auto childMaps = childMapData.find(mapId);
-        if (childMaps != childMapData.end())
-            for (uint32 childMapId : childMaps->second)
-                if (!loadMapImpl(basePath, childMapId, x, y))
-                    success = false;
-
-        return success;
-    }
-
-    bool MMapManager::loadMapImpl(std::string const& basePath, uint32 mapId, int32 x, int32 y)
     {
         // make sure the mmap is loaded and ready to load tiles
         if (!loadMapData(basePath, mapId))
@@ -227,21 +211,6 @@ namespace MMAP
     }
 
     bool MMapManager::loadMapInstance(std::string const& basePath, uint32 mapId, uint32 instanceId)
-    {
-        if (!loadMapInstanceImpl(basePath, mapId, instanceId))
-            return false;
-
-        bool success = true;
-        auto childMaps = childMapData.find(mapId);
-        if (childMaps != childMapData.end())
-            for (uint32 childMapId : childMaps->second)
-                if (!loadMapInstanceImpl(basePath, childMapId, instanceId))
-                    success = false;
-
-        return success;
-    }
-
-    bool MMapManager::loadMapInstanceImpl(std::string const& basePath, uint32 mapId, uint32 instanceId)
     {
         if (!loadMapData(basePath, mapId))
             return false;
@@ -266,16 +235,6 @@ namespace MMAP
     }
 
     bool MMapManager::unloadMap(uint32 mapId, int32 x, int32 y)
-    {
-        auto childMaps = childMapData.find(mapId);
-        if (childMaps != childMapData.end())
-            for (uint32 childMapId : childMaps->second)
-                unloadMapImpl(childMapId, x, y);
-
-        return unloadMapImpl(mapId, x, y);
-    }
-
-    bool MMapManager::unloadMapImpl(uint32 mapId, int32 x, int32 y)
     {
         // check if we have this map loaded
         MMapDataSet::const_iterator itr = GetMMapData(mapId);
@@ -319,16 +278,6 @@ namespace MMAP
     }
 
     bool MMapManager::unloadMap(uint32 mapId)
-    {
-        auto childMaps = childMapData.find(mapId);
-        if (childMaps != childMapData.end())
-            for (uint32 childMapId : childMaps->second)
-                unloadMapImpl(childMapId);
-
-        return unloadMapImpl(mapId);
-    }
-
-    bool MMapManager::unloadMapImpl(uint32 mapId)
     {
         MMapDataSet::iterator itr = loadedMMaps.find(mapId);
         if (itr == loadedMMaps.end() || !itr->second)
-- 
cgit v1.2.3