Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge [SD2]

Browse Source 
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
This commit is contained in:
Kudlaty
2009-08-16 02:46:55 +02:00
parent 93709273ec
commit 61ed8f90df
11 changed files with 151 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bindings/scripts/system/ScriptLoader.cpp
View File

@@ -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();