*Cleanup in single target auras (thanks to JuliuSZS some useable debug info)

*Add ToInstanceMap() and ToMapInstanced() typecast functions and CAST_INST macro to use in scripts.

--HG--
branch : trunk

4 files changed, 4 insertions, 5 deletions

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index e72e49c47b3..61def91b736 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -369,7 +369,7 @@ struct boss_kalecgosAI : public ScriptedAI
                 {
                     Player* pPlayer = itr->getSource();
                     if (pPlayer)
-                        ((InstanceMap*)me->GetMap())->PermBindAllPlayers(pPlayer);
+                        me->GetMap()->ToInstanceMap()->PermBindAllPlayers(pPlayer);
                 }
             }
         }
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
index 6ca2e0886c6..63bbb3f2f8b 100644
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -505,7 +505,7 @@ bool GOHello_altar(Player * /*pPlayer*/, GameObject *pGO)
             case 192519: uiStatue = pInstance->GetData64(DATA_MOORABI_STATUE); break;
             case 192520: uiStatue = pInstance->GetData64(DATA_DRAKKARI_COLOSSUS_STATUE); break;
         }
-        if (((instance_gundrak*)pInstance)->QueueActivation(uiStatue, 3500))
+        if (CAST_INST(instance_gundrak, pInstance)->QueueActivation(uiStatue, 3500))
         {
             pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
             pGO->SetGoState(GO_STATE_ACTIVE);
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 8095fefc4e4..3921b559f27 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -1497,7 +1497,7 @@ struct mob_twilight_eggsAI : public Scripted_NoMovementAI
         {
             Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON));
             if(Tenebron)
-                ((mob_tenebronAI*)Tenebron->AI())->m_bHasPortalOpen = false;
+                (CAST_AI(mob_tenebronAI,Tenebron->AI()))->m_bHasPortalOpen = false;
             SpawnWhelps();
         }
         else
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 964f30adb91..59d6baeded7 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -446,8 +446,7 @@ struct boss_skadiAI : public ScriptedAI
 
 bool GOHello_go_harpoon_launcher(Player *pPlayer, GameObject *pGO)
 {
-    ScriptedInstance* m_pInstance;
-    m_pInstance = (ScriptedInstance*)pGO->GetInstanceData();
+    ScriptedInstance* m_pInstance = pGO->GetInstanceData();
     if (!m_pInstance) return false;
 
     if (Creature* pSkadi = Unit::GetCreature((*pGO),m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS)))