Core: Fix more warnings

--HG--
branch : trunk

10 files changed, 311 insertions, 297 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index d0fd2d83916..dab58de66d7 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -109,12 +109,12 @@ enum SummonActions
 };
 
const Position SphereSpawn[6] =
 {
-    { 786.6439f, 108.2498f, 155.6701f },
-    { 806.8429f, 150.5902f, 155.6701f },
-    { 759.1386f, 163.9654f, 155.6701f },
-    { 744.3701f, 119.5211f, 155.6701f },
-    { 710.0211f, 120.8152f, 155.6701f },
-    { 706.6383f, 161.5266f, 155.6701f },
+    { 786.6439f, 108.2498f, 155.6701f, 0 },
+    { 806.8429f, 150.5902f, 155.6701f, 0 },
+    { 759.1386f, 163.9654f, 155.6701f, 0 },
+    { 744.3701f, 119.5211f, 155.6701f, 0 },
+    { 710.0211f, 120.8152f, 155.6701f, 0 },
+    { 706.6383f, 161.5266f, 155.6701f, 0 },
 };

class boss_anubarak_trial : public CreatureScript
 {
 public:
@@ -188,7 +188,7 @@ public:
             }
         }
 
-        void MoveInLineOfSight(Unit* pWho) 
+        void MoveInLineOfSight(Unit* /*pWho*/)
         {
             if (!m_bIntro)
             {
@@ -207,7 +207,7 @@ public:
                     pTemp->setFaction(31);
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             Summons.DespawnAll();
             DoScriptText(SAY_DEATH,me);
@@ -243,7 +243,7 @@ public:
             }
         }
 
-        void EnterCombat(Unit* pWho)
+        void EnterCombat(Unit* /*pWho*/)
         {
             DoScriptText(SAY_AGGRO,me);
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -575,7 +575,7 @@ public:
             DoCast(SPELL_FROST_SPHERE);
         }
 
-        void DamageTaken(Unit* pWho, uint32& uiDamage)
+        void DamageTaken(Unit* /*pWho*/, uint32& uiDamage)
         {
             if (me->GetHealth() < uiDamage)
             {
@@ -595,7 +595,7 @@ public:
 
         void MovementInform(uint32 uiType, uint32 uiId)
         {
-            if(uiType != POINT_MOTION_TYPE) return;
+            if (uiType != POINT_MOTION_TYPE) return;
 
             switch (uiId)
             {
@@ -663,7 +663,7 @@ public:
             me->TauntApply(pWho);
         }
 
-        void DamageTaken(Unit* pWho, uint32& uiDamage)
+        void DamageTaken(Unit* /*pWho*/, uint32& uiDamage)
         {
             uiDamage = 0;
         }
@@ -680,6 +680,7 @@ public:
             }
 
             if (m_uiIncreaseSpeedTimer)
+            {
                 if (m_uiIncreaseSpeedTimer <= uiDiff) 
                 {
                     switch (m_uiSpeed)
@@ -701,6 +702,7 @@ public:
                             break;
                     }
                 } else m_uiIncreaseSpeedTimer -= uiDiff;
+            }
         }
     };
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index b3119228d93..c106b59e347 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -255,7 +255,7 @@ struct boss_faction_championsAI : public ScriptedAI
 
     void JustReachedHome()
     {
-        if(m_pInstance) 
+        if (m_pInstance) 
             if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                 pChampionController->AI()->SetData(2, FAIL);
         me->ForcedDespawn();
@@ -274,12 +274,12 @@ struct boss_faction_championsAI : public ScriptedAI
         std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList();
         std::list<HostileReference*>::const_iterator itr;
         bool empty = true;
-        for(itr = tList.begin(); itr!=tList.end(); ++itr)
+        for (itr = tList.begin(); itr!=tList.end(); ++itr)
         {
             Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
             if (pUnit && me->getThreatManager().getThreat(pUnit))
             {
-                if(pUnit->GetTypeId()==TYPEID_PLAYER)
+                if (pUnit->GetTypeId()==TYPEID_PLAYER)
                 {
                     float threat = CalculateThreat(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth());
                     me->getThreatManager().modifyThreatPercent(pUnit, -100);
@@ -292,9 +292,9 @@ struct boss_faction_championsAI : public ScriptedAI
 
     void UpdatePower()
     {
-        if(me->getPowerType() == POWER_MANA)
+        if (me->getPowerType() == POWER_MANA)
             me->ModifyPower(POWER_MANA, me->GetMaxPower(POWER_MANA) / 3);
-        //else if(me->getPowerType() == POWER_ENERGY)
+        //else if (me->getPowerType() == POWER_ENERGY)
         //    me->ModifyPower(POWER_ENERGY, 100);
     }
 
@@ -308,19 +308,19 @@ struct boss_faction_championsAI : public ScriptedAI
         //DoCast(me, SPELL_PVP_TRINKET);
     }
 
-    void JustDied(Unit *killer)
+    void JustDied(Unit* /*killer*/)
     {
-        if(mAIType != AI_PET)
-            if(m_pInstance) 
+        if (mAIType != AI_PET)
+            if (m_pInstance) 
                 if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                     pChampionController->AI()->SetData(2, DONE);
     }
 
-    void EnterCombat(Unit *who)
+    void EnterCombat(Unit* /*who*/)
     {
         DoCast(me, SPELL_ANTI_AOE, true);
         me->SetInCombatWithZone();
-        if(m_pInstance) 
+        if (m_pInstance) 
             if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                 pChampionController->AI()->SetData(2, IN_PROGRESS);
     }
@@ -339,8 +339,10 @@ struct boss_faction_championsAI : public ScriptedAI
             if (m_pInstance)
             {
                 if (TeamInInstance == ALLIANCE)
+                {
                     if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_VARIAN)))
                         DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0,3), pTemp); // + cause we are on negative
+                }
                 else 
                     if (Creature* pTemp = me->FindNearestCreature(NPC_GARROSH, 300.f))
                         DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0,3), pTemp); // + cause we are on negative
@@ -354,22 +356,22 @@ struct boss_faction_championsAI : public ScriptedAI
     {
         std::list<Creature *> lst = DoFindFriendlyMissingBuff(40.0f, spell);
         std::list<Creature *>::const_iterator itr = lst.begin();
-        if(lst.empty()) 
+        if (lst.empty()) 
             return NULL;
         advance(itr, rand()%lst.size());
         return (*itr);
     }
 
-    Unit* SelectEnemyCaster(bool casting)
+    Unit* SelectEnemyCaster(bool /*casting*/)
     {
         std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList();
         std::list<HostileReference*>::const_iterator iter;
-        for(iter = tList.begin(); iter!=tList.end(); ++iter)
+        Unit *target;
+        for (iter = tList.begin(); iter!=tList.end(); ++iter)
         {
-            Unit *target;
-            if(target = Unit::GetUnit((*me),(*iter)->getUnitGuid()))
-                if(target->getPowerType() == POWER_MANA)
-                    return target;
+            target = Unit::GetUnit((*me),(*iter)->getUnitGuid());
+            if (target && target->getPowerType() == POWER_MANA)
+                return target;
         }
         return NULL;
     }
@@ -379,11 +381,11 @@ struct boss_faction_championsAI : public ScriptedAI
         std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList();
         std::list<HostileReference*>::const_iterator iter;
         uint32 count = 0;
-        for(iter = tList.begin(); iter!=tList.end(); ++iter)
+        Unit *target;
+        for (iter = tList.begin(); iter!=tList.end(); ++iter)
         {
-            Unit *target;
-            if(target = Unit::GetUnit((*me),(*iter)->getUnitGuid()))
-                if(me->GetDistance2d(target) < distance)
+            target = Unit::GetUnit((*me),(*iter)->getUnitGuid());
+                if (target && me->GetDistance2d(target) < distance)
                     ++count;
         }
         return count;
@@ -399,7 +401,7 @@ struct boss_faction_championsAI : public ScriptedAI
             me->SetInCombatWith(pWho);
             pWho->SetInCombatWith(me);
 
-            if(mAIType == AI_MELEE || mAIType == AI_PET)
+            if (mAIType == AI_MELEE || mAIType == AI_PET)
                 DoStartMovement(pWho);
             else
                 DoStartMovement(pWho, 20.0f);
@@ -409,7 +411,7 @@ struct boss_faction_championsAI : public ScriptedAI
 
     void UpdateAI(const uint32 uiDiff)
     {
-        if(ThreatTimer < uiDiff)
+        if (ThreatTimer < uiDiff)
         {
             UpdatePower();
             UpdateThreat();
@@ -417,15 +419,17 @@ struct boss_faction_championsAI : public ScriptedAI
         }
         else ThreatTimer -= uiDiff;
 
-        if(mAIType != AI_PET)
-            if(CCTimer < uiDiff)
+        if (mAIType != AI_PET)
+        {
+            if (CCTimer < uiDiff)
             {
                 RemoveCC();
                 CCTimer = 8000+rand()%2000;
             }
             else CCTimer -= uiDiff;
+        }
 
-        if(mAIType == AI_MELEE || mAIType == AI_PET) DoMeleeAttackIfReady();
+        if (mAIType == AI_MELEE || mAIType == AI_PET) DoMeleeAttackIfReady();
     }
 };
 
@@ -512,7 +516,7 @@ public:
                         DoCast(me,SPELL_REJUVENATION);
                         break;
                     case 4:
-                        if(Creature* pTarget = SelectRandomFriendlyMissingBuff(SPELL_THORNS))
+                        if (Creature* pTarget = SelectRandomFriendlyMissingBuff(SPELL_THORNS))
                             DoCast(pTarget,SPELL_THORNS);
                         break;
                 }
@@ -572,8 +576,10 @@ public:
             if (m_uiHeroismOrBloodlustTimer <= uiDiff)
             {
                 if (me->getFaction()) //Am i alliance?
+                {
                     if (!me->HasAura(AURA_EXHAUSTION)) 
                         DoCastAOE(SPELL_HEROISM);
+                }
                 else 
                     if (!me->HasAura(AURA_SATED)) 
                         DoCastAOE(SPELL_BLOODLUST);
@@ -604,7 +610,7 @@ public:
                         DoCast(me,SPELL_SPIRIT_CLEANSE);
                         break;
                     case 5:
-                        if(Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD))
+                        if (Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD))
                             DoCast(pTarget,SPELL_EARTH_SHIELD);
                         break;
                 }
@@ -668,15 +674,15 @@ public:
             if (m_uiBubbleTimer <= uiDiff)
             {
                 //cast bubble at 20% hp
-                if(HealthBelowPct(20))
+                if (HealthBelowPct(20))
                     DoCast(me,SPELL_BUBBLE);
                 m_uiBubbleTimer = urand(0*IN_MILLISECONDS,360*IN_MILLISECONDS);
             } else m_uiBubbleTimer -= uiDiff;
 
             if (m_uiHandOfProtectionTimer <= uiDiff)
             {
-                if(Unit *pTarget = DoSelectLowestHpFriendly(40.0f))
-                    if(pTarget->GetHealth() * 100 < pTarget->GetMaxHealth() * 15) // HealthBelowPct(15)
+                if (Unit *pTarget = DoSelectLowestHpFriendly(40.0f))
+                    if (pTarget->GetHealth() * 100 < pTarget->GetMaxHealth() * 15) // HealthBelowPct(15)
                         DoCast(pTarget,SPELL_HAND_OF_PROTECTION);
                 m_uiHandOfProtectionTimer = urand(0*IN_MILLISECONDS,360*IN_MILLISECONDS);
             } else m_uiHandOfProtectionTimer -= uiDiff;
@@ -690,7 +696,7 @@ public:
 
             if (m_uiHandOfFreedomTimer <= uiDiff)
             {
-                if(Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM))
+                if (Unit *pTarget = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM))
                     DoCast(pTarget,SPELL_HAND_OF_FREEDOM);
                 m_uiHandOfFreedomTimer = urand(25*IN_MILLISECONDS,40*IN_MILLISECONDS);
             } else m_uiHandOfFreedomTimer -= uiDiff;
@@ -764,7 +770,7 @@ public:
 
             if (m_uiPsychicScreamTimer <= uiDiff)
             {
-                if(EnemiesInRange(10.0f) > 2)
+                if (EnemiesInRange(10.0f) > 2)
                     DoCastAOE(SPELL_PSYCHIC_SCREAM);
                 m_uiPsychicScreamTimer = urand(5*IN_MILLISECONDS,25*IN_MILLISECONDS);
             } else m_uiPsychicScreamTimer -= uiDiff;
@@ -783,7 +789,7 @@ public:
                         DoCast(me,SPELL_FLASH_HEAL);
                         break;
                     case 4:
-                        if(Unit *pTarget = urand(0,1) ? SelectUnit(SELECT_TARGET_RANDOM,0) : DoSelectLowestHpFriendly(40.0f))
+                        if (Unit *pTarget = urand(0,1) ? SelectUnit(SELECT_TARGET_RANDOM,0) : DoSelectLowestHpFriendly(40.0f))
                             DoCast(pTarget, SPELL_DISPEL);
                         break;
                     case 5:
@@ -856,21 +862,21 @@ public:
 
             if (m_uiPsychicScreamTimer <= uiDiff)
             {
-                if(EnemiesInRange(10.0f) > 2)
+                if (EnemiesInRange(10.0f) > 2)
                     DoCastAOE(SPELL_PSYCHIC_SCREAM);
                 m_uiPsychicScreamTimer = urand(5*IN_MILLISECONDS,25*IN_MILLISECONDS);
             } else m_uiPsychicScreamTimer -= uiDiff;
 
             if (m_uiDispersionTimer <= uiDiff)
             {
-                if(HealthBelowPct(20))
+                if (HealthBelowPct(20))
                     DoCast(me,SPELL_DISPERSION);
                 m_uiDispersionTimer = urand(1*IN_MILLISECONDS,180*IN_MILLISECONDS);
             } else m_uiDispersionTimer -= uiDiff;
 
             if (m_uiSilenceTimer <= uiDiff)
             {
-                if(Unit *pTarget = SelectEnemyCaster(false))
+                if (Unit *pTarget = SelectEnemyCaster(false))
                     DoCast(pTarget,SPELL_SILENCE);
                 m_uiSilenceTimer = urand(8*IN_MILLISECONDS,15*IN_MILLISECONDS);
             } else m_uiSilenceTimer -= uiDiff;
@@ -899,7 +905,7 @@ public:
                             DoCast(pTarget,SPELL_SW_PAIN);
                         break;
                    case 4:
-                        if(Unit *pTarget = urand(0,1) ? SelectUnit(SELECT_TARGET_RANDOM,0) : DoSelectLowestHpFriendly(40.0f))
+                        if (Unit *pTarget = urand(0,1) ? SelectUnit(SELECT_TARGET_RANDOM,0) : DoSelectLowestHpFriendly(40.0f))
                             DoCast(pTarget, SPELL_DISPEL);
                         break;
                 }
@@ -1176,14 +1182,14 @@ public:
 
             if (m_uiDisengageTimer <= uiDiff)
             {
-                if(EnemiesInRange(10.0f) > 3)
+                if (EnemiesInRange(10.0f) > 3)
                     DoCast(SPELL_DISENGAGE);
                 m_uiDisengageTimer = urand(12*IN_MILLISECONDS,20*IN_MILLISECONDS);
             } else m_uiDisengageTimer -= uiDiff;
         
             if (m_uiDeterrenceTimer <= uiDiff)
             {
-                if(HealthBelowPct(20))
+                if (HealthBelowPct(20))
                     DoCast(SPELL_DETERRENCE);
                 m_uiDeterrenceTimer = urand(20*IN_MILLISECONDS,120*IN_MILLISECONDS);
             } else m_uiDeterrenceTimer -= uiDiff;
@@ -1500,14 +1506,14 @@ public:
 
             if (m_uiIceboundFortitudeTimer <= uiDiff)
             {
-                if(HealthBelowPct(50))
+                if (HealthBelowPct(50))
                     DoCast(me,SPELL_ICEBOUND_FORTITUDE);
                 m_uiIceboundFortitudeTimer = urand(5*IN_MILLISECONDS,90*IN_MILLISECONDS);
             } else m_uiIceboundFortitudeTimer -= uiDiff;
         
             if (m_uiChainsOfIceTimer <= uiDiff)
             {
-                if(Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
                     DoCast(pTarget,SPELL_CHAINS_OF_ICE);
                 m_uiChainsOfIceTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
             } else m_uiChainsOfIceTimer -= uiDiff;
@@ -1520,7 +1526,7 @@ public:
 
             if (m_uiStrangulateTimer <= uiDiff)
             {
-                if(Unit *pTarget = SelectEnemyCaster(false))
+                if (Unit *pTarget = SelectEnemyCaster(false))
                     DoCast(pTarget,SPELL_STRANGULATE);
                 m_uiStrangulateTimer = urand(10*IN_MILLISECONDS,90*IN_MILLISECONDS);
             } else m_uiStrangulateTimer -= uiDiff;
@@ -1539,7 +1545,7 @@ public:
         
             if (m_uiDeathGripTimer <= uiDiff)
             {
-                if(me->IsInRange(me->getVictim(), 10.0f, 30.0f, false))
+                if (me->IsInRange(me->getVictim(), 10.0f, 30.0f, false))
                     DoCastVictim(SPELL_DEATH_GRIP); 
                 m_uiDeathGripTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
             } else m_uiDeathGripTimer -= uiDiff;
@@ -1600,7 +1606,7 @@ public:
 
             if (m_uiFanOfKnivesTimer <= uiDiff)
             {
-                if(EnemiesInRange(15.0f) > 2)
+                if (EnemiesInRange(15.0f) > 2)
                     DoCastAOE(SPELL_FAN_OF_KNIVES);
                 m_uiFanOfKnivesTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
             } else m_uiFanOfKnivesTimer -= uiDiff;
@@ -1619,22 +1625,22 @@ public:
 
             if (m_uiShadowstepTimer <= uiDiff)
             {
-                if(me->IsInRange(me->getVictim(), 10.0f, 40.0f))
+                if (me->IsInRange(me->getVictim(), 10.0f, 40.0f))
                     DoCastVictim(SPELL_SHADOWSTEP);
                 m_uiShadowstepTimer = urand(10*IN_MILLISECONDS,80*IN_MILLISECONDS);
             } else m_uiShadowstepTimer -= uiDiff;
 
             if (m_uiBlindTimer <= uiDiff)
             {
-                if(Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
-                    if(me->IsInRange(pTarget, 0.0f, 15.0f, false))
+                if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
+                    if (me->IsInRange(pTarget, 0.0f, 15.0f, false))
                         DoCast(pTarget,SPELL_BLIND);
                 m_uiBlindTimer = urand(7*IN_MILLISECONDS,8*IN_MILLISECONDS);
             } else m_uiBlindTimer -= uiDiff;
 
             if (m_uiCloakTimer <= uiDiff)
             {
-                if(HealthBelowPct(50))
+                if (HealthBelowPct(50))
                     DoCast(me,SPELL_CLOAK);
                 m_uiCloakTimer = urand(20*IN_MILLISECONDS,120*IN_MILLISECONDS);
             } else m_uiCloakTimer -= uiDiff;
@@ -1701,7 +1707,7 @@ public:
             Summons.Summon(pSummoned);
         }
     
-        void SummonedCreatureDespawn(Creature* pSummoned) 
+        void SummonedCreatureDespawn(Creature* /*pSummoned*/) 
         {
             --m_uiTotemCount;
         }
@@ -1737,8 +1743,10 @@ public:
             if (m_uiHeroismOrBloodlustTimer <= uiDiff)
             {
                 if (me->getFaction()) //Am i alliance?
+                {
                     if (!me->HasAura(AURA_EXHAUSTION)) 
                         DoCastAOE(SPELL_HEROISM);
+                }
                 else 
                     if (!me->HasAura(AURA_SATED)) 
                         DoCastAOE(SPELL_BLOODLUST);
@@ -1833,7 +1841,7 @@ public:
 
             if (m_uiRepeteanceTimer <= uiDiff)
             {
-                if(Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
                     DoCast(pTarget,SPELL_REPENTANCE);
                 m_uiRepeteanceTimer = 60*IN_MILLISECONDS;
             } else m_uiRepeteanceTimer -= uiDiff;
@@ -1852,7 +1860,7 @@ public:
 
             if (m_uiDivineShieldTimer <= uiDiff)
             {
-                if(HealthBelowPct(20))
+                if (HealthBelowPct(20))
                     DoCast(me,SPELL_DIVINE_SHIELD);
                 m_uiDivineShieldTimer = urand(0*IN_MILLISECONDS,360*IN_MILLISECONDS);
             } else m_uiDivineShieldTimer -= uiDiff;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 2746e5b277a..02c590a6a54 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -117,7 +117,7 @@ public:
 
         void Reset() 
         {
-            if(m_pInstance)
+            if (m_pInstance)
                 m_pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED);
             SetEquipmentSlots(false, EQUIP_MAIN, EQUIP_OFFHAND, EQUIP_RANGED);
             m_uiFelFireballTimer = 5*IN_MILLISECONDS;
@@ -149,7 +149,7 @@ public:
             }
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             Summons.DespawnAll();
             DoScriptText(SAY_DEATH,me);
@@ -162,7 +162,7 @@ public:
             Summons.Summon(pSummoned);
         }
 
-        void EnterCombat(Unit* pWho)
+        void EnterCombat(Unit* /*pWho*/)
         {
             me->SetInCombatWithZone();
             if (m_pInstance)
@@ -270,7 +270,7 @@ public:
             DoCast(SPELL_LEGION_FLAME_EFFECT);
         }
 
-        void UpdateAI(const uint32 uiDiff)
+        void UpdateAI(const uint32 /*uiDiff*/)
         {
             if (!UpdateVictim())
                 return;
@@ -330,7 +330,7 @@ public:
             pSummoned->SetCorpseDelay(0);
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             me->ForcedDespawn();
         }
@@ -514,7 +514,7 @@ public:
             me->SetInCombatWithZone();
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             if (m_pInstance)
                 m_pInstance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 9bbe93f3aa7..a1d58c5eb88 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -146,7 +146,7 @@ public:
             Summons.DespawnAll();
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             if (m_pInstance)
                 m_pInstance->SetData(TYPE_NORTHREND_BEASTS,GORMOK_DONE);
@@ -159,7 +159,7 @@ public:
             me->ForcedDespawn();
         }
 
-        void EnterCombat(Unit* pWho)
+        void EnterCombat(Unit* /*pWho*/)
         {
             me->SetInCombatWithZone();
             m_pInstance->SetData(TYPE_NORTHREND_BEASTS,GORMOK_IN_PROGRESS);
@@ -279,7 +279,7 @@ public:
 
         void MovementInform(uint32 uiType, uint32 uiId)
         {
-            if(uiType != POINT_MOTION_TYPE) return;
+            if (uiType != POINT_MOTION_TYPE) return;
 
             switch (uiId)
             {
@@ -290,7 +290,7 @@ public:
             }
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             if (Unit *pTarget = Unit::GetPlayer(*me,m_uiTargetGUID))
                 if (pTarget->isAlive())
@@ -396,14 +396,18 @@ struct boss_jormungarAI : public ScriptedAI
         m_uiSweepTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
     }
 
-    void JustDied(Unit* pKiller)
+    void JustDied(Unit* /*pKiller*/)
     {
         if (m_pInstance)
+        {
             if (Creature* pSister = Unit::GetCreature((*me),m_pInstance->GetData64(m_uiSisterID)))
+            {
                 if (!pSister->isAlive())
                     m_pInstance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_DONE);
                 else 
                     m_pInstance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_SPECIAL);
+            }
+        }
     }
 
     void JustReachedHome()
@@ -422,7 +426,7 @@ struct boss_jormungarAI : public ScriptedAI
         }
     }
 
-    void EnterCombat(Unit* pWho)
+    void EnterCombat(Unit* /*pWho*/)
     {
         me->SetInCombatWithZone();
         if (m_pInstance)
@@ -646,7 +650,7 @@ public:
             me->ForcedDespawn(60*IN_MILLISECONDS);
         }
 
-        void UpdateAI(const uint32 uiDiff)
+        void UpdateAI(const uint32 /*uiDiff*/)
         {
             if (!casted)
             {
@@ -706,7 +710,7 @@ public:
             m_uiStage = 0;
         }
 
-        void JustDied(Unit* pKiller)
+        void JustDied(Unit* /*pKiller*/)
         {
             if (m_pInstance)
                 m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE);
@@ -714,7 +718,7 @@ public:
 
         void MovementInform(uint32 uiType, uint32 uiId)
         {
-            if(uiType != POINT_MOTION_TYPE) return;
+            if (uiType != POINT_MOTION_TYPE) return;
 
             switch (uiId)
             {
@@ -727,7 +731,7 @@ public:
                     else
                     {
                         // Landed from Hop backwards (start trample)
-                        if(Unit* pTarget = Unit::GetPlayer(*me,m_uiTrampleTargetGUID))
+                        if (Unit::GetPlayer(*me,m_uiTrampleTargetGUID))
                         {
                             m_uiStage = 4;
                         } else m_uiStage = 6;
@@ -755,7 +759,7 @@ public:
             }
         }
 
-        void EnterCombat(Unit* pWho)
+        void EnterCombat(Unit* /*pWho*/)
         {
             if (m_pInstance)
                 m_pInstance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS);
@@ -764,7 +768,7 @@ public:
 
         void SpellHitTarget(Unit* target, const SpellEntry* spell)
         {
-            if(spell->Id == SPELL_TRAMPLE && target->GetTypeId() == TYPEID_PLAYER)
+            if (spell->Id == SPELL_TRAMPLE && target->GetTypeId() == TYPEID_PLAYER)
             {
                 if (!m_bTrampleCasted)
                 {
@@ -831,7 +835,7 @@ public:
                 case 3:
                     if (m_uiTrampleTimer <= uiDiff)
                     {
-                        if(Unit* pTarget = Unit::GetPlayer(*me,m_uiTrampleTargetGUID))
+                        if (Unit* pTarget = Unit::GetPlayer(*me,m_uiTrampleTargetGUID))
                         {
                             m_bTrampleCasted = false;
                             m_bMovementStarted = true;
@@ -863,7 +867,7 @@ public:
                     if (m_uiTrampleTimer <= uiDiff)
                     {
                         Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers();
-                        for(Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+                        for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
                         {
                             if (Unit* pPlayer = itr->getSource()) 
                                 if (pPlayer->isAlive() && pPlayer->IsWithinDistInMap(me, 6.0f)) 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index d755aa821bc..7b5fba4ca82 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -172,7 +172,7 @@ struct boss_twin_baseAI : public ScriptedAI
 
     void MovementInform(uint32 uiType, uint32 uiId)
     {
-        if(uiType != POINT_MOTION_TYPE) return;
+        if (uiType != POINT_MOTION_TYPE) return;
 
         switch (uiId)
         {
@@ -218,7 +218,7 @@ struct boss_twin_baseAI : public ScriptedAI
             case NPC_DARK_ESSENCE:
                 Map* pMap = me->GetMap();
                 Map::PlayerList const &lPlayers = pMap->GetPlayers();
-                for(Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
+                for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
                 {
                     Unit* pPlayer = itr->getSource();
                     if (!pPlayer) continue;
@@ -243,12 +243,12 @@ struct boss_twin_baseAI : public ScriptedAI
 
         if (pDoneBy->GetTypeId() == TYPEID_PLAYER)
         {
-            if(pDoneBy->HasAura(m_uiOtherEssenceSpellId))
+            if (pDoneBy->HasAura(m_uiOtherEssenceSpellId))
                 uiDamage += uiDamage/2;
-            if(pDoneBy->HasAura(m_uiEmpoweredWeaknessSpellId))
+            if (pDoneBy->HasAura(m_uiEmpoweredWeaknessSpellId))
                 uiDamage += uiDamage;
             else
-                if(pDoneBy->HasAura(m_uiMyEssenceSpellId))
+                if (pDoneBy->HasAura(m_uiMyEssenceSpellId))
                     uiDamage /= 2;
         }
 
@@ -279,19 +279,21 @@ struct boss_twin_baseAI : public ScriptedAI
         }
     }
 
-    void JustDied(Unit* pKiller)
+    void JustDied(Unit* /*pKiller*/)
     {
         DoScriptText(SAY_DEATH,me);
         if (m_pInstance) 
         {
             m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, 0);
             if (Creature* pSister = GetSister())
+            {
                 if (!pSister->isAlive())
                 {
                     m_pInstance->SetData(TYPE_VALKIRIES, DONE);
                     Summons.DespawnAll();
                 }
                 else m_pInstance->SetData(TYPE_VALKIRIES, SPECIAL);
+            }
         }
         Summons.DespawnAll();
     }
@@ -302,7 +304,7 @@ struct boss_twin_baseAI : public ScriptedAI
         return Unit::GetCreature((*me),m_pInstance->GetData64(m_uiSisterNpcId));
     }
 
-    void EnterCombat(Unit* pWho)
+    void EnterCombat(Unit* /*pWho*/)
     {
         me->SetInCombatWithZone();
         if (m_pInstance)
@@ -579,7 +581,7 @@ struct mob_unleashed_ballAI : public ScriptedAI
 
     void MovementInform(uint32 uiType, uint32 uiId)
     {
-        if(uiType != POINT_MOTION_TYPE) return;
+        if (uiType != POINT_MOTION_TYPE) return;
 
         switch (uiId)
         {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index b39e1cca7d7..66f139debb5 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -113,7 +113,7 @@ public:
 
         bool IsEncounterInProgress() const
         {
-            for(uint8 i = 0; i < MAX_ENCOUNTERS ; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTERS ; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     return true;
             return false;
@@ -134,9 +134,9 @@ public:
 
             for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
             {
-                if(Player* pPlayer = i->getSource())
+                if (Player* pPlayer = i->getSource())
                 {
-                    if(pPlayer->isAlive())
+                    if (pPlayer->isAlive())
                         return false;
                 }
             }
@@ -145,16 +145,16 @@ public:
 
         void OpenDoor(uint64 guid)
         {
-            if(!guid) return;
+            if (!guid) return;
             GameObject* pGo = instance->GetGameObject(guid);
-            if(pGo) pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+            if (pGo) pGo->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
         }
 
         void CloseDoor(uint64 guid)
         {
-            if(!guid) return;
+            if (!guid) return;
             GameObject* pGo = instance->GetGameObject(guid);
-            if(pGo) pGo->SetGoState(GO_STATE_READY);
+            if (pGo) pGo->SetGoState(GO_STATE_READY);
         }
 
         void OnCreatureCreate(Creature* pCreature, bool /*add*/)
@@ -179,24 +179,24 @@ public:
             }
         }
 
-        void OnGameObjectCreate(GameObject* pGO, bool bAdd)
+        void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/)
         {
             switch(pGO->GetEntry())
             {
                 case GO_CRUSADERS_CACHE_10:
-                    if(instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL)
+                    if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL)
                         m_uiCrusadersCacheGUID = pGO->GetGUID(); 
                     break;
                 case GO_CRUSADERS_CACHE_25:
-                    if(instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL)
+                    if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL)
                         m_uiCrusadersCacheGUID = pGO->GetGUID(); 
                     break;
                 case GO_CRUSADERS_CACHE_10_H:
-                    if(instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC)
+                    if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC)
                         m_uiCrusadersCacheGUID = pGO->GetGUID(); 
                     break;
                 case GO_CRUSADERS_CACHE_25_H:
-                    if(instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC)
+                    if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC)
                         m_uiCrusadersCacheGUID = pGO->GetGUID(); 
                     break;
                 case GO_ARGENT_COLISEUM_FLOOR: m_uiFloorGUID = pGO->GetGUID(); break;
@@ -520,20 +520,18 @@ public:
 
         void Update(uint32 uiDiff)
         {
-            if (GetData(TYPE_NORTHREND_BEASTS) == SNAKES_SPECIAL)
+            if (GetData(TYPE_NORTHREND_BEASTS) == SNAKES_SPECIAL && m_uiNotOneButTwoJormungarsTimer)
             {
-                if (m_uiNotOneButTwoJormungarsTimer)
-                    if (m_uiNotOneButTwoJormungarsTimer <= uiDiff)
-                        m_uiNotOneButTwoJormungarsTimer = 0;
-                    else m_uiNotOneButTwoJormungarsTimer -= uiDiff;
+                if (m_uiNotOneButTwoJormungarsTimer <= uiDiff)
+                    m_uiNotOneButTwoJormungarsTimer = 0;
+                else m_uiNotOneButTwoJormungarsTimer -= uiDiff;
             }
 
-            if (GetData(TYPE_CRUSADERS) == IN_PROGRESS)
+            if (GetData(TYPE_CRUSADERS) == IN_PROGRESS && m_uiResilienceWillFixItTimer)
             {
-                if (m_uiResilienceWillFixItTimer)
-                    if (m_uiResilienceWillFixItTimer <= uiDiff)
-                        m_uiResilienceWillFixItTimer = 0;
-                    else m_uiResilienceWillFixItTimer -= uiDiff;
+                if (m_uiResilienceWillFixItTimer <= uiDiff)
+                    m_uiResilienceWillFixItTimer = 0;
+                else m_uiResilienceWillFixItTimer -= uiDiff;
             }
         }
 
@@ -543,7 +541,7 @@ public:
 
             std::ostringstream saveStream;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
                 saveStream << m_auiEncounter[i] << " ";
 
             saveStream << m_uiTrialCounter;
@@ -571,7 +569,7 @@ public:
 
             std::istringstream loadStream(strIn);
 
-            for(uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
             {
                 loadStream >> m_auiEncounter[i];
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 9d187ead517..e31083824a6 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -112,13 +112,13 @@ class npc_announcer_toc10 : public CreatureScript
             void Reset()
             {
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                if(Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f))
+                if (Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f))
                     pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                if(Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_PROUDMOORE, 300.0f))
+                if (Creature *pAlly = GetClosestCreatureWithEntry(me, NPC_PROUDMOORE, 300.0f))
                     pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
 
-            void AttackStart(Unit* pWho) {}
+            void AttackStart(Unit* /*pWho*/) {}
         };
 
         bool OnGossipHello(Player* pPlayer, Creature* pCreature)
@@ -133,7 +133,7 @@ class npc_announcer_toc10 : public CreatureScript
                 return true;
 
             uint8 i;
-            for(i = 0; i < NUM_MESSAGES; i++)
+            for (i = 0; i < NUM_MESSAGES; i++)
             {
                 if ((!_GossipMessage[i].state && m_pInstance->GetData(_GossipMessage[i].encounter) != DONE)
                     || (_GossipMessage[i].state && m_pInstance->GetData(_GossipMessage[i].encounter) == DONE))
@@ -147,7 +147,7 @@ class npc_announcer_toc10 : public CreatureScript
             return true;
         }
 
-        bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
+        bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
         {
             InstanceScript* m_pInstance;
             m_pInstance = (InstanceScript*)pCreature->GetInstanceScript();
@@ -319,7 +319,7 @@ class boss_lich_king_toc : public CreatureScript
                             if (GameObject* pGoFloor = m_pInstance->instance->GetGameObject(m_pInstance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
                                 pGoFloor->TakenDamage(1000000);
                             me->CastSpell(me,69016,false);
-                            if(m_pInstance) m_pInstance->SetData(TYPE_LICH_KING,DONE);
+                            if (m_pInstance) m_pInstance->SetData(TYPE_LICH_KING,DONE);
                             Creature* pTemp = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_ANUBARAK));
                             if (!pTemp || !pTemp->isAlive())
                                 pTemp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
@@ -379,7 +379,7 @@ class npc_fizzlebang_toc : public CreatureScript
 
             void MovementInform(uint32 uiType, uint32 uiId)
             {
-                if(uiType != POINT_MOTION_TYPE) return;
+                if (uiType != POINT_MOTION_TYPE) return;
 
                 switch (uiId)
                 {
@@ -402,7 +402,7 @@ class npc_fizzlebang_toc : public CreatureScript
 
             void UpdateAI(const uint32 uiDiff)
             {
-                if(!m_pInstance) return;
+                if (!m_pInstance) return;
 
                 if (m_pInstance->GetData(TYPE_EVENT_NPC) != NPC_FIZZLEBANG) return;
 
@@ -524,7 +524,7 @@ class npc_tirion_toc : public CreatureScript
 
             void Reset() {}
 
-            void AttackStart(Unit* pWho) {}
+            void AttackStart(Unit* /*pWho*/) {}
 
             void UpdateAI(const uint32 uiDiff)
             {
@@ -838,7 +838,7 @@ class npc_garrosh_toc : public CreatureScript
 
             void Reset() {}
 
-            void AttackStart(Unit* pWho) {}
+            void AttackStart(Unit* /*pWho*/) {}
 
             void UpdateAI(const uint32 uiDiff)
             {
@@ -916,7 +916,7 @@ class npc_varian_toc : public CreatureScript
 
             void Reset() {}
 
-            void AttackStart(Unit* pWho) {}
+            void AttackStart(Unit* /*pWho*/) {}
 
             void UpdateAI(const uint32 uiDiff)
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index 9f387d63314..9adbda74918 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
@@ -37,91 +37,91 @@ enum
     DESPAWN_TIME                = 300000,
 };
 
-static Position ToCCommonLoc[]=
+const Position ToCCommonLoc[]=
 {
-    {559.257996f, 90.266197f, 395.122986f},  //  0 Barrent
-
-    {563.672974f, 139.571f, 393.837006f},    //  1 Center
-    {563.833008f, 187.244995f, 394.5f},      //  2 Backdoor
-    {577.347839f, 195.338888f, 395.14f},     //  3 - Right
-    {550.955933f, 195.338888f, 395.14f},     //  4 - Left
-    {563.833008f, 195.244995f, 394.585561f}, //  5 - Center    
-    {573.5f, 180.5f, 395.14f},               //  6 Move 0 Right
-    {553.5f, 180.5f, 395.14f},               //  7 Move 0 Left
-    {585.5f, 170.0f, 395.14f},               //  8 Move 1 Right
-    {545.5f, 170.0f, 395.14f},               //  9 Move 1 Left
-    {563.8f, 216.1f, 395.1f},                // 10 Behind the door
-
-    {575.042358f, 195.260727f, 395.137146f}, // 5
-    {552.248901f, 195.331955f, 395.132658f}, // 6
-    {573.342285f, 195.515823f, 395.135956f}, // 7
-    {554.239929f, 195.825577f, 395.137909f}, // 8
-    {571.042358f, 195.260727f, 395.137146f}, // 9
-    {556.720581f, 195.015472f, 395.132658f}, // 10
-    {569.534119f, 195.214478f, 395.139526f}, // 11
-    {569.231201f, 195.941071f, 395.139526f}, // 12
-    {558.811610f, 195.985779f, 394.671661f}, // 13
-    {567.641724f, 195.351501f, 394.659943f}, // 14
-    {560.633972f, 195.391708f, 395.137543f}, // 15
-    {565.816956f, 195.477921f, 395.136810f}, // 16
+    {559.257996f, 90.266197f, 395.122986f, 0},  //  0 Barrent
+
+    {563.672974f, 139.571f, 393.837006f, 0},    //  1 Center
+    {563.833008f, 187.244995f, 394.5f, 0},      //  2 Backdoor
+    {577.347839f, 195.338888f, 395.14f, 0},     //  3 - Right
+    {550.955933f, 195.338888f, 395.14f, 0},     //  4 - Left
+    {563.833008f, 195.244995f, 394.585561f, 0}, //  5 - Center    
+    {573.5f, 180.5f, 395.14f, 0},               //  6 Move 0 Right
+    {553.5f, 180.5f, 395.14f, 0},               //  7 Move 0 Left
+    {585.5f, 170.0f, 395.14f, 0},               //  8 Move 1 Right
+    {545.5f, 170.0f, 395.14f, 0},               //  9 Move 1 Left
+    {563.8f, 216.1f, 395.1f, 0},                // 10 Behind the door
+
+    {575.042358f, 195.260727f, 395.137146f, 0}, // 5
+    {552.248901f, 195.331955f, 395.132658f, 0}, // 6
+    {573.342285f, 195.515823f, 395.135956f, 0}, // 7
+    {554.239929f, 195.825577f, 395.137909f, 0}, // 8
+    {571.042358f, 195.260727f, 395.137146f, 0}, // 9
+    {556.720581f, 195.015472f, 395.132658f, 0}, // 10
+    {569.534119f, 195.214478f, 395.139526f, 0}, // 11
+    {569.231201f, 195.941071f, 395.139526f, 0}, // 12
+    {558.811610f, 195.985779f, 394.671661f, 0}, // 13
+    {567.641724f, 195.351501f, 394.659943f, 0}, // 14
+    {560.633972f, 195.391708f, 395.137543f, 0}, // 15
+    {565.816956f, 195.477921f, 395.136810f, 0}, // 16
 };
 
-static Position JaraxxusLoc[]=
+const Position JaraxxusLoc[]=
 {
-    {508.104767f, 138.247345f, 395.128052f}, // 0 - Fizzlebang start location
-    {548.610596f, 139.807800f, 394.321838f}, // 1 - fizzlebang end
-    {581.854187f, 138.0f, 394.319f},         // 2 - Portal Right
-    {550.558838f, 138.0f, 394.319f},         // 3 - Portal Left
+    {508.104767f, 138.247345f, 395.128052f, 0}, // 0 - Fizzlebang start location
+    {548.610596f, 139.807800f, 394.321838f, 0}, // 1 - fizzlebang end
+    {581.854187f, 138.0f, 394.319f, 0},         // 2 - Portal Right
+    {550.558838f, 138.0f, 394.319f, 0},         // 3 - Portal Left
 };
 
-static Position FactionChampionLoc[]=
+const Position FactionChampionLoc[]=
 {
-    {514.231f,105.569f,418.234f},               //  0 - Horde Initial Pos 0
-    {508.334f,115.377f,418.234f},               //  1 - Horde Initial Pos 1
-    {506.454f,126.291f,418.234f},               //  2 - Horde Initial Pos 2
-    {506.243f,106.596f,421.592f},               //  3 - Horde Initial Pos 3
-    {499.885f,117.717f,421.557f},               //  4 - Horde Initial Pos 4
-
-    {613.127f,100.443f,419.74f},                //  5 - Ally Initial Pos 0
-    {621.126f,128.042f,418.231f},               //  6 - Ally Initial Pos 1
-    {618.829f,113.606f,418.232f},               //  7 - Ally Initial Pos 2
-    {625.845f,112.914f,421.575f},               //  8 - Ally Initial Pos 3
-    {615.566f,109.653f,418.234f},               //  9 - Ally Initial Pos 4
-
-    {535.469f,113.012f,394.66f},                // 10 - Horde Final Pos 0
-    {526.417f,137.465f,394.749f},               // 11 - Horde Final Pos 1
-    {528.108f,111.057f,395.289f},               // 12 - Horde Final Pos 2
-    {519.92f,134.285f,395.289f},                // 13 - Horde Final Pos 3
-    {533.648f,119.148f,394.646f},               // 14 - Horde Final Pos 4
-    {531.399f,125.63f,394.708f},                // 15 - Horde Final Pos 5
-    {528.958f,131.47f,394.73f},                 // 16 - Horde Final Pos 6
-    {526.309f,116.667f,394.833f},               // 17 - Horde Final Pos 7
-    {524.238f,122.411f,394.819f},               // 18 - Horde Final Pos 8
-    {521.901f,128.488f,394.832f},               // 19 - Horde Final Pos 9
+    {514.231f,105.569f,418.234f, 0},               //  0 - Horde Initial Pos 0
+    {508.334f,115.377f,418.234f, 0},               //  1 - Horde Initial Pos 1
+    {506.454f,126.291f,418.234f, 0},               //  2 - Horde Initial Pos 2
+    {506.243f,106.596f,421.592f, 0},               //  3 - Horde Initial Pos 3
+    {499.885f,117.717f,421.557f, 0},               //  4 - Horde Initial Pos 4
+
+    {613.127f,100.443f,419.74f, 0},                //  5 - Ally Initial Pos 0
+    {621.126f,128.042f,418.231f, 0},               //  6 - Ally Initial Pos 1
+    {618.829f,113.606f,418.232f, 0},               //  7 - Ally Initial Pos 2
+    {625.845f,112.914f,421.575f, 0},               //  8 - Ally Initial Pos 3
+    {615.566f,109.653f,418.234f, 0},               //  9 - Ally Initial Pos 4
+
+    {535.469f,113.012f,394.66f, 0},                // 10 - Horde Final Pos 0
+    {526.417f,137.465f,394.749f, 0},               // 11 - Horde Final Pos 1
+    {528.108f,111.057f,395.289f, 0},               // 12 - Horde Final Pos 2
+    {519.92f,134.285f,395.289f, 0},                // 13 - Horde Final Pos 3
+    {533.648f,119.148f,394.646f, 0},               // 14 - Horde Final Pos 4
+    {531.399f,125.63f,394.708f, 0},                // 15 - Horde Final Pos 5
+    {528.958f,131.47f,394.73f, 0},                 // 16 - Horde Final Pos 6
+    {526.309f,116.667f,394.833f, 0},               // 17 - Horde Final Pos 7
+    {524.238f,122.411f,394.819f, 0},               // 18 - Horde Final Pos 8
+    {521.901f,128.488f,394.832f, 0},               // 19 - Horde Final Pos 9
 };
 
-static Position TwinValkyrsLoc[]=
+const Position TwinValkyrsLoc[]=
 {
-    {586.060242f, 117.514809f, 394.314026f}, // 0 - Dark essence 1
-    {541.602112f, 161.879837f, 394.587952f}, // 1 - Dark essence 2
-    {541.021118f, 117.262932f, 395.314819f}, // 2 - Light essence 1
-    {586.200562f, 162.145523f, 394.626129f}, // 3 - Light essence 2
+    {586.060242f, 117.514809f, 394.314026f, 0}, // 0 - Dark essence 1
+    {541.602112f, 161.879837f, 394.587952f, 0}, // 1 - Dark essence 2
+    {541.021118f, 117.262932f, 395.314819f, 0}, // 2 - Light essence 1
+    {586.200562f, 162.145523f, 394.626129f, 0}, // 3 - Light essence 2
 };
 
-static Position LichKingLoc[]=
+const Position LichKingLoc[]=
 {
-    {563.549f, 152.474f, 394.393f},          // 0 - Lich king start
-    {563.547f, 141.613f, 393.908f},          // 1 - Lich king end
+    {563.549f, 152.474f, 394.393f, 0},          // 0 - Lich king start
+    {563.547f, 141.613f, 393.908f, 0},          // 1 - Lich king end
 };
 
-static Position AnubarakLoc[]=
+const Position AnubarakLoc[]=
 {
-    {787.932556f, 133.289780f, 142.612152f},  // 0 - Anub'arak start location
-    {695.240051f, 137.834824f, 142.200000f},  // 1 - Anub'arak move point location
-    {694.886353f, 102.484665f, 142.119614f},  // 3 - Nerub Spawn
-    {694.500671f, 185.363968f, 142.117905f},  // 5 - Nerub Spawn
-    {731.987244f, 83.3824690f, 142.119614f},  // 2 - Nerub Spawn
-    {740.184509f, 193.443390f, 142.117584f},  // 4 - Nerub Spawn
+    {787.932556f, 133.289780f, 142.612152f, 0},  // 0 - Anub'arak start location
+    {695.240051f, 137.834824f, 142.200000f, 0},  // 1 - Anub'arak move point location
+    {694.886353f, 102.484665f, 142.119614f, 0},  // 3 - Nerub Spawn
+    {694.500671f, 185.363968f, 142.117905f, 0},  // 5 - Nerub Spawn
+    {731.987244f, 83.3824690f, 142.119614f, 0},  // 2 - Nerub Spawn
+    {740.184509f, 193.443390f, 142.117584f, 0},  // 4 - Nerub Spawn
 };
 
 enum euiWorldStates
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index bfc1c600462..fc1ce735924 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -85,36 +85,36 @@ enum eEnum
     DISPLAY_DESIRE                                = 30150,
 };
 
-struct
+struct outroPosition
 {
     uint32 entry[2];
     Position movePosition;
 } outroPositions[] =
 {
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47f, 2427.79f, 705.935f, 0.802851f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59f, 2428.34f, 705.935f, 0.977384f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81f, 2429.31f, 705.935f, 0.890118f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81f, 2421.12f, 705.935f, 0.890118f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43f, 2426.53f, 705.935f, 0.890118f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55f, 2418.36f, 705.935f, 1.15192f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14f, 705.935f, 1.0472f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04f, 2424.87f, 705.935f, 1.15192f } },
-    { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89f, 2421.54f, 705.935f, 0.610865f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57f, 2434.62f, 705.935f, 1.13446f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46f, 2417.99f, 705.935f, 1.06465f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81f, 2428.42f, 705.935f, 0.820305f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61f, 2412.66f, 705.935f, 0.925025f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9f, 2410.64f, 705.935f, 0.872665f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76f, 2416.73f, 705.935f, 0.942478f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23f, 2419.14f, 705.935f, 0.855211f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61f, 2416.87f, 705.935f, 0.907571f } },
-    { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77f, 2421.03f, 705.935f, 0.855211f } },
-
-    { NPC_KORELN, NPC_LORALEN, { 5602.58f, 2435.95f, 705.935f, 0.959931f } },
-    { NPC_ELANDRA, NPC_KALIRA, { 5606.13f, 2433.16f, 705.935f, 0.785398f } },
-    { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12f, 2436.6f, 705.935f, 0.890118f } },
-
-    { 0, 0, { 0.0f, 0.0f, 0.0f, 0.0f } }
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5590.47f, 2427.79f, 705.935f, 0.802851f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5593.59f, 2428.34f, 705.935f, 0.977384f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5600.81f, 2429.31f, 705.935f, 0.890118f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5600.81f, 2421.12f, 705.935f, 0.890118f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5601.43f, 2426.53f, 705.935f, 0.890118f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5601.55f, 2418.36f, 705.935f, 1.15192f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5598, 2429.14f, 705.935f, 1.0472f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5594.04f, 2424.87f, 705.935f, 1.15192f } },
+    { { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE }, { 5597.89f, 2421.54f, 705.935f, 0.610865f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE }, { 5598.57f, 2434.62f, 705.935f, 1.13446f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE }, { 5585.46f, 2417.99f, 705.935f, 1.06465f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE }, { 5605.81f, 2428.42f, 705.935f, 0.820305f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE }, { 5591.61f, 2412.66f, 705.935f, 0.925025f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE }, { 5593.9f, 2410.64f, 705.935f, 0.872665f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE }, { 5586.76f, 2416.73f, 705.935f, 0.942478f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 5592.23f, 2419.14f, 705.935f, 0.855211f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 5594.61f, 2416.87f, 705.935f, 0.907571f } },
+    { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 5589.77f, 2421.03f, 705.935f, 0.855211f } },
+
+    { { NPC_KORELN, NPC_LORALEN }, { 5602.58f, 2435.95f, 705.935f, 0.959931f } },
+    { { NPC_ELANDRA, NPC_KALIRA }, { 5606.13f, 2433.16f, 705.935f, 0.785398f } },
+    { { NPC_JAINA_PART2, NPC_SYLVANAS_PART2 }, { 5606.12f, 2436.6f, 705.935f, 0.890118f } },
+
+    { { 0, 0 }, { 0.0f, 0.0f, 0.0f, 0.0f } }
 };
 
 class boss_devourer_of_souls : public CreatureScript
@@ -176,7 +176,7 @@ public:
             {
                 if (Player *pPlayer = Unit::GetPlayer(*me, uiMirroredSoulTarget))
                 {
-                    if (Aura *pAura = pPlayer->GetAura(SPELL_MIRRORED_SOUL))
+                    if (pPlayer->GetAura(SPELL_MIRRORED_SOUL))
                     {
                         int32 mirrorDamage = (uiDamage * 45)/100;
                         me->CastCustomSpell(pPlayer, 69034, &mirrorDamage, 0, 0, true);
@@ -196,7 +196,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            Position spawnPoint = { 5618.139f, 2451.873f, 705.854f };
+            Position spawnPoint = { 5618.139f, 2451.873f, 705.854f, 0 };
 
             DoScriptText(RAND(SAY_FACE_SORROW_DEATH,SAY_FACE_DESIRE_DEATH), me);
 
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 6c5c7dd53d6..b114fbc8360 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -43,85 +43,85 @@ enum eYells
     SAY_DRAKE_BREATH_3                  = -1575013,
 };
 
-static Position SpawnLoc = {468.931f, -513.555f, 104.723f};
+static Position SpawnLoc = {468.931f, -513.555f, 104.723f, 0};
 static Position Location[]=
 {
     // Boss
-    {341.740997f, -516.955017f, 104.66900f}, // 0
-    {293.299f, -505.95f, 142.03f},           // 1
-    {301.664f, -535.164f, 146.097f},         // 2
-    {521.031006f, -544.667847f, 128.80064f}, // 3
-    {477.311981f, -509.296814f, 104.72308f}, // 4
-    {341.740997f, -516.955017f, 104.66900f}, // 5
-    {341.740997f, -516.955017f, 104.66900f}, // 6
-    {341.740997f, -516.955017f, 104.66900f}, // 7
+    {341.740997f, -516.955017f, 104.66900f, 0}, // 0
+    {293.299f, -505.95f, 142.03f, 0},           // 1
+    {301.664f, -535.164f, 146.097f, 0},         // 2
+    {521.031006f, -544.667847f, 128.80064f, 0}, // 3
+    {477.311981f, -509.296814f, 104.72308f, 0}, // 4
+    {341.740997f, -516.955017f, 104.66900f, 0}, // 5
+    {341.740997f, -516.955017f, 104.66900f, 0}, // 6
+    {341.740997f, -516.955017f, 104.66900f, 0}, // 7
     // Triggers Left
-    {469.661f, -484.546f, 104.712f},         // 8
-    {483.315f, -485.028f, 104.718f},         // 9
-    {476.87f, -487.994f, 104.735f},          //10
-    {477.512f, -497.772f, 104.728f},         //11
-    {486.287f, -500.759f, 104.722f},         //12
-    {480.1f, -503.895f, 104.722f},           //13
-    {472.391f, -505.103f, 104.723f},         //14
-    {478.885f, -510.803f, 104.723f},         //15
-    {489.529f, -508.615f, 104.723f},         //16
-    {484.272f, -508.589f, 104.723f},         //17
-    {465.328f, -506.495f, 104.427f},         //18
-    {456.885f, -508.104f, 104.447f},         //19
-    {450.177f, -507.989f, 105.247f},         //20
-    {442.273f, -508.029f, 104.813f},         //21
-    {434.225f, -508.19f, 104.787f},          //22
-    {423.902f, -508.525f, 104.274f},         //23
-    {414.551f, -508.645f, 105.136f},         //24
-    {405.787f, -508.755f, 104.988f},         //25
-    {398.812f, -507.224f, 104.82f},          //26
-    {389.702f, -506.846f, 104.729f},         //27
-    {381.856f, -506.76f, 104.756f},          //28
-    {372.881f, -507.254f, 104.779f},         //29
-    {364.978f, -508.182f, 104.673f},         //30
-    {357.633f, -508.075f, 104.647f},         //31
-    {350.008f, -506.826f, 104.588f},         //32
-    {341.69f, -506.77f, 104.499f},           //33
-    {335.31f, -505.745f, 105.18f},           //34
-    {471.178f, -510.74f, 104.723f},          //35
-    {461.759f, -510.365f, 104.199f},         //36
-    {424.07287f, -510.082916f, 104.711082f}, //37
+    {469.661f, -484.546f, 104.712f, 0},         // 8
+    {483.315f, -485.028f, 104.718f, 0},         // 9
+    {476.87f, -487.994f, 104.735f, 0},          //10
+    {477.512f, -497.772f, 104.728f, 0},         //11
+    {486.287f, -500.759f, 104.722f, 0},         //12
+    {480.1f, -503.895f, 104.722f, 0},           //13
+    {472.391f, -505.103f, 104.723f, 0},         //14
+    {478.885f, -510.803f, 104.723f, 0},         //15
+    {489.529f, -508.615f, 104.723f, 0},         //16
+    {484.272f, -508.589f, 104.723f, 0},         //17
+    {465.328f, -506.495f, 104.427f, 0},         //18
+    {456.885f, -508.104f, 104.447f, 0},         //19
+    {450.177f, -507.989f, 105.247f, 0},         //20
+    {442.273f, -508.029f, 104.813f, 0},         //21
+    {434.225f, -508.19f, 104.787f, 0},          //22
+    {423.902f, -508.525f, 104.274f, 0},         //23
+    {414.551f, -508.645f, 105.136f, 0},         //24
+    {405.787f, -508.755f, 104.988f, 0},         //25
+    {398.812f, -507.224f, 104.82f, 0},          //26
+    {389.702f, -506.846f, 104.729f, 0},         //27
+    {381.856f, -506.76f, 104.756f, 0},          //28
+    {372.881f, -507.254f, 104.779f, 0},         //29
+    {364.978f, -508.182f, 104.673f, 0},         //30
+    {357.633f, -508.075f, 104.647f, 0},         //31
+    {350.008f, -506.826f, 104.588f, 0},         //32
+    {341.69f, -506.77f, 104.499f, 0},           //33
+    {335.31f, -505.745f, 105.18f, 0},           //34
+    {471.178f, -510.74f, 104.723f, 0},          //35
+    {461.759f, -510.365f, 104.199f, 0},         //36
+    {424.07287f, -510.082916f, 104.711082f, 0}, //37
     // Triggers Right
-    {489.46f, -513.297f, 105.413f},          //38
-    {485.706f, -517.175f, 104.724f},         //39
-    {480.98f, -519.313f, 104.724f},          //40
-    {475.05f, -520.52f, 104.724f},           //41
-    {482.97f, -512.099f, 104.724f},          //42
-    {477.082f, -514.172f, 104.724f},         //43
-    {468.991f, -516.691f, 104.724f},         //44
-    {461.722f, -517.063f, 104.627f},         //45
-    {455.88f, -517.681f, 104.707f},          //46
-    {450.499f, -519.099f, 104.701f},         //47
-    {444.889f, -518.963f, 104.82f},          //48
-    {440.181f, -518.893f, 104.861f},         //49
-    {434.393f, -518.758f, 104.891f},         //50
-    {429.328f, -518.583f, 104.904f},         //51
-    {423.844f, -518.394f, 105.004f},         //52
-    {418.707f, -518.266f, 105.135f},         //53
-    {413.377f, -518.085f, 105.153f},         //54
-    {407.277f, -517.844f, 104.893f},         //55
-    {401.082f, -517.443f, 104.723f},         //56
-    {394.933f, -514.64f, 104.724f},          //57
-    {388.917f, -514.688f, 104.734f},         //58
-    {383.814f, -515.834f, 104.73f},          //59
-    {377.887f, -518.653f, 104.777f},         //60
-    {371.376f, -518.289f, 104.781f},         //61
-    {365.669f, -517.822f, 104.758f},         //62
-    {359.572f, -517.314f, 104.706f},         //63
-    {353.632f, -517.146f, 104.647f},         //64
-    {347.998f, -517.038f, 104.538f},         //65
-    {341.803f, -516.98f, 104.584f},          //66
-    {335.879f, -516.674f, 104.628f},         //67
-    {329.871f, -515.92f, 104.711f},          //68
+    {489.46f, -513.297f, 105.413f, 0},          //38
+    {485.706f, -517.175f, 104.724f, 0},         //39
+    {480.98f, -519.313f, 104.724f, 0},          //40
+    {475.05f, -520.52f, 104.724f, 0},           //41
+    {482.97f, -512.099f, 104.724f, 0},          //42
+    {477.082f, -514.172f, 104.724f, 0},         //43
+    {468.991f, -516.691f, 104.724f, 0},         //44
+    {461.722f, -517.063f, 104.627f, 0},         //45
+    {455.88f, -517.681f, 104.707f, 0},          //46
+    {450.499f, -519.099f, 104.701f, 0},         //47
+    {444.889f, -518.963f, 104.82f, 0},          //48
+    {440.181f, -518.893f, 104.861f, 0},         //49
+    {434.393f, -518.758f, 104.891f, 0},         //50
+    {429.328f, -518.583f, 104.904f, 0},         //51
+    {423.844f, -518.394f, 105.004f, 0},         //52
+    {418.707f, -518.266f, 105.135f, 0},         //53
+    {413.377f, -518.085f, 105.153f, 0},         //54
+    {407.277f, -517.844f, 104.893f, 0},         //55
+    {401.082f, -517.443f, 104.723f, 0},         //56
+    {394.933f, -514.64f, 104.724f, 0},          //57
+    {388.917f, -514.688f, 104.734f, 0},         //58
+    {383.814f, -515.834f, 104.73f, 0},          //59
+    {377.887f, -518.653f, 104.777f, 0},         //60
+    {371.376f, -518.289f, 104.781f, 0},         //61
+    {365.669f, -517.822f, 104.758f, 0},         //62
+    {359.572f, -517.314f, 104.706f, 0},         //63
+    {353.632f, -517.146f, 104.647f, 0},         //64
+    {347.998f, -517.038f, 104.538f, 0},         //65
+    {341.803f, -516.98f, 104.584f, 0},          //66
+    {335.879f, -516.674f, 104.628f, 0},         //67
+    {329.871f, -515.92f, 104.711f, 0},          //68
     // Breach Zone
-    {485.4577f, -511.2515f, 115.3011f},      //69
-    {435.1892f, -514.5232f, 118.6719f},      //70
-    {413.9327f, -540.9407f, 138.2614f},      //71
+    {485.4577f, -511.2515f, 115.3011f, 0},      //69
+    {435.1892f, -514.5232f, 118.6719f, 0},      //70
+    {413.9327f, -540.9407f, 138.2614f, 0},      //71
 };
 
 enum eCombatPhase
@@ -276,7 +276,7 @@ public:
             Summons.Despawn(pSummoned);
         }
 
-        void SpellHit(Unit *caster, const SpellEntry *spell)
+        void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
         {
             if (spell->Id == SPELL_HARPOON_DAMAGE)
             {