diff options
| author | XTZGZoReX <none@none> | 2010-08-08 05:25:45 +0200 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2010-08-08 05:25:45 +0200 |
| commit | 9083271a2f29326ae91a3239b972ca63513169f6 (patch) | |
| tree | 4b28f5c0c3cb4d447140743bd413402a7c685f8d /src/server/game/Maps/MapManager.cpp | |
| parent | 93fc24ece91443225bbecf9f3cb59658194dcbf3 (diff) | |
* Some singleton renames for consistency:
accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index e4d8a601656..eeafda9b8b0 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -164,7 +164,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) if (!entry->IsDungeon()) return true; - InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid); + InstanceTemplate const* instance = sObjectMgr.GetInstanceTemplate(mapid); if (!instance) return false; @@ -214,7 +214,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) if (instance_map == mapid) break; - InstanceTemplate const* instance = objmgr.GetInstanceTemplate(instance_map); + InstanceTemplate const* instance = sObjectMgr.GetInstanceTemplate(instance_map); instance_map = instance ? instance->parent : 0; } while (instance_map); @@ -253,7 +253,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) } //Other requirements - return player->Satisfy(objmgr.GetAccessRequirement(mapid, targetDifficulty), mapid, true); + return player->Satisfy(sObjectMgr.GetAccessRequirement(mapid, targetDifficulty), mapid, true); } void MapManager::Update(uint32 diff) @@ -300,7 +300,7 @@ bool MapManager::ExistMapAndVMap(uint32 mapid, float x,float y) bool MapManager::IsValidMAP(uint32 mapid) { MapEntry const* mEntry = sMapStore.LookupEntry(mapid); - return mEntry && (!mEntry->IsDungeon() || objmgr.GetInstanceTemplate(mapid)); + return mEntry && (!mEntry->IsDungeon() || sObjectMgr.GetInstanceTemplate(mapid)); // TODO: add check for battleground template } |