Merge commit 'origin/master' into 310

This commit is contained in:
VladimirMangos 2009-06-10 18:56:29 +04:00
commit 9588b43d0c
17 changed files with 448 additions and 362 deletions

View file

@ -988,6 +988,12 @@ bool Item::IsBindedNotWith( Player const* player ) const
bool ItemRequiredTarget::IsFitToRequirements( Unit* pUnitTarget ) const
{
if(pUnitTarget->GetTypeId() != TYPEID_UNIT)
return false;
if(pUnitTarget->GetEntry() != m_uiTargetEntry)
return false;
switch(m_uiType)
{
case ITEM_TARGET_TYPE_CREATURE: