From 3cb4e7c716b11f357b3265257c51e7b6cc5c36f9 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 24 Dec 2008 09:58:26 -0600 Subject: *Update to Mangos 6938. (Only build for VC9) --HG-- branch : trunk --- src/game/MapManager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/game/MapManager.cpp') diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index 26279cb76ec..47be039d415 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -175,7 +175,8 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player) //The player has a heroic mode and tries to enter into instance which has no a heroic mode if (!entry->SupportsHeroicMode() && player->GetDifficulty() == DIFFICULTY_HEROIC) { - player->SendTransferAborted(mapid, TRANSFER_ABORT_DIFFICULTY2); //Send aborted message + //Send aborted message + player->SendTransferAborted(mapid, TRANSFER_ABORT_DIFFICULTY, DIFFICULTY_HEROIC); return false; } @@ -280,7 +281,8 @@ bool MapManager::ExistMapAndVMap(uint32 mapid, float x,float y) bool MapManager::IsValidMAP(uint32 mapid) { MapEntry const* mEntry = sMapStore.LookupEntry(mapid); - return mEntry && (!mEntry->Instanceable() || objmgr.GetInstanceTemplate(mapid)); + return mEntry && (!mEntry->IsDungeon() || objmgr.GetInstanceTemplate(mapid)); + // TODO: add check for battleground template } void MapManager::LoadGrid(int mapid, float x, float y, const WorldObject* obj, bool no_unload) -- cgit v1.2.3