*Extend API of SpellScript by Dest and Damage/Heal setters and getters.

*Make some SpellScript function names shorter.

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index af5eab71799..e48b7845791 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4504,6 +4504,9 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
 
     sLog.outDebug("Spell: %u Effect : %u", m_spellInfo->Id, eff);
 
+    //we do not need DamageMultiplier here.
+    damage = CalculateDamage(i, NULL);
+
     for(std::list<SpellScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr)
     {
         std::list<SpellScript::EffectHandler>::iterator effEndItr = (*scritr)->EffectHandlers.end(), effItr = (*scritr)->EffectHandlers.begin();
@@ -4514,9 +4517,6 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
         }
     }
 
-    //we do not need DamageMultiplier here.
-    damage = CalculateDamage(i, NULL);
-
     if (eff < TOTAL_SPELL_EFFECTS)
     {
         (this->*SpellEffects[eff])(i);