Scripts: Removed CAST_SUM define

3 files changed, 14 insertions, 13 deletions

diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
index 2fc6c76caf8..1ad7e927309 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -565,7 +565,7 @@ public:
             if (!me->isSummon())
                 return;
 
-            if (Unit* pSummon = CAST_SUM(me)->GetSummoner())
+            if (Unit* pSummon = me->ToTempSummon()->GetSummoner())
                 CAST_CRE(pSummon)->AI()->SetData(2, 1);
         }
 
@@ -582,8 +582,9 @@ public:
             if (!me->isSummon())
                 return;
 
-            if (Unit* pSummon = CAST_SUM(me)->GetSummoner())
-                CAST_CRE(pSummon)->AI()->SetData(2, 2);
+            if (Unit* summoner = me->ToTempSummon()->GetSummoner())
+                if (Creature* summonerCre = summoner->ToCreature())
+                    summonerCre->AI()->SetData(2, 2);
         }
     };
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
index d9c22780be4..1d6f8014ec7 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
@@ -62,7 +62,7 @@ public:
             {
                 Player *plr = NULL;
                 if (me->isSummon())
-                    if (Unit *summoner = CAST_SUM(me)->GetSummoner())
+                    if (Unit *summoner = me->ToTempSummon()->GetSummoner())
                         if (summoner->GetTypeId() == TYPEID_PLAYER)
                             plr = CAST_PLR(summoner);
 
diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
index 0cd539c1101..cc395416382 100644
--- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
@@ -478,10 +478,10 @@ public:
 
             if (me->isSummon())
             {
-                if (Unit* pSummoner = CAST_SUM(me)->GetSummoner())
+                if (Unit* pSummoner = me->ToTempSummon()->GetSummoner())
                 {
-                    if (pSummoner && pSummoner->isAlive() && !pSummoner->isInCombat())
-                        CAST_CRE(pSummoner)->AI()->AttackStart(pWho);
+                    if (pSummoner && pSummoner->GetTypeId() == TYPEID_UNIT && pSummoner->isAlive() && !pSummoner->isInCombat())
+                        pSummoner->ToCreature()->AI()->AttackStart(pWho);
                 }
             }
         }
@@ -492,10 +492,10 @@ public:
 
             if (me->isSummon())
             {
-                if (Unit* pSummoner = CAST_SUM(me)->GetSummoner())
+                if (Unit* pSummoner = me->ToTempSummon()->GetSummoner())
                 {
-                    if (pSummoner && pSummoner->isAlive())
-                        CAST_CRE(pSummoner)->DisappearAndDie();
+                    if (pSummoner && pSummoner->GetTypeId() == TYPEID_UNIT && pSummoner->isAlive())
+                        pSummoner->ToCreature()->DisappearAndDie();
                 }
             }
         }
@@ -507,10 +507,10 @@ public:
 
             if (me->isSummon())
             {
-                if (Unit* pSummoner = CAST_SUM(me)->GetSummoner())
+                if (Unit* pSummoner = me->ToTempSummon()->GetSummoner())
                 {
-                    CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, CAST_CRE(pSummoner)->AI())->uiTimer = 2000;
-                    CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, CAST_CRE(pSummoner)->AI())->uiPhase = 5;
+                    CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI())->uiTimer = 2000;
+                    CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, pSummoner->GetAI())->uiPhase = 5;
                     //me->ChangeOrient(0.0f, pSummoner);
                 }
             }