Core/Misc: Fix static analysis issues (#25178)

2 files changed, 65 insertions, 30 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index b457c2d48b8..c82f5c3ca1d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -57,8 +57,6 @@ class npc_jaina_proudmoore : public CreatureScript
         {
             npc_jaina_proudmooreAI(Creature* creature) : hyjalAI(creature)
             {
-                Reset();
-
                 Spells[0].SpellId = SPELL_BLIZZARD;
                 Spells[0].Cooldown = urand(15000, 35000);
                 Spells[0].TargetType = TARGETTYPE_RANDOM;
@@ -134,8 +132,6 @@ class npc_thrall : public CreatureScript
         {
             npc_thrallAI(Creature* creature) : hyjalAI(creature)
             {
-                Reset();
-
                 Spells[0].SpellId = SPELL_CHAIN_LIGHTNING;
                 Spells[0].Cooldown = urand(3000, 8000);
                 Spells[0].TargetType = TARGETTYPE_VICTIM;
@@ -213,7 +209,6 @@ class npc_tyrande_whisperwind : public CreatureScript
         {
             npc_tyrande_whisperwindAI(Creature* creature) : hyjalAI(creature)
             {
-                Reset();
             }
 
             bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index 56b18d09bf1..b245addcecb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -424,7 +424,14 @@ public:
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             me->SetDisplayId(MODEL_INVIS);
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            spawnTimer = 2000;
+            FlameBuffetTimer = 2000;
+            imol = false;
         }
 
         bool meteor;
@@ -436,9 +443,7 @@ public:
 
         void Reset() override
         {
-            spawnTimer = 2000;
-            FlameBuffetTimer= 2000;
-            imol = false;
+            Initialize();
         }
 
         void JustEngagedWith(Unit* /*who*/) override { }
@@ -548,14 +553,19 @@ public:
         {
             instance = creature->GetInstanceScript();
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            KnockDownTimer = 10000;
         }
 
         bool go;
         uint32 KnockDownTimer;
         void Reset() override
         {
-            KnockDownTimer = 10000;
+            Initialize();
         }
 
         void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
@@ -642,7 +652,14 @@ public:
         {
             instance = creature->GetInstanceScript();
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            FrenzyTimer = 5000 + rand32() % 5000;
+            MoveTimer = 2000;
+            RandomMove = false;
         }
 
         bool go;
@@ -651,9 +668,7 @@ public:
         bool RandomMove;
         void Reset() override
         {
-            FrenzyTimer = 5000 + rand32() % 5000;
-            MoveTimer = 2000;
-            RandomMove = false;
+            Initialize();
         }
 
         void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
@@ -740,7 +755,12 @@ public:
         {
             instance = creature->GetInstanceScript();
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            ShadowBoltTimer = 1000 + rand32() % 5000;
         }
 
         SummonList summons;
@@ -749,7 +769,7 @@ public:
 
         void Reset() override
         {
-            ShadowBoltTimer = 1000 + rand32() % 5000;
+            Initialize();
             summons.DespawnAll();
         }
 
@@ -864,7 +884,14 @@ public:
         {
             instance = creature->GetInstanceScript();
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            CourseTimer = 20000 + rand32() % 5000;
+            WailTimer = 15000 + rand32() % 5000;
+            ShellTimer = 50000 + rand32() % 10000;
         }
 
         bool go;
@@ -874,9 +901,7 @@ public:
 
         void Reset() override
         {
-            CourseTimer = 20000 + rand32() % 5000;
-            WailTimer = 15000 + rand32() % 5000;
-            ShellTimer = 50000 + rand32() % 10000;
+            Initialize();
         }
 
         void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
@@ -964,7 +989,12 @@ public:
         {
             instance = creature->GetInstanceScript();
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            WebTimer = 20000 + rand32() % 5000;
         }
 
         bool go;
@@ -972,7 +1002,7 @@ public:
 
         void Reset() override
         {
-            WebTimer = 20000 + rand32() % 5000;
+            Initialize();
         }
 
         void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
@@ -1050,7 +1080,12 @@ public:
         {
             instance = creature->GetInstanceScript();
             go = false;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            ManaBurnTimer = 9000 + rand32() % 5000;
         }
 
         bool go;
@@ -1058,7 +1093,7 @@ public:
 
         void Reset() override
         {
-            ManaBurnTimer = 9000 + rand32() % 5000;
+            Initialize();
         }
 
         void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override
@@ -1262,7 +1297,15 @@ public:
             go = false;
             for (uint8 i = 0; i < 3; ++i)
                 DummyTarget[i] = 0;
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            forcemove = true;
+            Zpos = 10.0f;
+            StrikeTimer = 2000 + rand32() % 5000;
+            MoveTimer = 0;
         }
 
         bool go;
@@ -1273,10 +1316,7 @@ public:
 
         void Reset() override
         {
-            forcemove = true;
-            Zpos = 10.0f;
-            StrikeTimer = 2000 + rand32() % 5000;
-            MoveTimer = 0;
+            Initialize();
             me->SetDisableGravity(true);
         }