diff options
Diffstat (limited to 'src/game/Map.h')
| -rw-r--r-- | src/game/Map.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/Map.h b/src/game/Map.h index 9e9f7a9d402..514308c699a 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -340,6 +340,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj virtual void MoveAllCreaturesInMoveList(); virtual void RemoveAllObjectsInRemoveList(); + virtual void RelocationNotify(); bool CreatureRespawnRelocation(Creature *c); // used only in MoveAllCreaturesInMoveList and ObjectGridUnloader @@ -373,7 +374,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj void AddObjectToRemoveList(WorldObject *obj); void AddObjectToSwitchList(WorldObject *obj, bool on); - void DoDelayedMovesAndRemoves(); + //void DoDelayedMovesAndRemoves(); virtual bool RemoveBones(uint64 guid, float x, float y); @@ -388,7 +389,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj bool ActiveObjectsNearGrid(uint32 x, uint32 y) const; void AddUnitToNotify(Unit* unit); - void RelocationNotify(); + void RemoveUnitFromNotify(int32 slot); void SendToPlayers(WorldPacket const* data) const; @@ -496,7 +497,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj time_t i_gridExpiry; bool i_lock; - std::vector<uint64> i_unitsToNotifyBacklog; + std::vector<Unit*> i_unitsToNotifyBacklog; std::vector<Unit*> i_unitsToNotify; std::set<WorldObject *> i_objectsToRemove; std::map<WorldObject*, bool> i_objectsToSwitch; |