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/MapManager.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/MapManager.h')
| -rw-r--r-- | src/server/game/Maps/MapManager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 24cbbf4ef4d..5d679cbe4d9 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -35,7 +35,7 @@ class MapManager Map* CreateBaseMap(uint32 mapId); Map* FindBaseNonInstanceMap(uint32 mapId) const; - Map* CreateMap(uint32 mapId, Player* player); + Map* CreateMap(uint32 mapId, Player* player, uint32 loginInstanceId=0); Map* FindMap(uint32 mapId, uint32 instanceId) const; uint32 GetAreaId(uint32 mapid, float x, float y, float z) const @@ -102,7 +102,7 @@ class MapManager void DoDelayedMovesAndRemoves(); - bool CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck = false); + Map::EnterState PlayerCannotEnter(uint32 mapid, Player* player, bool loginCheck = false); void InitializeVisibilityDistanceInfo(); /* statistics */ |