From df9e0ebf6a3285a5af2a1912bf033c9ab149b418 Mon Sep 17 00:00:00 2001 From: rsa Date: Fri, 20 Jan 2012 12:28:24 +0400 Subject: [PATCH] [11887] Fix spell targeting for pet spells with target-type (0,0) Also some style improvements Signed-off-by: Schmoozerd --- src/game/Spell.cpp | 13 ++++++++----- src/shared/revision_nr.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index bf5130a71..1700db542 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -471,11 +471,14 @@ void Spell::FillTargetMap() // but need it support in some know cases switch(m_spellInfo->EffectImplicitTargetA[i]) { - case 0: + case TARGET_NONE: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: - SetTargetMap(SpellEffectIndex(i), TARGET_EFFECT_SELECT, tmpUnitMap); + case TARGET_NONE: + if (m_caster->GetObjectGuid().IsPet()) + SetTargetMap(SpellEffectIndex(i), TARGET_SELF, tmpUnitMap); + else + SetTargetMap(SpellEffectIndex(i), TARGET_EFFECT_SELECT, tmpUnitMap); break; default: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitMap); @@ -485,7 +488,7 @@ void Spell::FillTargetMap() case TARGET_SELF: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: + case TARGET_NONE: case TARGET_EFFECT_SELECT: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); break; @@ -506,7 +509,7 @@ void Spell::FillTargetMap() case TARGET_EFFECT_SELECT: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: + case TARGET_NONE: case TARGET_EFFECT_SELECT: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitMap); break; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 699d44325..594b89cd6 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 "11886" + #define REVISION_NR "11887" #endif // __REVISION_NR_H__