Core/Misc: Refactor scripts to fix static analysis warnings

First batch of fixes targeting 100 issues reported by Coverity

2 files changed, 87 insertions, 28 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 95990f18829..7355674963a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -102,9 +102,21 @@ public:
     {
         npc_unworthy_initiateAI(Creature* creature) : ScriptedAI(creature)
         {
+            Initialize();
             me->SetReactState(REACT_PASSIVE);
             if (!me->GetCurrentEquipmentId())
                 me->SetCurrentEquipmentId(me->GetOriginalEquipmentId());
+
+            playerGUID = 0;
+            wait_timer = 0;
+            anchorX = 0.f;
+            anchorY = 0.f;
+        }
+
+        void Initialize()
+        {
+            anchorGUID = 0;
+            phase = PHASE_CHAINED;
         }
 
         uint64 playerGUID;
@@ -117,8 +129,7 @@ public:
 
         void Reset() override
         {
-            anchorGUID = 0;
-            phase = PHASE_CHAINED;
+            Initialize();
             events.Reset();
             me->setFaction(7);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
@@ -516,7 +527,15 @@ public:
     {
         npc_death_knight_initiateAI(Creature* creature) : CombatAI(creature)
         {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            m_uiDuelerGUID = 0;
+            m_uiDuelTimer = 5000;
             m_bIsDuelInProgress = false;
+            lose = false;
         }
 
         bool lose;
@@ -526,15 +545,11 @@ public:
 
         void Reset() override
         {
-            lose = false;
+            Initialize();
+
             me->RestoreFaction();
             CombatAI::Reset();
-
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15);
-
-            m_uiDuelerGUID = 0;
-            m_uiDuelTimer = 5000;
-            m_bIsDuelInProgress = false;
         }
 
         void SpellHit(Unit* pCaster, const SpellInfo* pSpell) override
@@ -630,9 +645,12 @@ class npc_dark_rider_of_acherus : public CreatureScript
 
         struct npc_dark_rider_of_acherusAI : public ScriptedAI
         {
-            npc_dark_rider_of_acherusAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_dark_rider_of_acherusAI(Creature* creature) : ScriptedAI(creature)
+            {
+                Initialize();
+            }
 
-            void Reset() override
+            void Initialize()
             {
                 PhaseTimer = 4000;
                 Phase = 0;
@@ -640,6 +658,11 @@ class npc_dark_rider_of_acherus : public CreatureScript
                 TargetGUID = 0;
             }
 
+            void Reset() override
+            {
+                Initialize();
+            }
+
             void UpdateAI(uint32 diff) override
             {
                 if (!Intro || !TargetGUID)
@@ -1067,18 +1090,24 @@ class npc_scarlet_miner : public CreatureScript
         {
             npc_scarlet_minerAI(Creature* creature) : npc_escortAI(creature)
             {
+                Initialize();
                 me->SetReactState(REACT_PASSIVE);
             }
 
+            void Initialize()
+            {
+                carGUID = 0;
+                IntroTimer = 0;
+                IntroPhase = 0;
+            }
+
             uint32 IntroTimer;
             uint32 IntroPhase;
             uint64 carGUID;
 
             void Reset() override
             {
-                carGUID = 0;
-                IntroTimer = 0;
-                IntroPhase = 0;
+                Initialize();
             }
 
             void IsSummonedBy(Unit* summoner) override
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 8e3743ad5e2..08e3de1941a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -51,7 +51,17 @@ public:
 
     struct npc_crusade_persuadedAI : public ScriptedAI
     {
-        npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            speechTimer = 0;
+            speechCounter = 0;
+            playerGUID = 0;
+        }
 
         uint32 speechTimer;
         uint32 speechCounter;
@@ -59,9 +69,7 @@ public:
 
         void Reset() override
         {
-            speechTimer = 0;
-            speechCounter = 0;
-            playerGUID = 0;
+            Initialize();
             me->SetReactState(REACT_AGGRESSIVE);
             me->RestoreFaction();
         }
@@ -207,16 +215,22 @@ public:
     {
         npc_koltira_deathweaverAI(Creature* creature) : npc_escortAI(creature)
         {
+            Initialize();
             me->SetReactState(REACT_DEFENSIVE);
         }
 
+        void Initialize()
+        {
+            wave = 0;
+            waveTimer = 3000;
+            valrothGUID = 0;
+        }
+
         void Reset() override
         {
             if (!HasEscortState(STATE_ESCORT_ESCORTING))
             {
-                wave = 0;
-                waveTimer = 3000;
-                valrothGUID = 0;
+                Initialize();
                 me->LoadEquipment(0, true);
                 me->RemoveAurasDueToSpell(SPELL_ANTI_MAGIC_ZONE);
                 me->RemoveAurasDueToSpell(SPELL_KOLTIRA_TRANSFORM);
@@ -467,7 +481,17 @@ public:
 
     struct npc_high_inquisitor_valrothAI : public ScriptedAI
     {
-        npc_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_high_inquisitor_valrothAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            uiRenew_timer = 1000;
+            uiInquisitor_Penance_timer = 2000;
+            uiValroth_Smite_timer = 1000;
+        }
 
         uint32 uiRenew_timer;
         uint32 uiInquisitor_Penance_timer;
@@ -475,9 +499,7 @@ public:
 
         void Reset() override
         {
-            uiRenew_timer = 1000;
-            uiInquisitor_Penance_timer = 2000;
-            uiValroth_Smite_timer = 1000;
+            Initialize();
         }
 
         void EnterCombat(Unit* who) override
@@ -603,7 +625,17 @@ public:
 
     struct npc_a_special_surpriseAI : public ScriptedAI
     {
-        npc_a_special_surpriseAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_a_special_surpriseAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            ExecuteSpeech_Timer = 0;
+            ExecuteSpeech_Counter = 0;
+            PlayerGUID = 0;
+        }
 
         uint32 ExecuteSpeech_Timer;
         uint32 ExecuteSpeech_Counter;
@@ -611,9 +643,7 @@ public:
 
         void Reset() override
         {
-            ExecuteSpeech_Timer = 0;
-            ExecuteSpeech_Counter = 0;
-            PlayerGUID = 0;
+            Initialize();
 
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
         }