Merge [SD2]

r1288 Update include guards with better naming.
r1289 Fix typo in makefile.am - skip
r1290 Move AI remaining in misc folders to own folder base.
      Rename file to same as others for consistency and update includes accordingly.

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-16 00:53:16 +02:00
parent e00175d23b
commit 6337c3adfb
57 changed files with 129 additions and 144 deletions

View File

@@ -46,7 +46,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -130,7 +130,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
MinimalRebuild="false"
RuntimeLibrary="2"
@@ -297,7 +297,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
MinimalRebuild="false"
RuntimeLibrary="2"
@@ -357,21 +357,41 @@
<References>
</References>
<Files>
<Filter
Name="base"
>
<File
RelativePath="..\base\escortAI.cpp"
>
</File>
<File
RelativePath="..\base\escortAI.h"
>
</File>
<File
RelativePath="..\base\guard_ai.cpp"
>
</File>
<File
RelativePath="..\base\guard_ai.h"
>
</File>
<File
RelativePath="..\base\guards.cpp"
>
</File>
<File
RelativePath="..\base\simple_ai.cpp"
>
</File>
<File
RelativePath="..\base\simple_ai.h"
>
</File>
</Filter>
<Filter
Name="scripts"
>
<Filter
Name="creature"
>
<File
RelativePath="..\scripts\creature\simple_ai.cpp"
>
</File>
<File
RelativePath="..\scripts\creature\simple_ai.h"
>
</File>
</Filter>
<Filter
Name="eastern_kingdoms"
>
@@ -484,22 +504,6 @@
>
</File>
</Filter>
<Filter
Name="guard"
>
<File
RelativePath="..\scripts\guard\guard_ai.cpp"
>
</File>
<File
RelativePath="..\scripts\guard\guard_ai.h"
>
</File>
<File
RelativePath="..\scripts\guard\guards.cpp"
>
</File>
</Filter>
<Filter
Name="kalimdor"
>
@@ -615,18 +619,6 @@
>
</File>
</Filter>
<Filter
Name="npc"
>
<File
RelativePath="..\scripts\npc\npc_escortAI.cpp"
>
</File>
<File
RelativePath="..\scripts\npc\npc_escortAI.h"
>
</File>
</Filter>
<Filter
Name="outland"
>