Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Maps: Fixed loading vmaps and mmaps in instances

Browse Source 
(ported commit b773d9997b)
This commit is contained in:
Ovahlord
2018-05-06 18:47:51 +02:00
parent 0e5be63528
commit cfee8a09a1
15 changed files with 56 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/server/game/Maps/Map.cpp
View File

@@ -172,41 +172,30 @@ void Map::LoadVMap(int gx, int gy)
}
}
void Map::LoadMap(int gx, int gy, bool reload)
void Map::LoadMap(int gx, int gy)
{
LoadMapImpl(this, gx, gy, reload);
LoadMapImpl(this, gx, gy);
for (Map* childBaseMap : *m_childTerrainMaps)
childBaseMap->LoadMap(gx, gy, reload);
childBaseMap->LoadMap(gx, gy);
}
void Map::LoadMapImpl(Map* map, int gx, int gy, bool reload)
void Map::LoadMapImpl(Map* map, int gx, int gy)
{
if (map->i_InstanceId != 0)
{
if (map->GridMaps[gx][gy])
return;
// load grid map for base map
GridCoord ngridCoord = GridCoord((MAX_NUMBER_OF_GRIDS - 1) - gx, (MAX_NUMBER_OF_GRIDS - 1) - gy);
if (!map->m_parentMap->getNGrid(ngridCoord.x_coord, ngridCoord.y_coord))
map->m_parentMap->EnsureGridCreated(ngridCoord);
static_cast<MapInstanced*>(map->m_parentMap)->AddGridMapReference(GridCoord(gx, gy));
map->GridMaps[gx][gy] = map->m_parentMap->GridMaps[gx][gy];
return;
}
if (map->GridMaps[gx][gy] && !reload)
return;
//map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?)
if (map->GridMaps[gx][gy])
{
TC_LOG_DEBUG("maps", "Unloading previously loaded map %u before reloading.", map->GetId());
sScriptMgr->OnUnloadGridMap(map, map->GridMaps[gx][gy], gx, gy);
return;
delete map->GridMaps[gx][gy];
map->GridMaps[gx][gy] = nullptr;
Map* parent = map->m_parentMap;
++parent->GridMapReference[gx][gy];
// load grid map for base map
if (parent != map)
{
GridCoord ngridCoord = GridCoord((MAX_NUMBER_OF_GRIDS - 1) - gx, (MAX_NUMBER_OF_GRIDS - 1) - gy);
if (!parent->GridMaps[gx][gy])
parent->EnsureGridCreated(ngridCoord);
map->GridMaps[gx][gy] = parent->GridMaps[gx][gy];
return;
}
// map file name
@@ -230,29 +219,25 @@ void Map::UnloadMap(int gx, int gy)
void Map::UnloadMapImpl(Map* map, int gx, int gy)
{
if (map->i_InstanceId == 0)
if (map->GridMaps[gx][gy])
{
if (map->GridMaps[gx][gy])
Map* parent = map->m_parentMap;
if (!--parent->GridMapReference[gx][gy])
{
map->GridMaps[gx][gy]->unloadData();
delete map->GridMaps[gx][gy];
parent->GridMaps[gx][gy]->unloadData();
delete parent->GridMaps[gx][gy];
parent->GridMaps[gx][gy] = nullptr;
}
}
else
static_cast<MapInstanced*>(map->m_parentMap)->RemoveGridMapReference(GridCoord(gx, gy));
map->GridMaps[gx][gy] = nullptr;
}
void Map::LoadMapAndVMap(int gx, int gy)
{
m_parentTerrainMap->LoadMap(gx, gy);
// Only load the data for the base map
if (i_InstanceId == 0)
{
LoadVMap(gx, gy);
LoadMMap(gx, gy);
}
LoadMap(gx, gy);
LoadVMap(gx, gy);
LoadMMap(gx, gy);
}
void Map::LoadAllCells()
@@ -306,6 +291,7 @@ i_scriptLock(false), _defaultLight(GetDefaultMapLight(id))
{
//z code
GridMaps[x][y] = nullptr;
GridMapReference[x][y] = 0;
setNGrid(nullptr, x, y);
}
}
@@ -512,20 +498,20 @@ void Map::EnsureGridCreated_i(const GridCoord &p)
{
TC_LOG_DEBUG("maps", "Creating grid[%u, %u] for map %u instance %u", p.x_coord, p.y_coord, GetId(), i_InstanceId);
setNGrid(new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, sWorld->getBoolConfig(CONFIG_GRID_UNLOAD)),
p.x_coord, p.y_coord);
NGridType* ngrid = new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, sWorld->getBoolConfig(CONFIG_GRID_UNLOAD));
setNGrid(ngrid, p.x_coord, p.y_coord);
// build a linkage between this map and NGridType
buildNGridLinkage(getNGrid(p.x_coord, p.y_coord));
buildNGridLinkage(ngrid);
getNGrid(p.x_coord, p.y_coord)->SetGridState(GRID_STATE_IDLE);
ngrid->SetGridState(GRID_STATE_IDLE);
//z coord
int gx = (MAX_NUMBER_OF_GRIDS - 1) - p.x_coord;
int gy = (MAX_NUMBER_OF_GRIDS - 1) - p.y_coord;
if (!GridMaps[gx][gy])
LoadMapAndVMap(gx, gy);
m_parentTerrainMap->LoadMapAndVMap(gx, gy);
}
}
@@ -1657,17 +1643,13 @@ bool Map::UnloadGrid(NGridType& ngrid, bool unloadAll)
int gy = (MAX_NUMBER_OF_GRIDS - 1) - y;
// delete grid map, but don't delete if it is from parent map (and thus only reference)
//+++if (GridMaps[gx][gy]) don't check for GridMaps[gx][gy], we might have to unload vmaps
if (GridMaps[gx][gy])
{
if (m_parentTerrainMap == this)
m_parentTerrainMap->UnloadMap(gx, gy);
if (i_InstanceId == 0)
{
VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gx, gy);
MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(GetId(), gx, gy);
}
m_parentTerrainMap->UnloadMap(gx, gy);
VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(m_parentTerrainMap->GetId(), gx, gy);
MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(m_parentTerrainMap->GetId(), gx, gy);
}
TC_LOG_DEBUG("maps", "Unloading grid[%u, %u] for map %u finished", x, y, GetId());
return true;
}