From dd4dbdcd16bb72b1b45c7971cb8b9e06030b6e16 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 31 Aug 2014 20:12:47 +0200
Subject: Core/Misc: Refactor scripts to fix static analysis warnings

First batch of fixes targeting 100 issues reported by Coverity
---
 src/server/scripts/Pet/pet_dk.cpp      | 12 ++++++++++--
 src/server/scripts/Pet/pet_generic.cpp | 12 ++++++++++--
 src/server/scripts/Pet/pet_hunter.cpp  | 13 +++++++++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'src/server/scripts/Pet')

diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index 34da2a242f4..b24336cb33c 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -43,12 +43,20 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript
 
         struct npc_pet_dk_ebon_gargoyleAI : CasterAI
         {
-            npc_pet_dk_ebon_gargoyleAI(Creature* creature) : CasterAI(creature) { }
+            npc_pet_dk_ebon_gargoyleAI(Creature* creature) : CasterAI(creature)
+            {
+                Initialize();
+            }
 
-            void InitializeAI() override
+            void Initialize()
             {
                 // Not needed to be despawned now
                 _despawnTimer = 0;
+            }
+
+            void InitializeAI() override
+            {
+                Initialize();
 
                 CasterAI::InitializeAI();
                 uint64 ownerGuid = me->GetOwnerGUID();
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index cfb4820c040..d0e950dec32 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -39,11 +39,19 @@ class npc_pet_gen_mojo : public CreatureScript
 
         struct npc_pet_gen_mojoAI : public ScriptedAI
         {
-            npc_pet_gen_mojoAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_pet_gen_mojoAI(Creature* creature) : ScriptedAI(creature)
+            {
+                Initialize();
+            }
 
-            void Reset() override
+            void Initialize()
             {
                 _victimGUID = 0;
+            }
+
+            void Reset() override
+            {
+                Initialize();
 
                 if (Unit* owner = me->GetOwner())
                     me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f);
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index 8fd6cb54b0e..20412415fbe 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -42,13 +42,22 @@ class npc_pet_hunter_snake_trap : public CreatureScript
 
         struct npc_pet_hunter_snake_trapAI : public ScriptedAI
         {
-            npc_pet_hunter_snake_trapAI(Creature* creature) : ScriptedAI(creature) { }
+            npc_pet_hunter_snake_trapAI(Creature* creature) : ScriptedAI(creature)
+            {
+                Initialize();
+            }
+
+            void Initialize()
+            {
+                _spellTimer = 0;
+                _isViper = false;
+            }
 
             void EnterCombat(Unit* /*who*/) override { }
 
             void Reset() override
             {
-                _spellTimer = 0;
+                Initialize();
 
                 CreatureTemplate const* Info = me->GetCreatureTemplate();
 
-- 
cgit v1.2.3