Merge [SD2]

r1321 Add support for quest 863.
      Some cleanup in existing script.
r1322 Correct database info for current supported Mangos revision (8273+) (Windows may use from 8190+) - skip
r1323 Make escortAI function IsPlayerOrGroupInRange and move existing code to this.
r1324 Fixed IsEncounterInProgress for Arcatraz, The Eye and Shadow Labyrinth
r1325 Renamed aunchindoun to auchindoun. Fixed comment typos.

--HG--
branch : trunk

1 files changed, 14 insertions, 14 deletions

diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 635f9356908..4c98db9abb2 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -2172,11 +2172,11 @@
                         Name="Auchenai Crypts"
                         >
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\auchenai_crypts\boss_exarch_maladaar.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\auchenai_crypts\boss_shirrak_the_dead_watcher.cpp"
                             >
                         </File>
                     </Filter>
@@ -2184,11 +2184,11 @@
                         Name="Mana Tombs"
                         >
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\mana_tombs\boss_nexusprince_shaffar.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\mana_tombs\boss_pandemonius.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\mana_tombs\boss_pandemonius.cpp"
                             >
                         </File>
                     </Filter>
@@ -2196,19 +2196,19 @@
                         Name="Sethekk Halls"
                         >
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\sethekk_halls\boss_darkweaver_syth.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\sethekk_halls\boss_tailonking_ikiss.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\def_sethekk_halls.h"
+                            RelativePath="..\scripts\outland\auchindoun\sethekk_halls\def_sethekk_halls.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\sethekk_halls\instance_sethekk_halls.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\sethekk_halls\instance_sethekk_halls.cpp"
                             >
                         </File>
                     </Filter>
@@ -2216,27 +2216,27 @@
                         Name="Shadow Labyrinth"
                         >
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\boss_ambassador_hellmaw.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\boss_blackheart_the_inciter.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\boss_grandmaster_vorpil.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\boss_murmur.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\boss_murmur.cpp"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
+                            RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\def_shadow_labyrinth.h"
                             >
                         </File>
                         <File
-                            RelativePath="..\scripts\outland\aunchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
+                            RelativePath="..\scripts\outland\auchindoun\shadow_labyrinth\instance_shadow_labyrinth.cpp"
                             >
                         </File>
                     </Filter>