Core: Fix more warnings

--HG--
branch : trunk

21 files changed, 124 insertions, 106 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
index 4c42eb803aa..a6f12ea294e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -177,10 +177,12 @@ public:
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
 
             if (pInstance)
+            {
                 if (pInstance->GetData(DATA_GHOSTKILL) >= 7)
                     me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
                 else
                     me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
         }
 
         void EnterCombat(Unit * /*who*/)
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index 2d007cf388f..a9f24cfba25 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -219,7 +219,7 @@ public:
 
         void SetData64(uint32 type, uint64 data)
         {
-            sLog.outDebug("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data %u)", type, data);
+            sLog.outDebug("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data);
 
             switch(type)
             {
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
index 6fbc83e05a3..3c7fae20124 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
@@ -121,7 +121,7 @@ public:
             } else uiNimbleReflexesTimer -= uiDiff;
         /*END ACID-AI*/
 
-            if (uiHealth == 0 && !HealthAbovePct(66) || uiHealth == 1 && !HealthAbovePct(33))
+            if ((uiHealth == 0 && !HealthAbovePct(66)) || (uiHealth == 1 && !HealthAbovePct(33)))
             {
                 ++uiHealth;
                 DoCastAOE(SPELL_SMITE_STOMP,false);
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index b70fc098d0e..3cfb2669127 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -109,7 +109,7 @@ public:
     struct netherspite_infernalAI : public ScriptedAI
     {
         netherspite_infernalAI(Creature *c) : ScriptedAI(c) ,
-            malchezaar(0), HellfireTimer(0), CleanupTimer(0), point(NULL) {}
+            HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {}
 
         uint32 HellfireTimer;
         uint32 CleanupTimer;
@@ -123,19 +123,23 @@ public:
         void UpdateAI(const uint32 diff)
         {
             if (HellfireTimer)
-                if (HellfireTimer <= diff)
             {
-                DoCast(me, SPELL_HELLFIRE);
-                HellfireTimer = 0;
+                if (HellfireTimer <= diff)
+                {
+                    DoCast(me, SPELL_HELLFIRE);
+                    HellfireTimer = 0;
+                }
+                else HellfireTimer -= diff;
             }
-            else HellfireTimer -= diff;
 
             if (CleanupTimer)
-                if (CleanupTimer <= diff)
             {
-                Cleanup();
-                CleanupTimer = 0;
-            } else CleanupTimer -= diff;
+                if (CleanupTimer <= diff)
+                {
+                    Cleanup();
+                    CleanupTimer = 0;
+                } else CleanupTimer -= diff;
+            }
         }
 
         void KilledUnit(Unit *who)
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index 44fec322a99..a36ebf52475 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -287,15 +287,17 @@ public:
 
             //Drink Interrupt Timer
             if (Drinking && !DrinkInturrupted)
+            {
                 if (DrinkInterruptTimer >= diff)
                     DrinkInterruptTimer -= diff;
-            else
-            {
-                me->SetStandState(UNIT_STAND_STATE_STAND);
-                DoCast(me, SPELL_POTION, true);
-                DoCast(me, SPELL_AOE_PYROBLAST, false);
-                DrinkInturrupted = true;
-                Drinking = false;
+                else
+                {
+                    me->SetStandState(UNIT_STAND_STATE_STAND);
+                    DoCast(me, SPELL_POTION, true);
+                    DoCast(me, SPELL_AOE_PYROBLAST, false);
+                    DrinkInturrupted = true;
+                    Drinking = false;
+                }
             }
 
             //Don't execute any more code if we are drinking
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 0dd067ef465..af5fbcf005e 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -342,17 +342,17 @@ public:
             case GOSSIP_ACTION_INFO_DEF+3:
                 pPlayer->CLOSE_GOSSIP_MENU();
                 pBarnesAI->m_uiEventId = EVENT_OZ;
-                sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
+                sLog.outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
                 break;
             case GOSSIP_ACTION_INFO_DEF+4:
                 pPlayer->CLOSE_GOSSIP_MENU();
                 pBarnesAI->m_uiEventId = EVENT_HOOD;
-                sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
+                sLog.outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
                 break;
             case GOSSIP_ACTION_INFO_DEF+5:
                 pPlayer->CLOSE_GOSSIP_MENU();
                 pBarnesAI->m_uiEventId = EVENT_RAJ;
-                sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
+                sLog.outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
                 break;
         }
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 8cc27dbcaad..a488ae8389e 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -75,7 +75,7 @@ public:
                 for (uint8 i = 0; i < size; ++i)
                 {
                     uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
-                    sLog.outDebug("TSCR: Selin: Adding Fel Crystal %u to list", guid);
+                    sLog.outDebug("TSCR: Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
                     Crystals.push_back(guid);
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 10431e74ad5..a4c856d95ba 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -207,7 +207,7 @@ public:
                     else
                         sLog.outError("npc_unworthy_initiateAI: unable to find prison!");
                 }
-                return;
+                break;
             case PHASE_TO_EQUIP:
                 if (wait_timer)
                 {
@@ -221,7 +221,7 @@ public:
                         wait_timer = 0;
                     }
                 }
-                return;
+                break;
             case PHASE_TO_ATTACK:
                 if (wait_timer)
                 {
@@ -238,7 +238,7 @@ public:
                         wait_timer = 0;
                     }
                 }
-                return;
+                break;
             case PHASE_ATTACKING:
                 if (!UpdateVictim())
                     return;
@@ -273,10 +273,12 @@ public:
                 }
 
                 DoMeleeAttackIfReady();
+                break;
+            default:
+                break;
             }
         }
     };
-
 };
 
 
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index b0587250154..0813864e0df 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -140,7 +140,7 @@ public:
             //ShadowBolt
             if (ShadowBolt_Timer <= diff)
             {
-                if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (SelectUnit(SELECT_TARGET_RANDOM, 0))
                     DoCast(me->getVictim(), SPELL_SHADOWBOLT);
 
                 ShadowBolt_Timer = 10000;
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
index d399e77ca81..e7beab42608 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
@@ -41,13 +41,9 @@ public:
 
     bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/)
     {
-        if (InstanceScript* pInstance = pPlayer->GetInstanceScript())
-        {
-            if (!pPlayer->FindNearestCreature(15362,15))
-                pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
-            return false;
-        }
-    return false;
+        if (pPlayer->GetInstanceScript() && !pPlayer->FindNearestCreature(15362, 15))
+            pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
+        return false;
     }
 
 };
@@ -62,10 +58,8 @@ public:
 
     bool OnGossipHello(Player* pPlayer, GameObject* pGo)
     {
-        InstanceScript* pInstance = pPlayer->GetInstanceScript();
-        if (!pInstance)
-            return false;
-        pInstance->SetData(EVENT_STATE,pGo->GetEntry());
+        if (InstanceScript* pInstance = pPlayer->GetInstanceScript())
+            pInstance->SetData(EVENT_STATE,pGo->GetEntry());
         return false;
     }
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index 01133f93401..e6ee7e41973 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -122,16 +122,12 @@ public:
             {
                 Unit* Temp =  Unit::GetUnit((*me),pInstance->GetData64(DATA_ALYTHESS));
                 if (Temp)
+                {
                     if (Temp->isDead())
-                    {
                         CAST_CRE(Temp)->Respawn();
-                    }else
-                    {
-                        if (Temp->getVictim())
-                        {
-                            me->getThreatManager().addThreat(Temp->getVictim(),0.0f);
-                        }
-                    }
+                    else if (Temp->getVictim())
+                        me->getThreatManager().addThreat(Temp->getVictim(),0.0f);
+                }
             }
 
             if (!me->isInCombat())
@@ -389,16 +385,12 @@ public:
             {
                 Unit* Temp =  Unit::GetUnit((*me),pInstance->GetData64(DATA_SACROLASH));
                 if (Temp)
+                {
                     if (Temp->isDead())
-                    {
                         CAST_CRE(Temp)->Respawn();
-                    }else
-                    {
-                        if (Temp->getVictim())
-                        {
-                            me->getThreatManager().addThreat(Temp->getVictim(),0.0f);
-                        }
-                    }
+                    else if (Temp->getVictim())
+                        me->getThreatManager().addThreat(Temp->getVictim(),0.0f);
+                }
             }
 
             if (!me->isInCombat())
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index a81c607e754..f39364af81a 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -270,6 +270,8 @@ public:
                 uiFlightCount = 0;
                 uiBreathCount = 0;
                 break;
+            default:
+                break;
             }
             phase = NextPhase;
         }
@@ -291,7 +293,7 @@ public:
                 break;
             case 2:
             {
-                Unit *pTarget = pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
+                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
                 if (!pTarget)
                     pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0);
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index dd55ae7d404..fcdec2b2b65 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -545,16 +545,19 @@ public:
 
     bool OnGossipHello(Player* pPlayer, GameObject* pGo)
     {
-        uint32 SpectralPlayers = 0;
+        uint8 SpectralPlayers = 0;
         Map* pMap = pGo->GetMap();
-        if (!pMap->IsDungeon()) return true;
+        if (!pMap->IsDungeon())
+            return true;
+
         Map::PlayerList const &PlayerList = pMap->GetPlayers();
         for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
         {
             if (i->getSource() && i->getSource()->GetPositionZ() < DEMON_REALM_Z + 5)
                 ++SpectralPlayers;
         }
-        if (pPlayer->HasAura(AURA_SPECTRAL_EXHAUSTION) || (MAX_PLAYERS_IN_SPECTRAL_REALM && SpectralPlayers >= MAX_PLAYERS_IN_SPECTRAL_REALM))
+        uint8 MaxSpectralPlayers =  MAX_PLAYERS_IN_SPECTRAL_REALM;
+        if (pPlayer->HasAura(AURA_SPECTRAL_EXHAUSTION) || (MaxSpectralPlayers && SpectralPlayers >= MaxSpectralPlayers))
             pPlayer->GetSession()->SendNotification(GO_FAILED);
         else
             pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_SPECTRAL, true);
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 9a0ce4cca45..b89824b819b 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -193,9 +193,9 @@ enum KilJaedenTimers
 // Locations of the Hand of Deceiver adds
 Position DeceiverLocations[3]=
 {
-    {1682.045f, 631.299f, 5.936f},
-    {1684.099f, 618.848f, 0.589f},
-    {1694.170f, 612.272f, 1.416f},
+    {1682.045f, 631.299f, 5.936f, 0.0f},
+    {1684.099f, 618.848f, 0.589f, 0.0f},
+    {1694.170f, 612.272f, 1.416f, 0.0f},
 };
 
 // Locations, where Shield Orbs will spawn
@@ -345,7 +345,7 @@ public:
             }
         }
 
-        void UpdateAI(const uint32 diff)
+        void UpdateAI(const uint32 /*diff*/)
         {
         }
 
@@ -612,7 +612,7 @@ public:
             summons.Summon(summoned);
         }
 
-        void JustDied(Unit* killer)
+        void JustDied(Unit* /*killer*/)
         {
             DoScriptText(SAY_KJ_DEATH, me);
             summons.DespawnAll();
@@ -621,7 +621,7 @@ public:
                 pInstance->SetData(DATA_KILJAEDEN_EVENT, DONE);
         }
 
-        void KilledUnit(Unit* victim)
+        void KilledUnit(Unit* /*victim*/)
         {
             DoScriptText(RAND(SAY_KJ_SLAY1,SAY_KJ_SLAY2), me);
         }
@@ -639,7 +639,7 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who)
+        void EnterCombat(Unit* /*who*/)
         {
             DoZoneInCombat();
         }
@@ -957,7 +957,7 @@ public:
             me->InterruptNonMeleeSpells(true);
         }
 
-        void JustDied(Unit* killer)
+        void JustDied(Unit* /*killer*/)
         {
             if (!pInstance)
                 return;
@@ -1081,7 +1081,7 @@ public:
             bLockedTarget = false;
         }
 
-        void DamageTaken(Unit *done_by, uint32 &damage)
+        void DamageTaken(Unit * /*done_by*/, uint32 &damage)
         {
             if (damage > me->GetHealth())
                 DoCast(me, SPELL_FELFIRE_FISSION, true);
@@ -1248,7 +1248,7 @@ public:
             } else uiTimer -= diff;
         }
 
-        void MovementInform(uint32 type, uint32 id)
+        void MovementInform(uint32 type, uint32 /*id*/)
         {
             if (type != POINT_MOTION_TYPE)
                 return;
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index c6c742f9688..9d899007c56 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -189,7 +189,7 @@ class boss_archaedas : public CreatureScript
                 DoMeleeAttackIfReady();
             }
 
-            void JustDied (Unit *pKiller) {
+            void JustDied (Unit * /*pKiller*/) {
                 if (pInstance)
                 {
                     pInstance->SetData(NULL,3);        // open the vault door
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index 132860ea083..f6ca048c59c 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -173,7 +173,7 @@ class instance_uldaman : public InstanceMapScript
                 if (!archaedas)
                     return;
 
-                if (Unit *victim = Unit::GetUnit(*archaedas, target))
+                if (Unit::GetUnit(*archaedas, target))
                 {
                     archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN,false);
                     whoWokeArchaedasGUID = target;
@@ -299,4 +299,4 @@ class instance_uldaman : public InstanceMapScript
 void AddSC_instance_uldaman()
 {
     new instance_uldaman();
-}
\ No newline at end of file
+}
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index c604659148c..7967e0560d7 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -242,12 +242,14 @@ class boss_halazzi : public CreatureScript
                     } else FrenzyTimer -= diff;
 
                     if (Phase == PHASE_LYNX)
+                    {
                         if (CheckTimer <= diff)
                         {
                             if (HealthBelowPct(25 * (3 - TransformCount)))
                                 EnterPhase(PHASE_SPLIT);
                             CheckTimer = 1000;
                         } else CheckTimer -= diff;
+                    }
                 }
 
                 if (Phase == PHASE_HUMAN || Phase == PHASE_ENRAGE)
@@ -271,6 +273,7 @@ class boss_halazzi : public CreatureScript
                     } else ShockTimer -= diff;
 
                     if (Phase == PHASE_HUMAN)
+                    {
                         if (CheckTimer <= diff)
                         {
                             if (!HealthAbovePct(20) /*HealthBelowPct(10)*/)
@@ -283,6 +286,7 @@ class boss_halazzi : public CreatureScript
                             }
                             CheckTimer = 1000;
                         } else CheckTimer -= diff;
+                    }
                 }
 
                 if (Phase == PHASE_MERGE)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index 6ae25708bf9..0d144563958 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -343,15 +343,14 @@ class boss_nalorakk : public CreatureScript
 
             void UpdateAI(const uint32 diff)
             {
-                if (waitTimer)
+                if (waitTimer && inMove)
                 {
-                    if (inMove)
-                        if (waitTimer <= diff)
-                        {
-                            (*me).GetMotionMaster()->MovementExpired();
-                            (*me).GetMotionMaster()->MovePoint(MovePhase,NalorakkWay[MovePhase][0],NalorakkWay[MovePhase][1],NalorakkWay[MovePhase][2]);
-                            waitTimer = 0;
-                        } else waitTimer -= diff;
+                    if (waitTimer <= diff)
+                    {
+                        (*me).GetMotionMaster()->MovementExpired();
+                        (*me).GetMotionMaster()->MovePoint(MovePhase,NalorakkWay[MovePhase][0],NalorakkWay[MovePhase][1],NalorakkWay[MovePhase][2]);
+                        waitTimer = 0;
+                    } else waitTimer -= diff;
                 }
 
                 if (!UpdateVictim())
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 719264a4d6b..8e46bdcf8fc 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -317,7 +317,8 @@ class boss_zuljin : public CreatureScript
                     Unit* Temp = NULL;
                     if (SpiritGUID[i])
                     {
-                        if (Temp = Unit::GetUnit(*me, SpiritGUID[i]))
+                        Temp = Unit::GetUnit(*me, SpiritGUID[i]);
+                        if (Temp)
                         {
                             Temp->SetVisibility(VISIBILITY_OFF);
                             Temp->setDeathState(DEAD);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index be335b5b00c..099aab8dbd0 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -123,26 +123,30 @@ class boss_renataki : public CreatureScript
 
                 //Resetting some aggro so he attacks other gamers
                 if (!Invisible)
-                    if (Aggro_Timer <= diff)
                 {
-                    Unit *pTarget = NULL;
-                    pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
+                    if (Aggro_Timer <= diff)
+                    {
+                        Unit *pTarget = NULL;
+                        pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
 
-                    if (DoGetThreat(me->getVictim()))
-                        DoModifyThreatPercent(me->getVictim(),-50);
+                        if (DoGetThreat(me->getVictim()))
+                            DoModifyThreatPercent(me->getVictim(),-50);
 
-                    if (pTarget)
-                        AttackStart(pTarget);
+                        if (pTarget)
+                            AttackStart(pTarget);
 
-                    Aggro_Timer = 7000 + rand()%13000;
-                } else Aggro_Timer -= diff;
+                        Aggro_Timer = 7000 + rand()%13000;
+                    } else Aggro_Timer -= diff;
+                }
 
                 if (!Invisible)
-                    if (ThousandBlades_Timer <= diff)
                 {
-                    DoCast(me->getVictim(), SPELL_THOUSANDBLADES);
-                    ThousandBlades_Timer = 7000 + rand()%5000;
-                } else ThousandBlades_Timer -= diff;
+                    if (ThousandBlades_Timer <= diff)
+                    {
+                        DoCast(me->getVictim(), SPELL_THOUSANDBLADES);
+                        ThousandBlades_Timer = 7000 + rand()%5000;
+                    } else ThousandBlades_Timer -= diff;
+                }
 
                 DoMeleeAttackIfReady();
             }
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
index c85528a28b0..99096fb2355 100644
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
@@ -252,6 +252,7 @@ public:
         void UpdateAI(const uint32 diff)
         {
             if (questPhase == 1)
+            {
                 if (timer <= diff)
                 {
                     me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND);
@@ -266,22 +267,25 @@ public:
                 }
                 else
                     timer -= diff;
+            }
 
             if (!UpdateVictim())
               return;
 
             // healer
-            if (spellFlashLight)
-                if (HealthBelowPct(70))
-                    if (timerFlashLight <= diff)
-                    {
-                        DoCast(me, SPELL_FLASH_OF_LIGHT);
-                        timerFlashLight = TIMER_FLASH_OF_LIGHT +  rand()%TIMER_FLASH_OF_LIGHT;
-                    }
-                    else
-                        timerFlashLight -= diff;
+            if (spellFlashLight && HealthBelowPct(70))
+            {
+                if (timerFlashLight <= diff)
+                {
+                    DoCast(me, SPELL_FLASH_OF_LIGHT);
+                    timerFlashLight = TIMER_FLASH_OF_LIGHT +  rand()%TIMER_FLASH_OF_LIGHT;
+                }
+                else
+                    timerFlashLight -= diff;
+            }
 
             if (spellJustice)
+            {
                 if (timerJustice <= diff)
                 {
                     DoCast(me, SPELL_SEAL_OF_JUSTICE);
@@ -289,8 +293,10 @@ public:
                 }
                 else
                     timerJustice -= diff;
+            }
 
             if (spellJudLight)
+            {
                 if (timerJudLight <= diff)
                 {
                     DoCast(me, SPELL_JUDGEMENT_OF_LIGHT);
@@ -298,8 +304,10 @@ public:
                 }
                 else
                     timerJudLight -= diff;
+            }
 
-              if (spellCommand)
+            if (spellCommand)
+            {
                   if (timerCommand <= diff)
                   {
                       DoCast(me, TIMER_SEAL_OF_COMMAND);
@@ -307,14 +315,15 @@ public:
                   }
                   else
                       timerCommand -= diff;
+            }
 
-              DoMeleeAttackIfReady();
+            DoMeleeAttackIfReady();
         }
 
         void Activate(uint64 summonerguid)
         {
-              questPhase = 1;
-              summonerGuid = summonerguid;
+            questPhase = 1;
+            summonerGuid = summonerguid;
         }
 
         void KilledUnit(Unit* Killed)