*Update summon system.

*Fix the bug that shaman cannot summon fire elemental.
*Fix the bug that totem meters cannot be displayed.

--HG--
branch : trunk

1 files changed, 24 insertions, 15 deletions

diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index cfbc2a65920..b5ef539ab0c 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -284,37 +284,46 @@ bool TempSummon::SetOwner(Unit *owner, bool apply)
     return true;
 }
 
-Guardian::Guardian(SummonPropertiesEntry const *properties, Unit *owner) : TempSummon(properties, owner)
-, m_owner(owner), m_bonusdamage(0)
+Minion::Minion(SummonPropertiesEntry const *properties, Unit *owner) : TempSummon(properties, owner)
+, m_owner(owner)
 {
-    m_summonMask |= SUMMON_MASK_GUARDIAN;
-    InitCharmInfo();
+    m_summonMask |= SUMMON_MASK_MINION;
 }
 
-void Guardian::InitSummon(uint32 duration)
+void Minion::InitSummon(uint32 duration)
 {
     TempSummon::InitSummon(duration);
 
-    SetReactState(REACT_AGGRESSIVE);
+    SetReactState(REACT_PASSIVE);
 
     SetCreatorGUID(m_owner->GetGUID());
     setFaction(m_owner->getFaction());
 
-    if(m_owner->GetTypeId() == TYPEID_PLAYER)
-    {
-        m_charmInfo->InitCharmCreateSpells();
-        //((Player*)m_owner)->CharmSpellInitialize();
-    }
-
-    m_owner->SetGuardian(this, true);
+    m_owner->SetMinion(this, true);
 }
 
-void Guardian::RemoveFromWorld()
+void Minion::RemoveFromWorld()
 {
     if(!IsInWorld())
         return;
 
-    m_owner->SetGuardian(this, false);
+    m_owner->SetMinion(this, false);
     TempSummon::RemoveFromWorld();
 }
 
+Guardian::Guardian(SummonPropertiesEntry const *properties, Unit *owner) : Minion(properties, owner)
+, m_bonusdamage(0)
+{
+    m_summonMask |= SUMMON_MASK_GUARDIAN;
+    InitCharmInfo();
+}
+
+void Guardian::InitSummon(uint32 duration)
+{
+    if(m_owner->GetTypeId() == TYPEID_PLAYER)
+        m_charmInfo->InitCharmCreateSpells();
+
+    Minion::InitSummon(duration);
+
+    SetReactState(REACT_AGGRESSIVE);
+}