Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Maps: make sure that the grid of the terrain map's parent is loaded when entering terrainswaped zones. This fixes loading vmaps and mmaps for terrain swapped maps

Browse Source
This commit is contained in:
Ovahlord committed 2019-01-26 11:29:10 +01:00
1 parent c66c472023
commit c94c6ab72c
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Maps/Map.cpp
+6 -2
View File
@@ -2430,8 +2430,12 @@ GridMap* Map::GetGrid(uint32 mapId, float x, float y)
GridMap* grid = GridMaps[gx][gy];
auto childMapItr = std::find_if(m_childTerrainMaps->begin(), m_childTerrainMaps->end(), [mapId](Map* childTerrainMap) { return childTerrainMap->GetId() == mapId; });
if (childMapItr != m_childTerrainMaps->end() && (*childMapItr)->GridMaps[gx][gy] && (*childMapItr)->GridMaps[gx][gy]->fileExists())
grid = (*childMapItr)->GridMaps[gx][gy];
if (childMapItr != m_childTerrainMaps->end())
{
(*childMapItr)->EnsureGridCreated(GridCoord((MAX_NUMBER_OF_GRIDS - 1) - gx, (MAX_NUMBER_OF_GRIDS - 1) - gy));
if ((*childMapItr)->GridMaps[gx][gy]->fileExists())
grid = (*childMapItr)->GridMaps[gx][gy];
}
return grid;
}