From 1ddf44caf3b0c9af2cc4169b608f1801c2f6f52a Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sun, 6 Dec 2015 23:26:27 +0100
Subject: Core/Quest: Fix issues reported by static analysis

---
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp     | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/server/scripts')

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index 254e3a41d6b..d0a9b233454 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -235,7 +235,7 @@ public:
                 if (AnetheronGUID)
                 {
                     Creature* boss = ObjectAccessor::GetCreature(*me, AnetheronGUID);
-                    if (!boss || (boss && boss->isDead()))
+                    if (!boss || boss->isDead())
                     {
                         me->setDeathState(JUST_DIED);
                         me->RemoveCorpse();
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 08942e3393f..8bfdee067b2 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -200,7 +200,6 @@ public:
             CrippleTimer = 50000;
             WarstompTimer = 10000;
             CheckTimer = 5000;
-            instance = creature->GetInstanceScript();
             AzgalorGUID = instance->GetGuidData(DATA_AZGALOR);
         }
 
@@ -208,7 +207,6 @@ public:
         uint32 WarstompTimer;
         uint32 CheckTimer;
         ObjectGuid AzgalorGUID;
-        InstanceScript* instance;
 
         void Reset() override
         {
@@ -248,7 +246,7 @@ public:
                 if (AzgalorGUID)
                 {
                     Creature* boss = ObjectAccessor::GetCreature(*me, AzgalorGUID);
-                    if (!boss || (boss && boss->isDead()))
+                    if (!boss || boss->isDead())
                     {
                         me->setDeathState(JUST_DIED);
                         me->RemoveCorpse();
-- 
cgit v1.2.3