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

Timestamp:

11/22/08 01:55:20 (17 years ago)

Author:

yumileroy

Message:

Merge with 284 (54b0e67d97fe).

Original author: megamage
Date: 2008-11-21 19:49:54-06:00

Files:

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

trunk/src/game/Unit.cpp

@@ -47 +47 @@
 #include "CellImpl.h"
 #include "Path.h"
+#include "TemporarySummon.h"
 
 #include <math.h>
@@ -3412 +3413 @@
     if (m_currentSpells[CURRENT_CHANNELED_SPELL] && (!spell_id || m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->Id==spell_id))
     {
+        // Unsummon any summoned as possessed creatures on channel interrupt
+        SpellEntry const *spellInfo = m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo;
+        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(); 
+            }
+        }
+
         if (m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED)
             m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel();
@@ -9791 +9807 @@
 
 CharmInfo::CharmInfo(Unit* unit)
-: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0)
+: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0), m_barInit(false)
 {
     for(int i =0; i<4; ++i)
@@ -9802 +9818 @@
 void CharmInfo::InitPetActionBar()
 {
+    if (m_barInit)
+        return;
+
     // the first 3 SpellOrActions are attack, follow and stay
     for(uint32 i = 0; i < 3; i++)
@@ -9816 +9835 @@
         PetActionBar[i + 3].SpellOrAction = 0;
     }
-}
-
-void CharmInfo::InitEmptyActionBar()
-{
-    for(uint32 x = 1; x < 10; ++x)
+    m_barInit = true;
+}
+
+void CharmInfo::InitEmptyActionBar(bool withAttack)
+{
+    if (m_barInit)
+        return;
+
+    for(uint32 x = 0; x < 10; ++x)
     {
         PetActionBar[x].Type = ACT_CAST;
         PetActionBar[x].SpellOrAction = 0;
     }
-    PetActionBar[0].Type = ACT_COMMAND;
-    PetActionBar[0].SpellOrAction = COMMAND_ATTACK;
+    if (withAttack)
+    {
+        PetActionBar[0].Type = ACT_COMMAND;
+        PetActionBar[0].SpellOrAction = COMMAND_ATTACK;
+    }
+    m_barInit = true;
 }