Core: Fix more warnings

--HG--
branch : trunk

28 files changed, 133 insertions, 99 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index b57145b3620..c8f1d683f9d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -274,6 +274,7 @@ public:
             } else uiHolySmiteTimer -= uiDiff;
 
             if (me->HasAura(SPELL_SHIELD))
+            {
                 if (uiRenewTimer <= uiDiff)
                 {
                     me->InterruptNonMeleeSpells(true);
@@ -291,7 +292,7 @@ public:
                     }
                     uiRenewTimer = urand(15000,17000);
                 } else uiRenewTimer -= uiDiff;
-
+            }
 
             if (!bHealth && !HealthAbovePct(25))
             {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index 3e33431f38c..9806103e17d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -157,6 +157,7 @@ public:
                 return;
 
             if (bEventInProgress)
+            {
                 if (uiResurrectTimer <= uiDiff)
                 {
                     me->SetFullHealth();
@@ -166,6 +167,7 @@ public:
                     bEventInProgress = false;
                     me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED);
                 } else uiResurrectTimer -= uiDiff;
+            }
 
             switch(uiPhase)
             {
@@ -211,12 +213,14 @@ public:
                                 DoCast(me, SPELL_ARMY_DEAD);
                             }
                             if (!bDeathArmyDone)
+                            {
                                 if (uiDeathArmyCheckTimer <= uiDiff)
                                 {
                                     me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED);
                                     uiDeathArmyCheckTimer = 0;
                                     bDeathArmyDone = true;
                                 } else uiDeathArmyCheckTimer -= uiDiff;
+                            }
                             if (uiDesecration <= uiDiff)
                             {
                                 if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index d9b07573065..900113b3017 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -207,7 +207,7 @@ public:
             switch(i)
             {
                 case 2:
-                    if (pInstance && uiWaypointPath == 3 || uiWaypointPath == 2)
+                    if ((pInstance && uiWaypointPath == 3) || uiWaypointPath == 2)
                         pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1);
                     break;
                 case 3:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index 180a91e58cb..0215db9264f 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -308,7 +308,7 @@ public:
         {
             me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f);
 
-            if (Creature* pBoss = me->SummonCreature(uiArgentChampion,SpawnPosition))
+            if (me->SummonCreature(uiArgentChampion,SpawnPosition))
             {
                 for (uint8 i = 0; i < 3; ++i)
                 {
@@ -366,8 +366,8 @@ public:
                         DoStartArgentChampionEncounter();
                 }
 
-               if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
-                   pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE ||
+               if ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
+                   pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) ||
                    pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE)
                     me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834f,651.915f,447.035f,0);
             }
@@ -472,10 +472,10 @@ public:
         InstanceScript* pInstance = pCreature->GetInstanceScript();
 
         if (pInstance &&
-            pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
+            ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE &&
             pInstance->GetData(BOSS_BLACK_KNIGHT) == DONE &&
-            pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE ||
-            pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE)
+            pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) ||
+            pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE))
             return false;
 
         if (pInstance &&
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 3cf22dcb6ef..98462340a16 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -59,9 +59,9 @@ enum Achievements
     ACHIEV_OH_NOVOS                               = 2057
 };
 
-static Position AddSpawnPoint = { -379.20f, -816.76f, 59.70f };
-static Position CrystalHandlerSpawnPoint = { -326.626343f, -709.956604f, 27.813314f };
-static Position AddDestinyPoint = { -379.314545f, -772.577637f, 28.58837f };
+static Position AddSpawnPoint = { -379.20f, -816.76f, 59.70f, 0.0f };
+static Position CrystalHandlerSpawnPoint = { -326.626343f, -709.956604f, 27.813314f, 0.0f };
+static Position AddDestinyPoint = { -379.314545f, -772.577637f, 28.58837f, 0.0f };
 
 class boss_novos : public CreatureScript
 {
@@ -169,6 +169,8 @@ public:
                         uiTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS);
                     } else uiTimer -= diff;
                     break;
+                default:
+                    break;
             }
         }
         void JustDied(Unit* /*killer*/)
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index 7f61c5dca07..d734fa671f6 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -71,7 +71,7 @@ public:
                 pInstance->SetData(DATA_FALRIC_EVENT, NOT_STARTED);
         }
 
-        void EnterCombat(Unit* who)
+        void EnterCombat(Unit* /*who*/)
         {
             DoScriptText(SAY_AGGRO, me);
             if (pInstance)
@@ -82,7 +82,7 @@ public:
             events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer.
         }
 
-        void JustDied(Unit* killer)
+        void JustDied(Unit* /*killer*/)
         {
             DoScriptText(SAY_DEATH, me);
 
@@ -90,7 +90,7 @@ public:
                 pInstance->SetData(DATA_FALRIC_EVENT, DONE);
         }
 
-        void KilledUnit(Unit *victim)
+        void KilledUnit(Unit * /*victim*/)
         {
             DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
         }
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index b7f04f84e95..2ba029bb2d1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -67,7 +67,7 @@ public:
                 pInstance->SetData(DATA_MARWYN_EVENT, NOT_STARTED);
         }
 
-        void EnterCombat(Unit* who)
+        void EnterCombat(Unit* /*who*/)
         {
             DoScriptText(SAY_AGGRO, me);
             if (pInstance)
@@ -79,7 +79,7 @@ public:
             events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000);    // TODO Check timer
         }
 
-        void JustDied(Unit* killer)
+        void JustDied(Unit* /*killer*/)
         {
             DoScriptText(SAY_DEATH, me);
 
@@ -87,7 +87,7 @@ public:
                 pInstance->SetData(DATA_MARWYN_EVENT, DONE);
         }
 
-        void KilledUnit(Unit *victim)
+        void KilledUnit(Unit * /*victim*/)
         {
             DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
         }
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index f9f6195bf8d..9b247be6733 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -135,19 +135,19 @@ enum eEnum
     QUEST_WRATH_OF_THE_LICH_KING_H2               = 24802,
 };
 
-static Position HallsofReflectionLocs[]=
+const Position HallsofReflectionLocs[]=
 {
     {5283.234863f, 1990.946777f, 707.695679f, 0.929097f},   // 2 Loralen Follows
     {5408.031250f, 2102.918213f, 707.695251f, 0.792756f},   // 9 Sylvanas Follows
     {5401.866699f, 2110.837402f, 707.695251f, 0.800610f},   // 10 Loralen follows
 };
 
-static Position SpawnPos                = {5262.540527f, 1949.693726f, 707.695007f, 0.808736f}; // Jaina/Sylvanas Beginning Position
-static Position MoveThronePos           = {5306.952148f, 1998.499023f, 709.341431f, 1.277278f}; // Jaina/Sylvanas walks to throne
-static Position UtherSpawnPos           = {5308.310059f, 2003.857178f, 709.341431f, 4.650315f};
-static Position LichKingSpawnPos        = {5362.917480f, 2062.307129f, 707.695374f, 3.945812f};
-static Position LichKingMoveThronePos   = {5312.080566f, 2009.172119f, 709.341431f, 3.973301f}; // Lich King walks to throne
-static Position LichKingMoveAwayPos     = {5400.069824f, 2102.7131689f, 707.69525f, 0.843803f}; // Lich King walks away
+const Position SpawnPos              = {5262.540527f, 1949.693726f, 707.695007f, 0.808736f}; // Jaina/Sylvanas Beginning Position
+const Position MoveThronePos         = {5306.952148f, 1998.499023f, 709.341431f, 1.277278f}; // Jaina/Sylvanas walks to throne
+const Position UtherSpawnPos         = {5308.310059f, 2003.857178f, 709.341431f, 4.650315f};
+const Position LichKingSpawnPos      = {5362.917480f, 2062.307129f, 707.695374f, 3.945812f};
+const Position LichKingMoveThronePos = {5312.080566f, 2009.172119f, 709.341431f, 3.973301f}; // Lich King walks to throne
+const Position LichKingMoveAwayPos   = {5400.069824f, 2102.7131689f, 707.69525f, 0.843803f}; // Lich King walks away
 
 class npc_jaina_or_sylvanas_hor : public CreatureScript
 {
@@ -157,7 +157,7 @@ private:
 public:
     npc_jaina_or_sylvanas_hor(bool isSylvana, const char* name) : CreatureScript(name), m_isSylvana(isSylvana) { }
 
-    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
     {
         pPlayer->PlayerTalkClass->ClearMenus();
         switch (uiAction)
@@ -438,10 +438,12 @@ public:
                     }
 
                     if (Creature* pUther = me->GetCreature(*me, uiUther))
+                    {
                         if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
                             DoScriptText(SAY_UTHER_INTRO_A2_9, pUther);
                         else
                             DoScriptText(SAY_UTHER_INTRO_H2_7, pUther);
+                    }
 
                     events.ScheduleEvent(EVENT_INTRO_LK_2, 11000);
                     break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index df54e58c574..bccccffd655 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -96,7 +96,7 @@ struct boss_horAI : ScriptedAI
         me->SetReactState(REACT_PASSIVE);
     }
 
-    void DamageTaken(Unit *pWho, uint32 &uiDamage)
+    void DamageTaken(Unit * /*pWho*/, uint32 &uiDamage)
     {
         if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             uiDamage = 0;
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 531129b562a..455dfea60e0 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -414,7 +414,7 @@ public:
 
             events.Update(diff);
 
-            switch(uint32 eventId = events.ExecuteEvent())
+            switch(events.ExecuteEvent())
             {
                 case EVENT_NEXT_WAVE:
                     uiWaveCount++;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 7c55d3ec977..4f88125c3a6 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -377,9 +377,9 @@ class boss_lady_deathwhisper : public CreatureScript
                             break;
                         case EVENT_DOMINATE_MIND_H:
                             DoScriptText(SAY_DOMINATE_MIND, me);
-				            for (uint8 i = 0; i < uiDominateMindCount; i++)
-					            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_DOMINATE_MIND_H))
-						            DoCast(target, SPELL_DOMINATE_MIND_H);
+                            for (uint8 i = 0; i < uiDominateMindCount; i++)
+                                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_DOMINATE_MIND_H))
+                                    DoCast(target, SPELL_DOMINATE_MIND_H);
                             events.ScheduleEvent(EVENT_DOMINATE_MIND_H, urand(18000, 22000));
                             break;
                         case EVENT_P1_SUMMON_WAVE:
@@ -727,7 +727,7 @@ class npc_vengeful_shade : public CreatureScript
             npc_vengeful_shadeAI(Creature* pCreature) : ScriptedAI(pCreature)
             {
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-		        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             }
 
             void Reset()
@@ -755,7 +755,7 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader
 
         class spell_deathwhisper_mana_barrier_AuraScript : public AuraScript
         {
-            void HandlePeriodicTick(AuraEffect const * aurEff, AuraApplication const * aurApp)
+            void HandlePeriodicTick(AuraEffect const * /*aurEff*/, AuraApplication const * /*aurApp*/)
             {
                 Unit* caster = GetCaster();
                 int32 missingHealth = caster->GetMaxHealth() - caster->GetHealth();
@@ -783,7 +783,7 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader
 
         class spell_cultist_dark_martyrdom_SpellScript : public SpellScript
         {
-            bool Validate(SpellEntry const* spellEntry)
+            bool Validate(SpellEntry const* /*spellEntry*/)
             {
                 if (uint32 scriptId = sObjectMgr.GetScriptId("boss_lady_deathwhisper"))
                     if (CreatureInfo const* creInfo = ObjectMgr::GetCreatureTemplate(NPC_LADY_DEATHWHISPER))
@@ -793,7 +793,7 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader
                 return false;
             }
 
-            void HandleEffect(SpellEffIndex effIndex)
+            void HandleEffect(SpellEffIndex /*effIndex*/)
             {
                 if (GetCaster()->isSummon())
                     if (Unit* owner = GetCaster()->ToTempSummon()->GetSummoner())
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index ad7147ee58c..914cde7a68a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -104,7 +104,7 @@ class boss_lord_marrowgar : public CreatureScript
                     pInstance->SetData(DATA_LORD_MARROWGAR, NOT_STARTED);
             }
 
-            void EnterCombat(Unit* who)
+            void EnterCombat(Unit* /*who*/)
             {
                 DoScriptText(SAY_AGGRO, me);
 
@@ -112,7 +112,7 @@ class boss_lord_marrowgar : public CreatureScript
                     pInstance->SetData(DATA_LORD_MARROWGAR, IN_PROGRESS);
             }
 
-            void JustDied(Unit* killer)
+            void JustDied(Unit* /*killer*/)
             {
                 DoScriptText(SAY_DEATH, me);
 
@@ -354,14 +354,14 @@ class npc_bone_spike : public CreatureScript
                 uiTrappedGUID = 0;
             }
 
-            void JustDied(Unit *killer)
+            void JustDied(Unit * /*killer*/)
             {
                 events.Reset();
                 if (Unit* trapped = Unit::GetUnit((*me), uiTrappedGUID))
                     trapped->RemoveAurasDueToSpell(SPELL_IMPALED);
             }
 
-            void KilledUnit(Unit *pVictim)
+            void KilledUnit(Unit * /*pVictim*/)
             {
                 me->Kill(me);
             }
@@ -415,7 +415,7 @@ class spell_marrowgar_coldflame : public SpellScriptLoader
 
         class spell_marrowgar_coldflame_SpellScript : public SpellScript
         {
-            void HandleScriptEffect(SpellEffIndex effIndex)
+            void HandleScriptEffect(SpellEffIndex /*effIndex*/)
             {
                 Unit* caster = GetCaster();
                 uint8 count = 1;
@@ -463,7 +463,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader
 
         class spell_marrowgar_bone_spike_graveyard_SpellScript : public SpellScript
         {
-            void HandleApplyAura(SpellEffIndex effIndex)
+            void HandleApplyAura(SpellEffIndex /*effIndex*/)
             {
                 CreatureAI* marrowgarAI = GetCaster()->ToCreature()->AI();
                 bool yell = false;
@@ -512,7 +512,7 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader
 
         class spell_marrowgar_bone_storm_SpellScript : public SpellScript
         {
-            void RecalculateDamage(SpellEffIndex effIndex)
+            void RecalculateDamage(SpellEffIndex /*effIndex*/)
             {
                 int32 dmg = GetHitDamage();
                 float distance = GetHitUnit()->GetExactDist2d(GetCaster());
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
index 100440237bb..7ab328debd0 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
@@ -61,7 +61,7 @@ class icecrown_citadel_teleport : public GameObjectScript
             return true;
         }
 
-        bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action)
+        bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 sender, uint32 action)
         {
             player->CLOSE_GOSSIP_MENU();
             SpellEntry const* spell = sSpellStore.LookupEntry(action);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index dbf8ced0c48..e7a5d6faf30 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -50,7 +50,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                 return false;
             }
 
-            void OnCreatureCreate(Creature* creature, bool add)
+            void OnCreatureCreate(Creature* creature, bool /*add*/)
             {
                 Map::PlayerList const &players = instance->GetPlayers();
                 uint32 TeamInInstance = 0;
@@ -82,7 +82,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                 }
             }
 
-            void OnGameObjectCreate(GameObject* pGo, bool add)
+            void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
             {
                 switch (pGo->GetEntry())
                 {
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index eb0aea45b79..d23ad8693d5 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -51,12 +51,12 @@ enum Achievs
 
 const Position RiftLocation[6] =
 {
-    {652.64f, -273.70f, -8.75f},
-    {634.45f, -265.94f, -8.44f},
-    {620.73f, -281.17f, -9.02f},
-    {626.10f, -304.67f, -9.44f},
-    {639.87f, -314.11f, -9.49f},
-    {651.72f, -297.44f, -9.37f}
+    {652.64f, -273.70f, -8.75f, 0.0f},
+    {634.45f, -265.94f, -8.44f, 0.0f},
+    {620.73f, -281.17f, -9.02f, 0.0f},
+    {626.10f, -304.67f, -9.44f, 0.0f},
+    {639.87f, -314.11f, -9.49f, 0.0f},
+    {651.72f, -297.44f, -9.37f, 0.0f}
 };
 
 class boss_anomalus : public CreatureScript
@@ -229,10 +229,12 @@ public:
             {
                 Unit* pAnomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
                 if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                {
                     if (pAnomalus && pAnomalus->HasAura(SPELL_RIFT_SHIELD))
                         DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST);
                     else
                         DoCast(pTarget, SPELL_CHAOTIC_ENERGY_BURST);
+                }
                 uiChaoticEnergyBurstTimer = 1*IN_MILLISECONDS;
             } else uiChaoticEnergyBurstTimer -= diff;
 
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 07591841af7..12d9ac5569a 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -125,6 +125,7 @@ public:
                 return;
             }
             if (bCrystalSpikes)
+            {
                 if (uiCrystalSpikesTimer2 <= diff)
                 {
                     fSpikeXY[0][0] = fBaseX+(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO));
@@ -141,6 +142,7 @@ public:
                         bCrystalSpikes = false;
                     uiCrystalSpikesTimer2 = 200;
                 } else uiCrystalSpikesTimer2 -= diff;
+            }
 
             if (!bFrenzy && HealthBelowPct(25))
             {
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index d85c70c4fe8..e7639f46e89 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -71,9 +71,9 @@ struct Summons
 
 static Summons Group[]=
 {
-    {NPC_PHANTASMAL_CLOUDSCRAPER,NPC_PHANTASMAL_CLOUDSCRAPER,NPC_PHANTASMAL_MAMMOTH,NPC_PHANTASMAL_WOLF},
-    {NPC_PHANTASMAL_AIR,NPC_PHANTASMAL_AIR,NPC_PHANTASMAL_WATER,NPC_PHANTASMAL_FIRE},
-    {NPC_PHANTASMAL_OGRE,NPC_PHANTASMAL_OGRE,NPC_PHANTASMAL_NAGAL,NPC_PHANTASMAL_MURLOC}
+    { {NPC_PHANTASMAL_CLOUDSCRAPER, NPC_PHANTASMAL_CLOUDSCRAPER, NPC_PHANTASMAL_MAMMOTH, NPC_PHANTASMAL_WOLF} },
+    { {NPC_PHANTASMAL_AIR, NPC_PHANTASMAL_AIR, NPC_PHANTASMAL_WATER, NPC_PHANTASMAL_FIRE} },
+    { {NPC_PHANTASMAL_OGRE, NPC_PHANTASMAL_OGRE, NPC_PHANTASMAL_NAGAL, NPC_PHANTASMAL_MURLOC} }
 };
 
 static uint32 TeleportSpells[]=
@@ -133,7 +133,8 @@ public:
                 uiGroup[2] = 0;
             }
 
-            x,y = 0.0f;
+            x = 0.0f;
+            y = 0.0f;
             bCanCast = false;
             bCanGoBack = false;
 
@@ -146,7 +147,7 @@ public:
             uiTimeBombTimer = urand(20000,25000);
         }
 
-        void EnterCombat(Unit* pWho)
+        void EnterCombat(Unit* /*pWho*/)
         {
             if (pInstance)
                 pInstance->SetData(DATA_UROM_EVENT, IN_PROGRESS);
@@ -325,7 +326,7 @@ public:
             me->DeleteThreatList();
         }
 
-        void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
+        void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
         {
             switch(pSpell->Id)
             {
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 36d8a0d742e..ae736181566 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -76,11 +76,11 @@ public:
             }
         }
 
-        void OnGameObjectCreate(GameObject* pGO, bool bAdd)
+        void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/)
         {
             if (pGO->GetEntry() == GO_DRAGON_CAGE_DOOR)
             {
-                if (DATA_DRAKOS_EVENT == DONE)
+                if (GetData(DATA_DRAKOS_EVENT) == DONE)
                     pGO->SetGoState(GO_STATE_ACTIVE);
                 else
                     pGO->SetGoState(GO_STATE_READY);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index ad777d2cd3b..2ca643637f3 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -128,8 +128,8 @@ enum Achievements
 
 static Position SpawnLocations[]=
 {
-    {946.992f, 397.016f, 208.374f},
-    {960.748f, 382.944f, 208.374f},
+    {946.992f, 397.016f, 208.374f, 0.0f},
+    {960.748f, 382.944f, 208.374f, 0.0f},
 };
 
 class mob_tribuna_controller : public CreatureScript
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index 10fcd42334f..6a5da06cb21 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -167,7 +167,7 @@ enum eAchievementData
 
 static Position Center[]=
 {
-    {354.8771f, -12.90240f, 409.803650f},
+    {354.8771f, -12.90240f, 409.803650f, 0.0f},
 };
 
 const Position PosSiege[5] =
@@ -806,7 +806,7 @@ public:
             me->GetMap()->CreatureRelocation(me, x,y,z,0);
         }
 
-        void UpdateAI(const uint32 diff)
+        void UpdateAI(const uint32 /*diff*/)
         {
         }
     };
@@ -851,7 +851,7 @@ public:
 
         }
 
-        void MovementInform(uint32 type, uint32 id)
+        void MovementInform(uint32 /*type*/, uint32 id)
         {
             if (id == 1)
             {
@@ -940,7 +940,7 @@ public:
             }
         }
 
-        void UpdateAI(const uint32 diff)
+        void UpdateAI(const uint32 /*diff*/)
         {
             if (!UpdateVictim())
                 return;
@@ -981,7 +981,7 @@ public:
         {
         }
 
-        void UpdateAI(const uint32 diff)
+        void UpdateAI(const uint32 /*diff*/)
         {
             if (!me->HasAura(AURA_DUMMY_BLUE))
                 me->AddAura(AURA_DUMMY_BLUE, me);
@@ -1012,7 +1012,7 @@ public:
             me->SetReactState(REACT_PASSIVE);
         }
 
-        void WaypointReached(uint32 i)
+        void WaypointReached(uint32 /*i*/)
         {
         }
 
@@ -1084,7 +1084,7 @@ public:
         {
         }
 
-        void UpdateAI(const uint32 diff)
+        void UpdateAI(const uint32 /*diff*/)
         {
             if (!me->HasAura(AURA_DUMMY_GREEN))
                 me->AddAura(AURA_DUMMY_GREEN, me);
@@ -1331,7 +1331,7 @@ class go_ulduar_tower : public GameObjectScript
 public:
     go_ulduar_tower() : GameObjectScript("go_ulduar_tower") { }
 
-    void OnDestroyed(Player* pPlayer, GameObject* pGO, uint32 value)
+    void OnDestroyed(Player* /*pPlayer*/, GameObject* pGO, uint32 /*value*/)
     {
         InstanceScript* pInstance = pGO->GetInstanceScript();
         if (pGO->GetGOValue()->building.health == 0)
@@ -1361,7 +1361,7 @@ class at_RX_214_repair_o_matic_station : public AreaTriggerScript
 public:
     at_RX_214_repair_o_matic_station() : AreaTriggerScript("at_RX_214_repair_o_matic_station") { }
 
-    bool OnTrigger(Player* pPlayer, const AreaTriggerEntry* pAt)
+    bool OnTrigger(Player* pPlayer, const AreaTriggerEntry* /*pAt*/)
     {
         if(Creature* vehicle = pPlayer->GetVehicleCreatureBase())
         {
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
index 498106bcb7b..dd2014b167d 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
@@ -442,12 +442,14 @@ public:
 
             //Enrage stuff
             if (!enraged)
+            {
                 if (uiEnrageTimer <= diff)
                 {
                     DoScriptText(SAY_BERSERK, me);
                     DoCast(me, SPELL_ENRAGE);
                     enraged = true;
                 } else uiEnrageTimer -= diff;
+            }
         }
 
         void exposeHeart()
@@ -559,10 +561,10 @@ public:
                 if (pXT002->AI())
                 {
                     uint32 health = me->GetHealth();
-                    health -= damage;
-                    if (health < 0)
+                    if (health <= damage)
                         health = 0;
-
+                    else
+                        health -= damage;
                     pXT002->AI()->SetData(DATA_TRANSFERED_HEALTH, me->GetMaxHealth() - health);
                 }
         }
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 681c58c474e..1345ec03d9f 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -202,7 +202,7 @@ public:
             }
         }
 
-        void ProcessEvent(GameObject* pGO, uint32 uiEventId)
+        void ProcessEvent(GameObject* /*pGO*/, uint32 uiEventId)
         {
             // Flame Leviathan's Tower Event triggers
            Creature* pFlameLeviathan = instance->GetCreature(uiLeviathanGUID);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index e680b0d9eec..4702bf2192f 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -192,12 +192,14 @@ public:
             if (bEventInProgress)
             {
                 if (uiSpawnResTimer)
+                {
                     if (uiSpawnResTimer <= diff)
                     {
                         DoCast(me, SPELL_SUMMON_BANSHEE); // Summons directly on caster position
                         // DoCast(me, SPELL_SCOURG_RESURRECTION, true); // Not needed ?
                         uiSpawnResTimer = 0;
                     } else uiSpawnResTimer -= diff;
+                }
 
                 return;
             }
@@ -356,6 +358,7 @@ public:
         void UpdateAI(const uint32 diff)
         {
             if (uiResurectTimer)
+            {
                 if (uiResurectTimer <= diff)
                 {
                     if (uiResurectPhase == 1)
@@ -383,11 +386,10 @@ public:
                             uiResurectTimer = 0;
                         }
                     }
-
                 } else uiResurectTimer -= diff;
+            }
         }
     };
-
 };
 
 
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index a06ca389d34..5d70edea75a 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -212,6 +212,7 @@ public:
             } else ShadowboltTimer -= diff;
 
             if (!Skeletons)
+            {
                 if ((SummonSkeletonsTimer <= diff))
                 {
                     Creature* Skeleton;
@@ -229,6 +230,7 @@ public:
                     }
                     Skeletons = true;
                 } else SummonSkeletonsTimer -= diff;
+            }
 
             if (FrostTombTimer <= diff)
             {
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index ce9adc77a61..039734730ea 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -167,6 +167,7 @@ public:
             if (!ghost)
             {
                 if (Check_Timer)
+                {
                     if (Check_Timer <= diff)
                     {
                         Check_Timer = 5000;
@@ -178,15 +179,16 @@ public:
                             Check_Timer = 0;
                         }
                     } else Check_Timer -= diff;
+                }
+                if (Response_Timer && Dalronn_isDead)
+                {
+                    if (Response_Timer <= diff)
+                    {
+                        DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me);
 
-                if (Response_Timer)
-                    if (Dalronn_isDead)
-                        if (Response_Timer <= diff)
-                        {
-                            DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me);
-
-                            Response_Timer = 0;
-                        } else Response_Timer -= diff;
+                        Response_Timer = 0;
+                    } else Response_Timer -= diff;
+                }
             }
 
             if (Charge_Timer <= diff)
@@ -278,6 +280,7 @@ public:
             {
                 Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD));
                 if (skarvald)
+                {
                     if (skarvald->isDead())
                     {
                         DoScriptText(YELL_DALRONN_SKA_DIED,me);
@@ -298,6 +301,7 @@ public:
                             temp->AI()->AttackStart(Killer);
                         }
                     }
+                }
             }
         }
 
@@ -321,16 +325,19 @@ public:
                 return;
 
             if (AggroYell_Timer)
+            {
                 if (AggroYell_Timer <= diff)
                 {
                     DoScriptText(YELL_DALRONN_AGGRO,me);
 
                     AggroYell_Timer = 0;
                 } else AggroYell_Timer -= diff;
+            }
 
             if (!ghost)
             {
                 if (Check_Timer)
+                {
                     if (Check_Timer <= diff)
                     {
                         Check_Timer = 5000;
@@ -342,15 +349,16 @@ public:
                             Check_Timer = 0;
                         }
                     } else Check_Timer -= diff;
+                }
 
-                if (Response_Timer)
-                    if (Skarvald_isDead)
-                        if (Response_Timer <= diff)
-                        {
-                            DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me);
-
-                            Response_Timer = 0;
-                        } else Response_Timer -= diff;
+                if (Response_Timer && Skarvald_isDead)
+                {
+                    if (Response_Timer <= diff)
+                    {
+                        DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me);
+                        Response_Timer = 0;
+                    } else Response_Timer -= diff;
+                }
             }
 
             if (ShadowBolt_Timer <= diff)
@@ -372,6 +380,7 @@ public:
             } else Debilitate_Timer -= diff;
 
             if (IsHeroic())
+            {
                 if (Summon_Timer <= diff)
                 {
                     if (!me->IsNonMeleeSpellCasted(false))
@@ -380,6 +389,7 @@ public:
                         Summon_Timer = (rand()%10000) + 20000;
                     }
                 } else Summon_Timer -= diff;
+            }
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 3dfb7206e0a..26b204ddf32 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -789,6 +789,7 @@ public:
                         case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
                         case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
                         case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
+                        default: break;
                    }
 
                    if (pNext)
@@ -809,7 +810,7 @@ public:
         {
             if (type != POINT_MOTION_TYPE)
                 return;
-            if (id<0 || id>4)
+            if (id > 4)
                 return;
             Creature *pNext = NULL;
             switch(id)
@@ -819,6 +820,7 @@ public:
                 case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break;
                 case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
                 case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
+                default: break;
             }
             if (pNext)
                 DoCast(pNext, SPELL_ORB_CHANNEL, false);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 1db99f14f2e..d9ee68c95fc 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -77,9 +77,9 @@ enum CombatPhase
 
 static Position RitualChannelerPos[]=
 {
-    {296.42f, -355.01f, 90.94f},
-    {302.36f, -352.01f, 90.54f},
-    {291.39f, -350.89f, 90.54f}
+    {296.42f, -355.01f, 90.94f, 0.0f},
+    {302.36f, -352.01f, 90.54f, 0.0f},
+    {291.39f, -350.89f, 90.54f, 0.0f}
 };
 static Position ArthasPos = { 295.81f, -366.16f, 92.57f, 1.58f };
 static Position SvalaPos = { 296.632f, -346.075f, 90.6307f, 1.58f };
@@ -189,7 +189,7 @@ public:
                         uiIntroTimer = 200;
                         break;
                     case 6:
-                        if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILLISECONDS))
+                        if (me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILLISECONDS))
                         {
                             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                             me->SetDisplayId(DATA_SVALA_DISPLAY_ID);
@@ -341,6 +341,7 @@ public:
                 } else uiCallFlamesTimer -= diff;
 
                 if (!bSacrificed)
+                {
                     if (uiRitualOfSwordTimer <= diff)
                     {
                         if (Unit* pSacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
@@ -364,6 +365,7 @@ public:
                             bSacrificed = true;
                         }
                     } else uiRitualOfSwordTimer -= diff;
+                }
 
                 DoMeleeAttackIfReady();
             }
diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp
index 7ea000d1559..58c1c76762c 100644
--- a/src/server/scripts/Northrend/storm_peaks.cpp
+++ b/src/server/scripts/Northrend/storm_peaks.cpp
@@ -518,16 +518,16 @@ public:
         return true;
     }
 
-    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action )
+    bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*sender*/, uint32 action)
     {
         pPlayer->PlayerTalkClass->ClearMenus();
         switch(action)
         {
         case GOSSIP_ACTION_TRAIN:
-            pPlayer->SEND_TRAINERLIST( pCreature->GetGUID() );
+            pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
             break;
         case GOSSIP_ACTION_TRADE:
-            pPlayer->SEND_VENDORLIST( pCreature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(pCreature->GetGUID());
             break;
         }
         return true;