aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp4
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp9
2 files changed, 11 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 6408417e902..3f81b517721 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -714,7 +714,9 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
// AI of Part2
struct npc_jaina_or_sylvanas_escape_horAI : public ScriptedAI
{
- npc_jaina_or_sylvanas_escape_horAI(Creature* creature) : ScriptedAI(creature)
+ npc_jaina_or_sylvanas_escape_horAI(Creature* creature) : ScriptedAI(creature),
+ _instance(creature->GetInstanceScript()), _lichkingGUID(0), _walltargetGUID(0),
+ _icewallGUID(0), _icewall(0), _isattackingwall(0)
{
_instance = me->GetInstanceScript();
}
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 40110b8a509..50600453368 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -79,20 +79,27 @@ public:
{
SetBossNumber(MAX_ENCOUNTER);
events.Reset();
+
_falricGUID = 0;
_marwynGUID = 0;
_jainaOrSylvanasPart1GUID = 0;
+ _jainaOrSylvanasPart2GUID = 0;
+ _lichkingPart1GUID = 0;
_frostwornGeneralGUID = 0;
+
_frostmourneGUID = 0;
_entranceDoorGUID = 0;
_frostwornDoorGUID = 0;
_arthasDoorGUID = 0;
+ _escapeDoorGUID = 0;
+ _caveGUID = 0;
+
_teamInInstance = 0;
_waveCount = 0;
- _mobsaticewall = 0;
_introEvent = NOT_STARTED;
_frostwornGeneral = NOT_STARTED;
_escapeevent = NOT_STARTED;
+ _mobsaticewall = 0;
}
void OnPlayerEnter(Player* player) OVERRIDE