From 5a2c1f1f5c076c5ced0e79699f4cc9162d18a06c Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Fri, 6 Feb 2009 21:15:52 -0600
Subject: *Fix some talent triggered spells.

--HG--
branch : trunk
---
 src/game/Spell.cpp | 28 +++++++++++-----------------
 src/game/Spell.h   |  4 +++-
 2 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 25fca09f80d..66e0a2e1e68 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1215,6 +1215,12 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)
     if(m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
         ((Creature*)m_caster)->AI()->SpellHitTarget(unit, m_spellInfo);
 
+    for(ChanceTriggerSpells::const_iterator i = m_ChanceTriggerSpells.begin(); i != m_ChanceTriggerSpells.end(); ++i)
+    {
+        if(roll_chance_i(i->second))
+            m_caster->CastSpell(unit, i->first, true);
+    }
+
     if(m_customAttr & SPELL_ATTR_CU_LINK_HIT)
     {
         if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id + SPELL_LINK_HIT))
@@ -2263,23 +2269,11 @@ void Spell::cast(bool skipCheck)
         uint32 auraSpellIdx = (*i)->GetEffIndex();
         if (IsAffectedBy(auraSpellInfo, auraSpellIdx))
         {
-            for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
-                if( ihit->effectMask & (1<<auraSpellIdx) )
-            {
-                // check m_caster->GetGUID() let load auras at login and speedup most often case
-                Unit *unit = m_caster->GetGUID()== ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID);
-                if (unit && unit->isAlive())
-                {
-                    // Calculate chance at that moment (can be depend for example from combo points)
-                    int32 chance = m_caster->CalculateSpellDamage(auraSpellInfo, auraSpellIdx, (*i)->GetBasePoints(),unit);
-                    chance *= (*i)->GetStackAmount();
-
-                    if(roll_chance_i(chance))
-                    {
-                        if(SpellEntry const *spellInfo = sSpellStore.LookupEntry(auraSpellInfo->EffectTriggerSpell[auraSpellIdx]))
-                            m_TriggerSpells.push_back(spellInfo);
-                    }
-                }
+            if(SpellEntry const *spellInfo = sSpellStore.LookupEntry(auraSpellInfo->EffectTriggerSpell[auraSpellIdx]))
+            {            
+                // Calculate chance at that moment (can be depend for example from combo points)
+                int32 chance = m_caster->CalculateSpellDamage(auraSpellInfo, auraSpellIdx, (*i)->GetBasePoints(), NULL);
+                m_ChanceTriggerSpells.push_back(std::make_pair(spellInfo, chance * (*i)->GetStackAmount()));
             }
         }
     }
diff --git a/src/game/Spell.h b/src/game/Spell.h
index cc4cfc8f64a..42725aa11c7 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -553,8 +553,10 @@ class Spell
         // -------------------------------------------
 
         //List For Triggered Spells
-        typedef std::list<SpellEntry const*> TriggerSpells;
+        typedef std::vector<SpellEntry const*> TriggerSpells;
         TriggerSpells m_TriggerSpells;
+        typedef std::vector< std::pair<SpellEntry const*, int32> > ChanceTriggerSpells;
+        ChanceTriggerSpells m_ChanceTriggerSpells;
 
         uint32 m_spellState;
         uint32 m_timer;
-- 
cgit v1.2.3