Merge [SD2]

r1281 Added support for quest 12247. Patch by Azuritus
r1282 Added support for quest 11708. Patch by Azuritus.
      Additional cleanup and code style applied.
r1283 Add support for quest 12807. Patch by Azuritus

--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 9c6ca874357..67c31cd496d 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -292,6 +292,10 @@ extern void AddSC_feralas();
 extern void AddSC_ghostlands();
 
 //Gnomeregan
+
+//Grizzly Hills
+extern void AddSC_grizzly_hills();
+
 //Gruul's Lair
 extern void AddSC_boss_gruul();
 extern void AddSC_boss_high_king_maulgar();
@@ -328,6 +332,9 @@ extern void AddSC_hellfire_peninsula();
 //Hinterlands
 extern void AddSC_hinterlands();
 
+//Icecrown
+extern void AddSC_icecrown();
+
 //Ironforge
 extern void AddSC_ironforge();
 
@@ -1220,6 +1227,10 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     AddSC_ghostlands();
 
     //Gnomeregan
+
+    //Grizzly Hills
+    AddSC_grizzly_hills();
+
     //Gruul's Lair
     AddSC_boss_gruul();
     AddSC_boss_high_king_maulgar();
@@ -1256,6 +1267,9 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     //Hinterlands
     AddSC_hinterlands();
 
+    //Icecrown
+    AddSC_icecrown();
+
     //Ironforge
     AddSC_ironforge();