From d5687a10037acd4caefa100ba8ea2b1642867be0 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Tue, 9 Jul 2013 18:42:52 -0230
Subject: Core/Scripting: Few minor fixes for Shattered Halls.

---
 .../scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp  | 2 +-
 .../Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 4483618eace..1d50be94bdf 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -115,7 +115,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
 
             void SetData(uint32 data, uint32 value)
             {
-                if (!data == SETDATA_DATA)
+                if (data != SETDATA_DATA)
                     return;
 
                 switch (value)
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 693373823d6..82ae16e475e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -94,6 +94,7 @@ class instance_shattered_halls : public InstanceMapScript
                     case DATA_OMROGG:
                         break;
                 }
+                return true;
             }
 
             uint64 GetData64(uint32 data) const OVERRIDE
@@ -158,7 +159,6 @@ class instance_shattered_halls : public InstanceMapScript
 
             protected:
                 uint32 encounter[EncounterCount];
-                std::string m_strInstData;
                 uint64 nethekurseGUID;
                 uint64 nethekurseDoor1GUID;
                 uint64 nethekurseDoor2GUID;
-- 
cgit v1.2.3