diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-05-06 00:39:13 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-05-06 00:39:13 +0200 |
| commit | b773d9997bdd723cad8c646170e025a48f140f1d (patch) | |
| tree | c7d3114226103a2489627f36ea3aed0060a94c4f /src/server/game/Maps/Map.h | |
| parent | 136269a5851a6755f644295a0171e4bc6c2bef17 (diff) | |
Core/Maps: Fixed loading vmaps and mmaps in instances
Diffstat (limited to 'src/server/game/Maps/Map.h')
| -rw-r--r-- | src/server/game/Maps/Map.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 5f7c391a794..8140d60c4a7 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -332,7 +332,6 @@ class TC_GAME_API Map : public GridRefManager<NGridType> static void InitStateMachine(); static void DeleteStateMachine(); - Map const* GetParent() const { return m_parentMap; } void AddChildTerrainMap(Map* map) { m_childTerrainMaps->push_back(map); map->m_parentTerrainMap = this; } void UnlinkAllChildTerrainMaps() { m_childTerrainMaps->clear(); } @@ -575,8 +574,8 @@ class TC_GAME_API Map : public GridRefManager<NGridType> private: void LoadMapAndVMap(int gx, int gy); void LoadVMap(int gx, int gy); - void LoadMap(int gx, int gy, bool reload = false); - static void LoadMapImpl(Map* map, int gx, int gy, bool reload); + void LoadMap(int gx, int gy); + static void LoadMapImpl(Map* map, int gx, int gy); void UnloadMap(int gx, int gy); static void UnloadMapImpl(Map* map, int gx, int gy); void LoadMMap(int gx, int gy); @@ -637,7 +636,6 @@ class TC_GAME_API Map : public GridRefManager<NGridType> void SendObjectUpdates(); protected: - void SetUnloadReferenceLock(const GridCoord &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadReferenceLock(on); } virtual void LoadGridObjects(NGridType* grid, Cell const& cell); std::mutex _mapLock; @@ -684,6 +682,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> NGridType* i_grids[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS]; GridMap* GridMaps[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS]; + uint16 GridMapReference[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS]; std::bitset<TOTAL_NUMBER_OF_CELLS_PER_MAP*TOTAL_NUMBER_OF_CELLS_PER_MAP> marked_cells; //these functions used to process player/mob aggro reactions and |