--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-18 18:38:46 -07:00
parent 864b3f31e9
commit d22768a6b5
25 changed files with 543 additions and 541 deletions
+2 -2
View File
@@ -524,7 +524,7 @@ namespace Trinity
RaiseDeadObjectCheck(Unit* funit, float range) : i_funit(funit), i_range(range) {}
bool operator()(Creature* u)
{
if (i_funit->GetTypeId()!=TYPEID_PLAYER || !((Player*)i_funit)->isHonorOrXPTarget(u) ||
if (i_funit->GetTypeId() != TYPEID_PLAYER || !((Player*)i_funit)->isHonorOrXPTarget(u) ||
u->getDeathState() != CORPSE || u->isDeadByDefault() || u->isInFlight() ||
( u->GetCreatureTypeMask() & (1 << (CREATURE_TYPE_HUMANOID-1)) )==0 ||
(u->GetDisplayId() != u->GetNativeDisplayId()))
@@ -903,7 +903,7 @@ namespace Trinity
Unit const* owner = i_funit->GetOwner();
if(owner)
check = owner;
i_targetForPlayer = ( check->GetTypeId()==TYPEID_PLAYER );
i_targetForPlayer = ( check->GetTypeId() == TYPEID_PLAYER );
}
bool operator()(Unit* u)
{