josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Cleanup Creature::_IsTargetAcceptable.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-23 23:26:04 -07:00
parent ecef2642f4
commit c9cd2f2dbe
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Creature.cpp
+7 -11
View File
@@ -2190,20 +2190,16 @@ bool Creature::_IsTargetAcceptable(const Unit *target) const
const Unit *myVictim = getAttackerForHelper(); const Unit *myVictim = getAttackerForHelper();
const Unit *targetVictim = target->getAttackerForHelper(); const Unit *targetVictim = target->getAttackerForHelper();
// if I'm already fighting target, the target is acceptable // if the target cannot be attacked, the target is not acceptable
if (myVictim == target || targetVictim == this) if (!canAttack(target, true))
return false;
// if I'm already fighting target, or I'm hostile towards the target, the target is acceptable
if (myVictim == target || targetVictim == this || IsHostileTo(target))
return true; return true;
// if I'm hostile towards the target, the target is acceptable
if (!canAttack(target, false))
return false;
// if the target does not have a victim, the target is not acceptable
if (!targetVictim)
return false;
// if the target's victim is friendly, and the target is neutral, the target is acceptable // if the target's victim is friendly, and the target is neutral, the target is acceptable
if (IsFriendlyTo(targetVictim) && !IsFriendlyTo(target)) if (targetVictim && IsFriendlyTo(targetVictim) && !IsFriendlyTo(target))
return true; return true;
// if the target's victim is not friendly, or the target is friendly, the target is not acceptable // if the target's victim is not friendly, or the target is friendly, the target is not acceptable