Changeset 157 for trunk/src/game/Spell.cpp

Timestamp:

11/19/08 13:41:36 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix hunter's frozen trap, half duration when pvp.
Use vector to store linked spell information to support multiple effects.

Original author: megamage
Date: 2008-11-03 17:20:35-06:00

Files:

• trunk/src/game/Spell.cpp (modified) (2 diffs)

trunk/src/game/Spell.cpp

@@ -1056 +1056 @@
         ((Creature*)m_caster)->AI()->SpellHitTarget(unit, m_spellInfo);
 
-    if(int32 spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id, 1))
-    {
-        if(spell_triggered > 0)
-            unit->CastSpell(unit, spell_triggered, true, 0, 0, m_caster->GetGUID());
-        else
-            unit->RemoveAurasDueToSpell(-spell_triggered);
+    if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id + 1000000))
+    {
+        for(std::vector<int32>::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i)
+        {
+            if(spell_triggered < 0)
+                unit->RemoveAurasDueToSpell(-(*i));
+            else
+                unit->CastSpell(unit, *i, true, 0, 0, m_caster->GetGUID());
+        }
     }
 }
@@ -2253 +2256 @@
     }
 
-    if(int32 spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id, 0))
-    {
-        if(spell_triggered > 0)
-            m_caster->CastSpell(m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster, spell_triggered, true);
-        else
-            m_caster->RemoveAurasDueToSpell(-spell_triggered);
+    if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id))
+    {
+        for(std::vector<int32>::const_iterator i = spell_triggered->begin(); i != spell_triggered->end(); ++i)
+        {
+            if(spell_triggered < 0)
+                m_caster->RemoveAurasDueToSpell(-(*i));
+            else
+                m_caster->CastSpell(m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster, *i, true);
+        }
     }