Core: Fix more warnings

--HG--
branch : trunk

11 files changed, 108 insertions, 68 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 1227f41ca30..f1b3f746dec 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -285,7 +285,7 @@ static Yells RandomTaunts[]=
 
 static Yells MaievTaunts[]=
 {
-    {11493, "That is for Naisha!", MAIEV_SHADOWSONG, 0, false},
+    {11493, "That is for Naisha!", MAIEV_SHADOWSONG, 0, 0, false},
     {11494, "Bleed as I have bled!", MAIEV_SHADOWSONG, 0, 0, false},
     {11495, "There shall be no prison for you this time!", MAIEV_SHADOWSONG, 0, 0, false},
     {11500, "Meet your end, demon!", MAIEV_SHADOWSONG, 0, 0, false}
@@ -954,12 +954,14 @@ public:
             for (int32 i = 1; i <= MaxTimer[Phase]; ++i)
             {
                 if (Timer[i]) // Event is enabled
+                {
                     if (Timer[i] <= diff)
                     {
                         if (!Event) // No event with higher priority
                             Event = (EventIllidan)i;
                     }
                     else Timer[i] -= diff;
+                }
             }
 
             switch(Phase)
@@ -993,12 +995,14 @@ public:
                 if (Event == EVENT_TRANSFORM_SEQUENCE)
                     HandleTransformSequence();
                 break;
+            default:
+                break;
             }
 
             if (me->IsNonMeleeSpellCasted(false))
                 return;
 
-            if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED))
+            if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || (Phase == PHASE_NORMAL_MAIEV && !me->HasAura(SPELL_CAGED)))
             {
                 switch(Event)
                 {
@@ -2062,9 +2066,11 @@ public:
         void UpdateAI(const uint32 diff)
         {
             if (DespawnTimer)
+            {
                 if (DespawnTimer <= diff)
                     me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 else DespawnTimer -= diff;
+            }
 
                 //if (IllidanGUID && !SummonedBeams)
                 //{
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 2247026b1fc..84687b83de7 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -281,11 +281,13 @@ public:
 
             //Enrage
             if (!me->HasAura(SPELL_BERSERK))
-                if (EnrageTimer <= diff)
             {
-                DoCast(me, SPELL_BERSERK);
-                DoScriptText(SAY_ENRAGE, me);
-            } else EnrageTimer -= diff;
+                if (EnrageTimer <= diff)
+                {
+                    DoCast(me, SPELL_BERSERK);
+                    DoScriptText(SAY_ENRAGE, me);
+                } else EnrageTimer -= diff;
+            }
 
             //Random taunts
             if (RandomYellTimer <= diff)
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 71fc2dfc5db..d6f141c0981 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -40,20 +40,22 @@ struct Location
     float x, y, o, z;
 };
 
+/* Not used
 static Location ChannelerLocations[]=
 {
-    {463.161285f, 401.219757f, 3.141592f},
-    {457.377625f, 391.227661f, 2.106461f},
-    {446.012421f, 391.227661f, 1.071904f},
-    {439.533783f, 401.219757f, 0.000000f},
-    {446.012421f, 411.211853f, 5.210546f},
-    {457.377625f, 411.211853f, 4.177494f}
+    {463.161285f, 401.219757f, 3.141592f, 0.0f},
+    {457.377625f, 391.227661f, 2.106461f, 0.0f},
+    {446.012421f, 391.227661f, 1.071904f, 0.0f},
+    {439.533783f, 401.219757f, 0.000000f, 0.0f},
+    {446.012421f, 411.211853f, 5.210546f, 0.0f},
+    {457.377625f, 411.211853f, 4.177494f, 0.0f}
 };
+*/
 
 static Location SpawnLocations[]=
 {
-    {498.652740f, 461.728119f, 0.0f},
-    {498.505003f, 339.619324f, 0.0f}
+    {498.652740f, 461.728119f, 0.0f, 0.0f},
+    {498.505003f, 339.619324f, 0.0f, 0.0f}
 };
 
 static Location AkamaWP[]=
@@ -335,7 +337,7 @@ public:
             if (guid)
             {
                 if (Sorcerers.empty())
-                    sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
+                    sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", guid);
                 else  Sorcerers.remove(guid);
             }
         }
@@ -387,7 +389,7 @@ public:
                 {
                     CAST_AI(mob_ashtongue_channeler::mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
                     Channelers.push_back((*itr)->GetGUID());
-                    sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
+                    sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());
                 }
             }
             else sLog.outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
@@ -573,7 +575,10 @@ public:
             ShadeHasDied = false;
             StartCombat = false;
             pInstance = c->GetInstanceScript();
-            ShadeGUID = pInstance ? pInstance->GetData64(DATA_SHADEOFAKAMA) : NOT_STARTED;
+            if (pInstance)
+                ShadeGUID = pInstance->GetData64(DATA_SHADEOFAKAMA);
+            else
+                ShadeGUID = NOT_STARTED;
             me->setActive(true);
             EventBegun = false;
             CastSoulRetrieveTimer = 0;
@@ -794,6 +799,7 @@ public:
             }
 
             if (SoulRetrieveTimer)
+            {
                 if (SoulRetrieveTimer <= diff)
                 {
                     switch(EndingTalkCount)
@@ -849,6 +855,7 @@ public:
                         break;
                     }
                 } else SoulRetrieveTimer -= diff;
+            }
 
             if (!UpdateVictim())
                 return;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index f90c59a1278..9147d005707 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -145,7 +145,7 @@ public:
                 beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 beams[0]=beamer->GetGUID();
             }
-            beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0);
+            beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0);
             if (beamer)
             {
                 beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index b8b167e6ced..7a80ff6a0d5 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -417,6 +417,7 @@ public:
                 return;
             }
             if (me->HasAura(SPELL_WHIRLWIND))
+            {
                 if (Whirlwind_Timer <= diff)
                 {
                     Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
@@ -428,6 +429,7 @@ public:
                     }
                     Whirlwind_Timer = 2000;
                 } else Whirlwind_Timer -= diff;
+            }
 
             // reseting after changing forms and after ending whirlwind
             if (NeedThreatReset && !me->HasAura(SPELL_WHIRLWIND))
@@ -468,6 +470,7 @@ public:
                 //Switch_Timer
 
                 if (!IsFinalForm)
+                {
                     if (SwitchToDemon_Timer <= diff)
                     {
                         //switch to demon form
@@ -480,6 +483,7 @@ public:
                         NeedThreatReset = true;
                         SwitchToDemon_Timer = 45000;
                     } else SwitchToDemon_Timer -= diff;
+                }
                 DoMeleeAttackIfReady();
             }
             else
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index eb17117abee..d47723dc135 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -179,6 +179,7 @@ class boss_nazan : public CreatureScript
                         ConeOfFire_Timer -= diff;
 
                     if (IsHeroic())
+                    {
                         if (BellowingRoar_Timer <= diff)
                         {
                             DoCast(me, SPELL_BELLOWING_ROAR);
@@ -186,6 +187,7 @@ class boss_nazan : public CreatureScript
                         }
                         else
                             BellowingRoar_Timer -= diff;
+                    }
 
                     DoMeleeAttackIfReady();
                 }
@@ -422,9 +424,9 @@ class boss_vazruden_the_herald : public CreatureScript
                     {
                         Creature *Nazan = Unit::GetCreature(*me, NazanGUID);
                         Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
-                        if (Nazan && Nazan->isAlive() || Vazruden && Vazruden->isAlive())
+                        if ((Nazan && Nazan->isAlive()) || (Vazruden && Vazruden->isAlive()))
                         {
-                            if (Nazan && Nazan->getVictim() || Vazruden && Vazruden->getVictim())
+                            if ((Nazan && Nazan->getVictim()) || (Vazruden && Vazruden->getVictim()))
                                 return;
                             else
                             {
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index 2630dd6d16f..d8b00f62306 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -203,6 +203,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                     return;
 
                 if (Assassins_Timer)
+                {
                     if (Assassins_Timer <= diff)
                     {
                         SpawnAssassin();
@@ -210,10 +211,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                     }
                     else
                         Assassins_Timer -= diff;
+                }
 
                 if (InBlade)
                 {
                     if (Wait_Timer)
+                    {
                         if (Wait_Timer <= diff)
                         {
                             if (target_num <= 0)
@@ -241,10 +244,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                         }
                         else
                             Wait_Timer -= diff;
+                    }
                 }
                 else
                 {
                     if (Blade_Dance_Timer)
+                    {
                         if (Blade_Dance_Timer <= diff)
                         {
                             target_num = TARGET_NUM;
@@ -256,8 +261,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                         }
                         else
                             Blade_Dance_Timer -= diff;
+                    }
 
                     if (Charge_timer)
+                    {
                         if (Charge_timer <= diff)
                         {
                             DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE);
@@ -265,6 +272,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                         }
                         else
                             Charge_timer -= diff;
+                    }
 
                     if (Summon_Assistant_Timer <= diff)
                     {
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index e9944578318..ebccc21e969 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -68,8 +68,9 @@ const float SMALL_PORTAL_RADIUS         = 12.6f;
 const float LARGE_PORTAL_RADIUS         = 26.0f;
 const float PORTAL_Z                    = 17.005f;
 
-                            // x,          y,      z,         o
+/* not used                        // x,          y,      z,         o
 static float SolarianPos[4] = {432.909f, -373.424f, 17.9608f, 1.06421f};
+*/
 
 class boss_high_astromancer_solarian : public CreatureScript
 {
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 424a93085dc..f56cacd754a 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -910,10 +910,10 @@ public:
                 case 12:
                     if (pPlayer)
                         pPlayer->GroupEventHappens(Q_ALMABTRIEB, me);
-                    if (Unit* Thadell = me->FindNearestCreature(N_THADELL, 30))
+                    if (me->FindNearestCreature(N_THADELL, 30))
                         DoScriptText(SAY_THADELL_1, me); break;
                 case 13:
-                    if (Unit* Thadell = me->FindNearestCreature(N_THADELL, 30))
+                    if (me->FindNearestCreature(N_THADELL, 30))
                         DoScriptText(SAY_THADELL_2, me, pPlayer); break;
             }
         }
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 65cc54aafad..ddcb28a6ef6 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -283,37 +283,39 @@ public:
             if (!UpdateVictim())
             {
                 if (Tapped)
-                    if (FlyTimer <= diff)
                 {
-                    Tapped = false;
-                    if (PlayerGUID)
+                    if (FlyTimer <= diff)
                     {
-                        Player* plr = Unit::GetPlayer(*me, PlayerGUID);
-                        if (plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
+                        Tapped = false;
+                        if (PlayerGUID)
                         {
-                            DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
-                            /*
-                            float x,y,z;
-                            me->GetPosition(x,y,z);
-
-                            float dx,dy,dz;
-                            me->GetRandomPoint(x, y, z, 20, dx, dy, dz);
-                            dz += 20; // so it's in the air, not ground*/
-
-                            Position pos;
-                            if (Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30))
-                                EscapeDummy->GetPosition(&pos);
-                            else
+                            Player* plr = Unit::GetPlayer(*me, PlayerGUID);
+                            if (plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
                             {
-                                me->GetRandomNearPosition(pos, 20);
-                                pos.m_positionZ += 25;
+                                DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
+                                /*
+                                float x,y,z;
+                                me->GetPosition(x,y,z);
+
+                                float dx,dy,dz;
+                                me->GetRandomPoint(x, y, z, 20, dx, dy, dz);
+                                dz += 20; // so it's in the air, not ground*/
+
+                                Position pos;
+                                if (Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30))
+                                    EscapeDummy->GetPosition(&pos);
+                                else
+                                {
+                                    me->GetRandomNearPosition(pos, 20);
+                                    pos.m_positionZ += 25;
+                                }
+
+                                me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+                                me->GetMotionMaster()->MovePoint(1, pos);
                             }
-
-                            me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
-                            me->GetMotionMaster()->MovePoint(1, pos);
                         }
-                    }
-                } else FlyTimer -= diff;
+                    } else FlyTimer -= diff;
+                }
                 return;
             }
 
@@ -386,17 +388,19 @@ public:
         void UpdateAI(const uint32 diff)
         {
             if (PoisonTimer)
-                if (PoisonTimer <= diff)
             {
-                if (PlayerGUID)
+                if (PoisonTimer <= diff)
                 {
-                    Player* plr = Unit::GetPlayer(*me, PlayerGUID);
-                    if (plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
-                        plr->KilledMonsterCredit(23209, me->GetGUID());
-                }
-                PoisonTimer = 0;
-                me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
-            } else PoisonTimer -= diff;
+                    if (PlayerGUID)
+                    {
+                        Player* plr = Unit::GetPlayer(*me, PlayerGUID);
+                        if (plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
+                            plr->KilledMonsterCredit(23209, me->GetGUID());
+                    }
+                    PoisonTimer = 0;
+                    me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                } else PoisonTimer -= diff;
+            }
         }
     };
 
@@ -1351,17 +1355,19 @@ public:
         {
             if (slayer)
                 switch(slayer->GetTypeId())
-            {
-                case TYPEID_UNIT:
-                    if (Unit *owner = slayer->GetOwner())
-                        if (owner->GetTypeId() == TYPEID_PLAYER)
-                            CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
-                    break;
-
-                case TYPEID_PLAYER:
-                    CAST_PLR(slayer)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
-                    break;
-            }
+                {
+                    case TYPEID_UNIT:
+                        if (Unit *owner = slayer->GetOwner())
+                            if (owner->GetTypeId() == TYPEID_PLAYER)
+                                CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
+                        break;
+
+                    case TYPEID_PLAYER:
+                        CAST_PLR(slayer)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
+                        break;
+                    default:
+                        break;
+                }
 
             if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID)))
             {
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
index 17adb1029fb..65aafc7a5df 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -92,6 +92,8 @@ public:
                         pCreature->CastSpell(pPlayer, 31815, true);
                         DoScriptText(GOSSIP_REWARD_BLESS, pCreature);
                         break;
+                    default:
+                        break;
                 }
             }
 
@@ -115,6 +117,8 @@ public:
                         pCreature->CastSpell(pPlayer, 31814, true);
                         DoScriptText(GOSSIP_REWARD_BLESS, pCreature);
                         break;
+                    default:
+                        break;
                 }
             }
             pPlayer->CLOSE_GOSSIP_MENU();