From 16a06346aea16ffd6ee84081cedfdb0c75ac0b38 Mon Sep 17 00:00:00 2001 From: Shauren 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/server/game/Maps/MapManager.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/server/game/Maps/MapManager.cpp') diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index ae040530b3c..a962cbecac8 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -52,11 +52,6 @@ void MapManager::Initialize() m_updater.activate(num_threads); } -void MapManager::InitializeParentMapData(std::unordered_map> const& mapData) -{ - _parentMapData = mapData; -} - void MapManager::InitializeVisibilityDistanceInfo() { for (auto iter = i_maps.begin(); iter != i_maps.end(); ++iter) @@ -101,13 +96,9 @@ Map* MapManager::CreateBaseMap_i(MapEntry const* mapEntry) else map = new Map(mapEntry->ID, i_gridCleanUpDelay, 0, DIFFICULTY_NONE); - map->DiscoverGridMapFiles(); i_maps[mapEntry->ID] = map; - for (uint32 childMapId : _parentMapData[mapEntry->ID]) - map->AddChildTerrainMap(CreateBaseMap_i(sMapStore.AssertEntry(childMapId))); - if (!mapEntry->Instanceable()) { map->LoadRespawnTimes(); @@ -252,16 +243,6 @@ void MapManager::Update(uint32 diff) void MapManager::DoDelayedMovesAndRemoves() { } -bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) -{ - GridCoord p = Trinity::ComputeGridCoord(x, y); - - int gx = (MAX_NUMBER_OF_GRIDS - 1) - p.x_coord; - int gy = (MAX_NUMBER_OF_GRIDS - 1) - p.y_coord; - - return Map::ExistMap(mapid, gx, gy) && Map::ExistVMap(mapid, gx, gy); -} - bool MapManager::IsValidMAP(uint32 mapId) { return sMapStore.LookupEntry(mapId) != nullptr; -- cgit v1.2.3