From cedc62bd40b348ee91cb56a8fadb978e1adc49fc Mon Sep 17 00:00:00 2001 From: hunuza Date: Thu, 1 Oct 2009 20:32:21 +0200 Subject: [PATCH] [8578] Fix targeting of priest spell 64843. Signed-off-by: hunuza --- src/game/Spell.cpp | 20 ++++++++++++++------ src/shared/revision_nr.h | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 3c49a25e9..e0456337c 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1693,12 +1693,20 @@ void Spell::SetTargetMap(uint32 effIndex,uint32 targetMode,UnitList& TagUnitMap) FillAreaTargets(TagUnitMap, m_targets.m_destX, m_targets.m_destY, radius, PUSH_SELF_CENTER, SPELL_TARGETS_HOSTILE); break; case TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER: - // special target order - if (m_spellInfo->Id==64904) // Hymn of Hope - // target amount stored in parent spell dummy effect but hard for access - FillRaidOrPartyManaPriorityTargets(TagUnitMap, m_caster, m_caster, radius, 3, true, false, false); - else - FillAreaTargets(TagUnitMap, m_targets.m_destX, m_targets.m_destY, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY); + switch (m_spellInfo->Id) + { + case 64844: // Divine Hymn + // target amount stored in parent spell dummy effect but hard to access + FillRaidOrPartyHealthPriorityTargets(TagUnitMap, m_caster, m_caster, radius, 3, true, false, false); + break; + case 64904: // Hymn of Hope + // target amount stored in parent spell dummy effect but hard to access + FillRaidOrPartyManaPriorityTargets(TagUnitMap, m_caster, m_caster, radius, 3, true, false, false); + break; + default: + FillAreaTargets(TagUnitMap, m_targets.m_destX, m_targets.m_destY, radius, PUSH_SELF_CENTER, SPELL_TARGETS_FRIENDLY); + break; + } break; case TARGET_ALL_FRIENDLY_UNITS_IN_AREA: // Wild Growth diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0b753564d..028e1b8d0 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8577" + #define REVISION_NR "8578" #endif // __REVISION_NR_H__