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

3 files changed, 34 insertions, 30 deletions

diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
index 98fd1ad241a..38a29a17326 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -100,7 +100,13 @@ public:
         {
             instance = creature->GetInstanceScript();
             creature->RestoreFaction();
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            uiTimer = 0;
+            uiPhase = 0;
         }
 
         InstanceScript* instance;
@@ -115,8 +121,7 @@ public:
         {
             if (!HasEscortState(STATE_ESCORT_ESCORTING))
             {
-                uiTimer = 0;
-                uiPhase = 0;
+                Initialize();
 
                 RestoreAll();
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index a58a3f10c23..34e7a58140c 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -70,18 +70,12 @@ class instance_magisters_terrace : public InstanceMapScript
 
         struct instance_magisters_terrace_InstanceMapScript : public InstanceScript
         {
-            instance_magisters_terrace_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
+            instance_magisters_terrace_InstanceMapScript(InstanceMap* map) : InstanceScript(map), _delrissaDeathCount(0)
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadObjectData(creatureData, gameObjectData);
                 LoadDoorData(doorData);
-                Initialize();
-            }
-
-            void Initialize() override
-            {
-                _delrissaDeathCount = 0;
             }
 
             uint32 GetData(uint32 type) const override
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index ed1e5673a26..18e9237af6e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -280,7 +280,28 @@ public:
     {
         npc_highlord_darion_mograineAI(Creature* creature) : EscortAI(creature)
         {
-            Reset();
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            bIsBattle = false;
+            uiStep = 0;
+            uiPhase_timer = 3000;
+            uiFight_duration = 300000; // 5 minutes
+            uiTotal_dawn = ENCOUNTER_TOTAL_DAWN;
+            uiTotal_scourge = ENCOUNTER_TOTAL_SCOURGE;
+            uiSummon_counter = 0;
+
+            uiAnti_magic_zone = urand(1000, 6000);
+            uiDeath_strike = urand(5000, 10000);
+            uiDeath_embrace = urand(5000, 10000);
+            uiIcy_touch = urand(5000, 10000);
+            uiUnholy_blight = urand(5000, 10000);
+
+            uiFight_speech = 15000;
+            uiSpawncheck = 1000;
+            uiTargetcheck = 10000;
         }
 
         bool bIsBattle;
@@ -326,23 +347,7 @@ public:
         {
             if (!HasEscortState(STATE_ESCORT_ESCORTING))
             {
-                bIsBattle = false;
-                uiStep = 0;
-                uiPhase_timer = 3000;
-                uiFight_duration = 300000; // 5 minutes
-                uiTotal_dawn = ENCOUNTER_TOTAL_DAWN;
-                uiTotal_scourge = ENCOUNTER_TOTAL_SCOURGE;
-                uiSummon_counter = 0;
-
-                uiAnti_magic_zone = urand(1000, 6000);
-                uiDeath_strike = urand(5000, 10000);
-                uiDeath_embrace = urand(5000, 10000);
-                uiIcy_touch = urand(5000, 10000);
-                uiUnholy_blight = urand(5000, 10000);
-
-                uiFight_speech = 15000;
-                uiSpawncheck = 1000;
-                uiTargetcheck = 10000;
+                Initialize();
 
                 me->SetStandState(UNIT_STAND_STATE_STAND);
                 me->Mount(25279);
@@ -1657,9 +1662,9 @@ public:
 
     struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI
     {
-        npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); }
+        npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { }
         void Reset() override { }
-        void AttackStart(Unit* /*who*/) override { } // very sample, just don't make them aggreesive
+        void AttackStart(Unit* /*who*/) override { } // very simple, just don't make them aggreesive
         void UpdateAI(uint32 /*diff*/) override { }
         void JustDied(Unit* /*killer*/) override { }
     };