Changeset 276 for trunk/src/game/Unit.cpp

Timestamp:

11/22/08 00:35:55 (17 years ago)

Author:

yumileroy

Message:

Unsummon summon as possessed creatures on spell channeling interrupt.

Original author: gvcoman
Date: 2008-11-18 15:52:52-05:00

Files:

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

trunk/src/game/Unit.cpp

@@ -47 +47 @@
 #include "CellImpl.h"
 #include "Path.h"
+#include "TemporarySummon.h"
 
 #include <math.h>
@@ -3425 +3426 @@
         m_currentSpells[CURRENT_CHANNELED_SPELL]->SetReferencedFromCurrent(false);
         m_currentSpells[CURRENT_CHANNELED_SPELL] = NULL;
+
+        // Unsummon any summoned as possessed creatures on channel interrupt
+        SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
+        if (!spellInfo || !interrupted)
+            return;
+        for (int i = 0; i < 3; i++)
+        {
+            if (spellInfo->Effect[i] == SPELL_EFFECT_SUMMON && 
+                (spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED || 
+                 spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 || 
+                 spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3))
+            {
+                // Possession is removed in the UnSummon function
+                if (GetCharm())
+                    ((TemporarySummon*)GetCharm())->UnSummon(); 
+            }
+        }
     }
 }