aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKandera <KanderaDev@gmail.com>2012-05-25 08:56:02 -0400
committerKandera <KanderaDev@gmail.com>2012-05-25 08:56:02 -0400
commit929e7c0f0c8f008519b5d168af4fda165c62547e (patch)
treeb3df04a35ce15fabe59dfd9f8ad67bd4c38d9f85 /src
parentd98f36194bc271c3bd3adc6532e84bd3645127c8 (diff)
Core/Spells: revert previous commit to find a better solution.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Spells/SpellEffects.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 9470d6edef9..07bea5f980c 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -849,15 +849,15 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
{
- if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET
- && effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
+ if (effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH_TARGET
+ && effectHandleMode != SPELL_EFFECT_HANDLE_LAUNCH)
return;
uint32 triggered_spell_id = m_spellInfo->Effects[effIndex].TriggerSpell;
// todo: move those to spell scripts
if (m_spellInfo->Effects[effIndex].Effect == SPELL_EFFECT_TRIGGER_SPELL
- && effectHandleMode == SPELL_EFFECT_HANDLE_HIT_TARGET)
+ && effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET)
{
// special cases
switch (triggered_spell_id)
@@ -970,13 +970,13 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
}
SpellCastTargets targets;
- if (effectHandleMode == SPELL_EFFECT_HANDLE_HIT_TARGET)
+ if (effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET)
{
if (!spellInfo->NeedsToBeTriggeredByCaster())
return;
targets.SetUnitTarget(unitTarget);
}
- else //if (effectHandleMode == SPELL_EFFECT_HANDLE_HIT)
+ else //if (effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH)
{
if (spellInfo->NeedsToBeTriggeredByCaster() && (m_spellInfo->Effects[effIndex].GetProvidedTargetMask() & TARGET_FLAG_UNIT_MASK))
return;