Changeset 15 for trunk

Timestamp:

11/19/08 13:23:13 (17 years ago)

Author:

yumileroy

Message:

[svn] * Make Grounding totem disappear after any spell redirection
Patch provided by Albrecht de Endrau

Original author: Neo2003
Date: 2008-10-05 15:17:41-05:00

Location:

trunk/src/game

Files:

• Spell.cpp (modified) (4 diffs)
• Spell.h (modified) (1 diff)
• SpellAuras.h (modified) (1 diff)

trunk/src/game/Spell.cpp

@@ -268 +268 @@
     m_selfContainer = NULL;
     m_triggeringContainer = triggeringContainer;
+    m_magnetPair.first = false;
+    m_magnetPair.second = NULL;
     m_deletable = true;
     m_delayAtDamageCount = 0;
@@ -948 +950 @@
         return;
 
+    // remove spell_magnet aura after first spell redirect and destroy target if its totem
+    if(m_magnetPair.first && m_magnetPair.second && m_magnetPair.second == unit)
+    {
+        if(unit->GetTypeId() == TYPEID_UNIT && ((Creature*)unit)->isTotem())
+            unit->DealDamage(unit,unit->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+        return;
+    }
+
     // Recheck immune (only for delayed spells)
     if( m_spellInfo->speed && (
@@ -4838 +4848 @@
 {
     // Check targets for creature type mask and remove not appropriate (skip explicit self target case, maybe need other explicit targets)
-    if(m_spellInfo->EffectImplicitTargetA[eff]!=TARGET_SELF )
+    if(m_spellInfo->EffectImplicitTargetA[eff]!=TARGET_SELF && !m_magnetPair.first)
     {
         if (!CheckTargetCreatureType(target))
@@ -4919 +4929 @@
             if(Unit* magnet = (*itr)->GetCaster())
             {
-                if(magnet->IsWithinLOSInMap(m_caster))
-                {
+                if((*itr)->m_procCharges>0 && magnet->IsWithinLOSInMap(m_caster))
+                {
+                    (*itr)->SetAuraProcCharges((*itr)->m_procCharges-1);
+                    m_magnetPair.first = true;
+                    m_magnetPair.second = magnet;
+
                     target = magnet;
                     m_targets.setUnitTarget(target);

trunk/src/game/Spell.h

@@ -336 +336 @@
 
         Unit* SelectMagnetTarget();
+        std::pair <bool,Unit *> m_magnetPair;
         bool CheckTarget( Unit* target, uint32 eff, bool hitPhase );
 

trunk/src/game/SpellAuras.h

@@ -284 +284 @@
 
         int32 m_procCharges;
+        void SetAuraProcCharges(int32 charges) { m_procCharges = charges; }
 
         virtual Unit* GetTriggerTarget() const { return m_target; }