aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting
diff options
context:
space:
mode:
authorariel- <ariel.silva305@gmail.com>2015-04-28 02:34:38 -0300
committerariel- <ariel.silva305@gmail.com>2015-05-08 22:58:33 -0300
commit36cdc47e8f8d215d2f638dc977848fdb99e6a541 (patch)
treeff5b6eebccd7dfbbcd9790fe231002e5231c1384 /src/server/game/Scripting
parent09aed2565966c96d403afe44a0cce423c59cb4ec (diff)
Fixed some issues with PR #14157, kudos to @Nyeriah @Warpten:
* Moved scripts to other source file instead of having them on the instance cpp * Removed magic number, use of DoAction instead of SetData to do the yelling * Added spellscript for Remove Kargath's Executioner * Saved victim GUIDs in instance script instead of checking nearby area * Returning position as const-reference (by Naios)
Diffstat (limited to 'src/server/game/Scripting')
-rw-r--r--src/server/game/Scripting/ScriptLoader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 8be5da91c32..f0ee013bcc2 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -622,6 +622,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();
@@ -1152,6 +1153,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();