From e43a6b373a258eb24fc8ea5d5a86c9ad44279cd0 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Mon, 1 Jun 2015 02:31:32 +0100 Subject: Merge pull request #14613 from ariel-/shathalls Fixed some issues with PR #14157 (cherry picked from commit 82a6cbcad4d34e4b20313c17af99b82be6368e3c) Included coverity fix of 25881ca95fd3c8e6c8aecb93739d1642c7a4d9c8 (DD) Conflicts: src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp --- src/server/game/Scripting/ScriptLoader.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/server/game/Scripting/ScriptLoader.cpp') diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 553c752ccce..aa8be4946e4 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -634,6 +634,7 @@ void AddSC_instance_magtheridons_lair(); void AddSC_boss_grand_warlock_nethekurse(); //HC Shattered Halls void AddSC_boss_warbringer_omrogg(); void AddSC_boss_warchief_kargath_bladefist(); +void AddSC_shattered_halls(); void AddSC_instance_shattered_halls(); void AddSC_boss_watchkeeper_gargolmar(); //HC Ramparts void AddSC_boss_omor_the_unscarred(); @@ -1188,6 +1189,7 @@ void AddOutlandScripts() AddSC_boss_grand_warlock_nethekurse(); //HC Shattered Halls AddSC_boss_warbringer_omrogg(); AddSC_boss_warchief_kargath_bladefist(); + AddSC_shattered_halls(); AddSC_instance_shattered_halls(); AddSC_boss_watchkeeper_gargolmar(); //HC Ramparts AddSC_boss_omor_the_unscarred(); -- cgit v1.2.3