Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

*The enemy of my enemy is my friend.

Browse Source 
*Correct some reversed parameter ordering (team and vehId were swapped)

--HG--
branch : trunk
This commit is contained in:
maximius committed 2009-09-29 01:16:08 -07:00
1 parent 0a9addd224
commit aa5e2d3b28
2 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/Unit.cpp
+4 -4
View File
@@ -11305,7 +11305,7 @@ Unit* Creature::SelectVictim()
target = caster;
break;
}
}while (aura != tauntAuras.begin());
} while (aura != tauntAuras.begin());
}
else
target = getVictim();
@@ -11344,7 +11344,7 @@ Unit* Creature::SelectVictim()
else
return NULL;
if(target && (!target->getVictim() || !target->isAttackingPlayer() || IsFriendlyTo(target->getVictim()))) // if the victim of target is a player, only defend the victim if we are friendly
if(target && (!target->getVictim() || IsFriendlyTo(target->getVictim())) // if victim(1) has a victim(2), only attack victim(1) if we are friendly with victim(2)
{
SetInFront(target);
return target;
@@ -11358,7 +11358,7 @@ Unit* Creature::SelectVictim()
{
if((*itr) && canCreatureAttack(*itr) && (*itr)->GetTypeId() != TYPEID_PLAYER
&& !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN)
&& (!(*itr)->getVictim() || !(*itr)->isAttackingPlayer() || IsFriendlyTo((*itr)->getVictim()))) // if the victim of target is a player, only defend the victim if we are friendly
// && (!(*itr)->getVictim() || IsFriendlyTo((*itr)->getVictim()))) // if victim(1) has a victim(2), only attack victim(1) if we are friendly with victim(2)
return NULL;
}
@@ -11369,7 +11369,7 @@ Unit* Creature::SelectVictim()
// search nearby enemy before enter evade mode
if(HasReactState(REACT_AGGRESSIVE))
if(target = SelectNearestTarget())
if(!target->getVictim() || !target->isAttackingPlayer() || IsFriendlyTo(target->getVictim())) // if the victim of target is a player, only defend the victim if we are friendly
if(!target->getVictim() || IsFriendlyTo(target->getVictim())) // if victim(1) has a victim(2), only attack victim(1) if we are friendly with victim(2)
return target;
if(m_invisibilityMask)