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

Core/Spells: Allow AoE spells to target dead units.

Browse Source 
Also removes some unneeded checks from ally targeting.

--HG--
branch : trunk
This commit is contained in:
linencloth
2010-09-15 06:33:38 +02:00
parent ec5edaf6bf
commit a582ab9d9d
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+2 -1
View File
@@ -1875,7 +1875,8 @@ void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, SpellNo
break;
}
Trinity::SpellNotifierCreatureAndPlayer notifier(m_caster, TagUnitMap, radius, type, TargetType, pos, entry);
bool requireDeadTarget = bool(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_REQUIRE_DEAD_TARGET);
Trinity::SpellNotifierCreatureAndPlayer notifier(m_caster, TagUnitMap, radius, type, TargetType, pos, entry, requireDeadTarget);
if ((m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY)
|| (TargetType == SPELL_TARGETS_ENTRY && !entry))
m_caster->GetMap()->VisitWorld(pos->m_positionX, pos->m_positionY, radius, notifier);
src/server/game/Spells/Spell.h
+11 -4
View File
@@ -738,11 +738,12 @@ namespace Trinity
const Unit * const i_source;
uint32 i_entry;
const Position * const i_pos;
bool i_requireDeadTarget;
SpellNotifierCreatureAndPlayer(Unit *source, std::list<Unit*> &data, float radius, SpellNotifyPushType type,
SpellTargets TargetType = SPELL_TARGETS_ENEMY, const Position *pos = NULL, uint32 entry = 0)
SpellTargets TargetType = SPELL_TARGETS_ENEMY, const Position *pos = NULL, uint32 entry = 0, bool requireDeadTarget = false)
: i_data(&data), i_push_type(type), i_radius(radius), i_TargetType(TargetType),
i_source(source), i_entry(entry), i_pos(pos)
i_source(source), i_entry(entry), i_pos(pos), i_requireDeadTarget(requireDeadTarget)
{
ASSERT(i_source);
}
@@ -761,7 +762,7 @@ namespace Trinity
case SPELL_TARGETS_ENEMY:
if (target->isTotem())
continue;
if (!target->isAttackableByAOE())
if (!target->isAttackableByAOE(i_requireDeadTarget))
continue;
if (i_source->IsControlledByPlayer())
{
@@ -777,7 +778,13 @@ namespace Trinity
case SPELL_TARGETS_ALLY:
if (target->isTotem())
continue;
if (!target->isAttackableByAOE() || !i_source->IsFriendlyTo(target))
if (!i_source->IsFriendlyTo(target))
continue;
if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
continue;
if (target->GetTypeId() == TYPEID_PLAYER && target->ToPlayer()->isGameMaster())
continue;
if (target->isAlive() == i_requireDeadTarget)
continue;
break;
case SPELL_TARGETS_ENTRY: