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

Core/Spells: Add a new parameter to Unit::SelectNearbyTarget to allow excluding a certain unit.

Browse Source 
closes #4989
This commit is contained in:
Subv2112
2012-02-04 21:21:51 -05:00
parent 83c0b73efd
commit 31615bdc86
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+12 -9
View File
@@ -4870,8 +4870,8 @@ bool Unit::HandleHasteAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
case 13877:
case 33735:
{
target = SelectNearbyTarget();
if (!target || target == victim)
target = SelectNearbyTarget(victim);
if (!target)
return false;
basepoints0 = damage;
triggered_spell_id = 22482;
@@ -5018,7 +5018,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
case 18765:
case 35429:
{
target = SelectNearbyTarget();
target = SelectNearbyTarget(victim);
if (!target)
return false;
@@ -5738,7 +5738,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
// Sweeping Strikes
case 12328:
{
target = SelectNearbyTarget();
target = SelectNearbyTarget(victim);
if (!target)
return false;
@@ -5814,12 +5814,12 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
if (!victim || !victim->isAlive() || !procSpell)
return false;
target = SelectNearbyTarget();
if (!target || target == victim)
target = SelectNearbyTarget(victim);
if (!target)
return false;
CastSpell(target, 58567, true);
return true;
triggered_spell_id = 58567;
break;
}
break;
}
@@ -14780,7 +14780,7 @@ void Unit::UpdateReactives(uint32 p_time)
}
}
Unit* Unit::SelectNearbyTarget(float dist) const
Unit* Unit::SelectNearbyTarget(Unit* exclude, float dist) const
{
std::list<Unit*> targets;
Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, dist);
@@ -14790,6 +14790,9 @@ Unit* Unit::SelectNearbyTarget(float dist) const
// remove current target
if (getVictim())
targets.remove(getVictim());
if (exclude)
targets.remove(exclude);
// remove not LoS targets
for (std::list<Unit*>::iterator tIter = targets.begin(); tIter != targets.end();)
src/server/game/Entities/Unit/Unit.h
+1 -1
View File
@@ -1299,7 +1299,7 @@ class Unit : public WorldObject
void CombatStop(bool includingCast = false);
void CombatStopWithPets(bool includingCast = false);
void StopAttackFaction(uint32 faction_id);
Unit* SelectNearbyTarget(float dist = NOMINAL_MELEE_RANGE) const;
Unit* SelectNearbyTarget(Unit* exclude = NULL, float dist = NOMINAL_MELEE_RANGE) const;
void SendMeleeAttackStop(Unit* victim = NULL);
void SendMeleeAttackStart(Unit* pVictim);