Core/Scripts: fix some /W4 warnings

4 files changed, 15 insertions, 18 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 008d13a5c08..fc50bb3f0aa 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -93,7 +93,7 @@ enum Spells
     SPELL_ANIMATE_BONES_2                   = 53336,
 };
 
-enum SummonGroups
+enum SummonGroups : uint32
 {
     SUMMON_GROUP_CRUSHER_1      = 1,
     SUMMON_GROUP_CRUSHER_2      = 2,
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index b3bc2133dab..27b4e7702b1 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -19,6 +19,7 @@
  * Comment: Find in the future best timers and the event is not implemented.
  */
 
+#include "Containers.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
@@ -945,9 +946,7 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader
                 if (!targetList.empty())
                 {
                     // If there are, pick one of them at random
-                    std::list<WorldObject*>::iterator it = targetList.begin();
-                    std::advance(it, urand(0, targetList.size() - 1));
-                    target = *it;
+                    target = Trinity::Containers::SelectRandomContainerElement(targetList);
                 }
                 // And hit only that one
                 targetList.clear();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index a2046ca0b44..79c0336b9b6 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -793,17 +793,16 @@ class spell_valkyr_essences : public SpellScriptLoader
                             {
                                 if (dmgInfo.GetSpellInfo()->Id == darkVortex || dmgInfo.GetSpellInfo()->Id == lightVortex)
                                 {
-                                    Aura* pAura = owner->GetAura(poweringUp);
-                                    if (pAura)
+                                    if (Aura* aura = owner->GetAura(poweringUp))
                                     {
-                                        pAura->ModStackAmount(stacksCount);
+                                        aura->ModStackAmount(stacksCount);
                                         owner->CastSpell(owner, poweringUp, true);
                                     }
                                     else
                                     {
                                         owner->CastSpell(owner, poweringUp, true);
-                                        if ((pAura = owner->GetAura(poweringUp)))
-                                            pAura->ModStackAmount(stacksCount);
+                                        if (Aura* newAura = owner->GetAura(poweringUp))
+                                            newAura->ModStackAmount(stacksCount);
                                     }
                                 }
                             }
@@ -817,18 +816,17 @@ class spell_valkyr_essences : public SpellScriptLoader
                                 if (dmgInfo.GetSpellInfo()->Id == unleashedDark || dmgInfo.GetSpellInfo()->Id == unleashedLight)
                                 {
                                     // need to do the things in this order, else players might have 100 charges of Powering Up without anything happening
-                                    Aura* pAura = owner->GetAura(poweringUp);
-                                    if (pAura)
+                                    if (Aura* aura = owner->GetAura(poweringUp))
                                     {
                                         // 2 lines together add the correct amount of buff stacks
-                                        pAura->ModStackAmount(stacksCount);
+                                        aura->ModStackAmount(stacksCount);
                                         owner->CastSpell(owner, poweringUp, true);
                                     }
                                     else
                                     {
                                         owner->CastSpell(owner, poweringUp, true);
-                                        if ((pAura = owner->GetAura(poweringUp)))
-                                            pAura->ModStackAmount(stacksCount);
+                                        if (Aura* newAura = owner->GetAura(poweringUp))
+                                            newAura->ModStackAmount(stacksCount);
                                     }
                                 }
                             }
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index bbf192f7d27..595008c38a7 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -232,12 +232,12 @@ public:
                     events.ScheduleEvent(EVENT_TALK_6, Seconds(17));
                     break;
                 case 35:
-                    if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
-                        Talk(TALK_7, player);
+                    if (Player* pl = ObjectAccessor::GetPlayer(*me, _player))
+                        Talk(TALK_7, pl);
                     break;
                 case 40:
-                    if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
-                        player->GroupEventHappens(QUEST_TRAIL_OF_FIRE, me);
+                    if (Player* pl = ObjectAccessor::GetPlayer(*me, _player))
+                        pl->GroupEventHappens(QUEST_TRAIL_OF_FIRE, me);
                     events.ScheduleEvent(EVENT_TALK_8, Seconds(4));
                     break;
             }