diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2015-12-31 19:51:07 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-03-21 19:41:28 +0100 |
| commit | 7422557d03b3cbb5b00a39b16c52f879c2f31fdd (patch) | |
| tree | c379a50a7ba112b8a4f5149f6c89973939a8675d /src/server/game/Maps/MapInstanced.h | |
| parent | 96ca739a0b0d2b34a28fbac0593e076fb3c42f1b (diff) | |
Merge pull request #16110 from Treeston/3.3.5-instancerevive
Game/Maps: Clean up instance zone-in handling
(cherry picked from commit eb3dc8a4f064d89b78248a511bcf67f805ea3314)
Diffstat (limited to 'src/server/game/Maps/MapInstanced.h')
| -rw-r--r-- | src/server/game/Maps/MapInstanced.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index f0d185bd796..4fb334cb0ce 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -39,13 +39,13 @@ class MapInstanced : public Map void DelayedUpdate(const uint32 diff) override; //void RelocationNotify(); void UnloadAll() override; - bool CanEnter(Player* player) override; + EnterState CannotEnter(Player* /*player*/) override; - Map* CreateInstanceForPlayer(const uint32 mapId, Player* player); + Map* CreateInstanceForPlayer(const uint32 mapId, Player* player, uint32 loginInstanceId=0); Map* FindInstanceMap(uint32 instanceId) const { InstancedMaps::const_iterator i = m_InstancedMaps.find(instanceId); - return(i == m_InstancedMaps.end() ? NULL : i->second); + return(i == m_InstancedMaps.end() ? nullptr : i->second); } bool DestroyInstance(InstancedMaps::iterator &itr); |