diff options
| author | Kudlaty <none@none> | 2009-08-16 02:46:55 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-08-16 02:46:55 +0200 |
| commit | 61ed8f90dfb7ebc0d3f57595acfa1429b2d4048d (patch) | |
| tree | c9d1378528de3b36c7d4ed3682414f58daf15f5f /src/bindings/scripts/system/ScriptLoader.cpp | |
| parent | 93709273eca3e265612ecd0ca6c04a8de94aab3e (diff) | |
Merge [SD2]
r1296 Fix typo and check for IN_PROGRESS instead of NOT_STARTED and also return after force EnterEvadeMode in UpdateAI - skip
r1297 Set sysconfdir path in different way for linux compile, to avoid possible DOTCONF++ error at start. Patch by Saeldur - skip
r1298 Fix typo in MC instance script.
r1299 Clean up one MC boss script and remove old workarounds. Patch by Reve
r1300 Add gossip to npc_naladu. Patch by hoshie
r1301 Some minor cleanup and move one folder+source file
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/system/ScriptLoader.cpp')
| -rw-r--r-- | src/bindings/scripts/system/ScriptLoader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bindings/scripts/system/ScriptLoader.cpp b/src/bindings/scripts/system/ScriptLoader.cpp index 1cca715eebe..8d2e4466a41 100644 --- a/src/bindings/scripts/system/ScriptLoader.cpp +++ b/src/bindings/scripts/system/ScriptLoader.cpp @@ -26,6 +26,7 @@ extern void AddSC_npcs_special(); extern void AddSC_npc_taxi(); //eastern kingdoms +extern void AddSC_the_scarlet_enclave(); //extern void AddSC_alterac_mountains(); extern void AddSC_arathi_highlands(); extern void AddSC_blasted_lands(); @@ -226,9 +227,6 @@ extern void AddSC_boss_the_black_stalker(); //Deadmines extern void AddSC_instance_deadmines(); -//Scarlet Enclave -extern void AddSC_the_scarlet_enclave(); - //Gruul's Lair extern void AddSC_boss_gruul(); extern void AddSC_boss_high_king_maulgar(); @@ -539,6 +537,7 @@ void AddScripts() AddSC_npc_taxi(); //eastern kingdoms + AddSC_the_scarlet_enclave(); //AddSC_alterac_mountains(); AddSC_arathi_highlands(); AddSC_blasted_lands(); @@ -739,9 +738,6 @@ void AddScripts() //Deadmines AddSC_instance_deadmines(); - //Scarlet Enclave - AddSC_the_scarlet_enclave(); - //Gruul's Lair AddSC_boss_gruul(); AddSC_boss_high_king_maulgar(); |