*Add missing files for CMake/VCproj and ScriptLoader.

*Fix a possible crash.

--HG--
branch : trunk

6 files changed, 57 insertions, 9 deletions

diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index 0427ee86d09..7f718f7c582 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -136,6 +136,9 @@ SET(trinityscript_LIB_SRCS
    scripts/eastern_kingdoms/stratholme/def_stratholme.h
    scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
    scripts/eastern_kingdoms/stratholme/stratholme.cpp
+   scripts/eastern_kingdoms/sunken_temple/def_sunken_temple.h
+   scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
+   scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
    scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
    scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
    scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
@@ -179,6 +182,7 @@ SET(trinityscript_LIB_SRCS
    scripts/eastern_kingdoms/boss_kruul.cpp
    scripts/eastern_kingdoms/burning_steppes.cpp
    scripts/eastern_kingdoms/dun_morogh.cpp
+   scripts/eastern_kingdoms/duskwood.cpp
    scripts/eastern_kingdoms/eastern_plaguelands.cpp
    scripts/eastern_kingdoms/elwynn_forest.cpp
    scripts/eastern_kingdoms/eversong_woods.cpp
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 1335502ace7..6415d2a4688 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -919,6 +919,19 @@
 					</File>
 				</Filter>
 				<Filter
+					Name="Sunken Temple"
+					>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\def_sunken_temple.h"
+						>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp"
+						>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp"
+						>
+				</Filter>
+				<Filter
 					Name="Sunwell Plateau"
 					>
 					<File
@@ -1107,6 +1120,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\scripts\eastern_kingdoms\duskwood.cpp.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\scripts\eastern_kingdoms\eastern_plaguelands.cpp"
 					>
 				</File>
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index be11b1110e7..0142e173d8f 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -424,6 +424,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\scripts\eastern_kingdoms\duskwood.cpp.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\scripts\eastern_kingdoms\eastern_plaguelands.cpp"
 					>
 				</File>
@@ -1012,6 +1016,19 @@
 					</File>
 				</Filter>
 				<Filter
+					Name="Sunken Temple"
+					>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\def_sunken_temple.h"
+						>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\instance_sunken_temple.cpp"
+						>
+					<File
+						RelativePath="..\scripts\eastern_kingdoms\sunken_temple\sunken_temple.cpp"
+						>
+				</Filter>
+				<Filter
 					Name="Sunwell Plateau"
 					>
 					<File
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp
index 90b06863ea9..31ef0677f3d 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp
@@ -31,15 +31,19 @@ bool AreaTrigger_at_twilight_grove(Player* pPlayer, AreaTriggerEntry *at)
 {
     if (pPlayer->HasQuestForItem(21149))
     {
-        Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16,-489.57,49.95,0,TEMPSUMMON_MANUAL_DESPAWN,60000);
-        TCorrupter->setFaction(14);
-        TCorrupter->SetMaxHealth(832750);
-        Unit* CorrupterSpeaker = pPlayer->SummonCreature(1,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()-1,0,TEMPSUMMON_TIMED_DESPAWN,15000);
-        CorrupterSpeaker->SetName("Twilight Corrupter");
-        CorrupterSpeaker->SetVisibility(VISIBILITY_ON);
-        CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...",0,pPlayer->GetGUID());
+        if(Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16,-489.57,49.95,0,TEMPSUMMON_MANUAL_DESPAWN,60000))
+        {
+            TCorrupter->setFaction(14);
+            TCorrupter->SetMaxHealth(832750);
+        }
+        if(Unit* CorrupterSpeaker = pPlayer->SummonCreature(1,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()-1,0,TEMPSUMMON_TIMED_DESPAWN,15000))
+        {
+            CorrupterSpeaker->SetName("Twilight Corrupter");
+            CorrupterSpeaker->SetVisibility(VISIBILITY_ON);
+            CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...",0,pPlayer->GetGUID());
+        }
     }
-return false;
+    return false;
 };
 
 /*######
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
index a757c7ac4f2..17a24ebd048 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
@@ -37,7 +37,7 @@ bool AreaTrigger_at_malfurion_stormrage(Player* pPlayer, AreaTriggerEntry *at)
     if (ScriptedInstance* pInstance = pPlayer->GetInstanceData())
     {
         if (!pPlayer->FindNearestCreature(15362,15))
-        Unit* Malfurion = pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1. 52, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
+            Unit* Malfurion = pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1. 52, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000);
         return false;
     }
 return false;
diff --git a/src/bindings/scripts/system/ScriptLoader.cpp b/src/bindings/scripts/system/ScriptLoader.cpp
index f21c5e1fb0d..8ecd4e6fcf6 100644
--- a/src/bindings/scripts/system/ScriptLoader.cpp
+++ b/src/bindings/scripts/system/ScriptLoader.cpp
@@ -133,6 +133,8 @@ extern void AddSC_boss_dathrohan_balnazzar();
 extern void AddSC_boss_order_of_silver_hand();
 extern void AddSC_instance_stratholme();
 extern void AddSC_stratholme();
+extern void AddSC_sunken_temple();                  // Sunken Temple
+extern void AddSC_instance_sunken_temple();
 extern void AddSC_instance_sunwell_plateau();       //Sunwell Plateau
 extern void AddSC_boss_kalecgos();
 extern void AddSC_boss_brutallus();
@@ -174,6 +176,7 @@ extern void AddSC_blasted_lands();
 extern void AddSC_boss_kruul();
 extern void AddSC_burning_steppes();
 extern void AddSC_dun_morogh();
+extern void AddSC_duskwood();
 extern void AddSC_eastern_plaguelands();
 extern void AddSC_elwynn_forest();
 extern void AddSC_eversong_woods();
@@ -530,6 +533,8 @@ void AddScripts()
     AddSC_boss_order_of_silver_hand();
     AddSC_instance_stratholme();
     AddSC_stratholme();
+    AddSC_sunken_temple();                  // Sunken Temple
+    AddSC_instance_sunken_temple();
     AddSC_instance_sunwell_plateau();       //Sunwell Plateau
     AddSC_boss_kalecgos();
     AddSC_boss_brutallus();
@@ -571,6 +576,7 @@ void AddScripts()
     AddSC_boss_kruul();
     AddSC_burning_steppes();
     AddSC_dun_morogh();
+    AddSC_duskwood();
     AddSC_eastern_plaguelands();
     AddSC_elwynn_forest();
     AddSC_eversong_woods();