* Merge

--HG--
branch : trunk

1 files changed, 14 insertions, 0 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 217752b340e..f81edfdfb01 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -356,6 +356,7 @@ extern void AddSC_boss_selin_fireheart();
 extern void AddSC_boss_vexallus();
 extern void AddSC_boss_priestess_delrissa();
 extern void AddSC_instance_magisters_terrace();
+extern void AddSC_magisters_terrace();
 
 //Maraudon
 extern void AddSC_boss_celebras_the_cursed();
@@ -414,6 +415,9 @@ extern void AddSC_boss_ormorok();
 extern void AddSC_boss_keristrasza();
 extern void AddSC_instance_nexus();
 
+//Obsidian Sanctum
+extern void AddSC_instance_obsidian_sanctum();
+
 //Onyxia's Lair
 extern void AddSC_boss_onyxia();
 
@@ -636,6 +640,9 @@ extern void AddSC_boss_zuljin();
 extern void AddSC_instance_zulaman();
 extern void AddSC_zulaman();
 
+//Zul'Drak
+extern void AddSC_zuldrak();
+
 //Northrend
 //Dungeon
 //Vault of Archavon
@@ -1254,6 +1261,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     AddSC_boss_vexallus();
     AddSC_boss_priestess_delrissa();
     AddSC_instance_magisters_terrace();
+    AddSC_magisters_terrace();
 
     //Maraudon
     AddSC_boss_celebras_the_cursed();
@@ -1312,6 +1320,9 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     AddSC_boss_keristrasza();
     AddSC_instance_nexus();
 
+    //Obsidian Sanctum
+    AddSC_instance_obsidian_sanctum();
+
     //Onyxia's Lair
     AddSC_boss_onyxia();
 
@@ -1534,6 +1545,9 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     AddSC_instance_zulaman();
     AddSC_zulaman();
 
+    //Zul'Drak
+    AddSC_zuldrak();
+
     //Northrend
     //Dungeon
     //Vault of Archavon