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

Timestamp:

11/19/08 13:38:58 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix broken spell target 38 (script target).
Implement linked spells, but will not enable it before testing.

Original author: megamage
Date: 2008-10-29 14:19:31-05:00

Files:

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

trunk/src/game/Spell.cpp

@@ -923 +923 @@
     if(m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->AI())
         ((Creature*)m_caster)->AI()->SpellHitTarget(unit, m_spellInfo);
+
+    if(int32 spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id, 1))
+    {
+        if(spell_triggered > 0)
+            m_caster->CastSpell(unit, spell_triggered, true);
+        else
+            unit->RemoveAurasDueToSpell(-spell_triggered);
+    }
 }
 
@@ -1287 +1295 @@
         radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
 
+    uint32 EffectChainTarget = m_spellInfo->EffectChainTarget[i];
+    uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets;
     if(m_originalCaster)
+    {
         if(Player* modOwner = m_originalCaster->GetSpellModOwner())
+        {
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius,this);
-
-    uint32 EffectChainTarget = m_spellInfo->EffectChainTarget[i];
-    if(m_originalCaster)
-        if(Player* modOwner = m_originalCaster->GetSpellModOwner())
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, EffectChainTarget, this);
-
-    uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets;
+        }
+    }
+
     switch(cur)
     {
@@ -1552 +1561 @@
                     m_targets.setDestination(goScriptTarget->GetPositionX(),goScriptTarget->GetPositionY(),goScriptTarget->GetPositionZ());
             }
+            else
+            {
+                if(creatureScriptTarget)
+                    TagUnitMap.push_back(creatureScriptTarget);
+                else if(goScriptTarget)
+                    AddGOTarget(goScriptTarget, i);
+            }
         }break;
-
 
         // dummy
@@ -2176 +2191 @@
             }
         }
+    }
+
+    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);
     }