From fd2fd00c14953c1b787a506c56c6413903fa90bc Mon Sep 17 00:00:00 2001 From: Blaymoira Date: Thu, 5 Mar 2009 21:02:33 +0100 Subject: *Implement access_requirement table - by Iskander - now check the requirements on teleport not only on areatrigger use - moved some columns from instance_template and areatrigger_teleport to access_requirement table --HG-- branch : trunk --- src/game/MapManager.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/game/MapManager.cpp') diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index 4b736f83b2e..6a8cd130691 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -209,14 +209,12 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player) } } - // TODO: move this to a map dependent location - /*if(i_data && i_data->IsEncounterInProgress()) - { - sLog.outDebug("MAP: Player '%s' can't enter instance '%s' while an encounter is in progress.", player->GetName(), GetMapName()); - player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); - return(false); - }*/ - return true; + // Requirements + InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid); + if(!instance) + return false; + + return player->Satisfy(objmgr.GetAccessRequirement(instance->access_id), mapid, true); } else return true; -- cgit v1.2.3