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
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

View File

@@ -391,6 +391,14 @@
<Filter
Name="eastern_kingdoms"
>
<Filter
Name="scarlet_enclave"
>
<File
RelativePath="..\scripts\eastern_kingdoms\scarlet_enclave\the_scarlet_enclave.cpp"
>
</File>
</Filter>
<File
RelativePath="..\scripts\eastern_kingdoms\alterac_mountains.cpp"
>
@@ -1322,22 +1330,6 @@
>
</File>
</Filter>
<Filter
Name="Duskwood"
>
</Filter>
<Filter
Name="Eastern Plaguelands"
>
<File
RelativePath="..\scripts\zone\eastern_plaguelands\the_scarlet_enclave.cpp"
>
</File>
</Filter>
<Filter
Name="Redridge Mountains"
>
</Filter>
<Filter
Name="Scarlet Monastery"
>