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

@@ -189,6 +189,7 @@ src/framework
src/shared/Database
src/shared/vmap
src/game
src/bindings/scripts/base
${CMAKE_BINARY_DIR}
${SCRIPT_INCLUDE}
${MYSQL_INCLUDE_DIR}

View File

@@ -4,14 +4,19 @@
SET(trinityscript_LIB_SRCS
ScriptMgr.cpp
ScriptMgr.h
base/escortAI.cpp
base/escortAI.h
base/guard_ai.cpp
base/guard_ai.h
base/guards.cpp
base/simple_ai.cpp
base/simple_ai.h
include/precompiled.cpp
include/precompiled.h
include/sc_creature.cpp
include/sc_creature.h
include/sc_gossip.h
include/sc_instance.h
scripts/creature/simple_ai.cpp
scripts/creature/simple_ai.h
scripts/eastern_kingdoms/alterac_mountains.cpp
scripts/eastern_kingdoms/arathi_highlands.cpp
scripts/eastern_kingdoms/blasted_lands.cpp
@@ -38,9 +43,6 @@ SET(trinityscript_LIB_SRCS
scripts/examples/example_escort.cpp
scripts/examples/example_gossip_codebox.cpp
scripts/examples/example_misc.cpp
scripts/guard/guard_ai.cpp
scripts/guard/guard_ai.h
scripts/guard/guards.cpp
scripts/kalimdor/ashenvale.cpp
scripts/kalimdor/azshara.cpp
scripts/kalimdor/azuremyst_isle.cpp
@@ -68,8 +70,6 @@ SET(trinityscript_LIB_SRCS
scripts/northrend/icecrown.cpp
scripts/northrend/sholazar_basin.cpp
scripts/northrend/zuldrak.cpp
scripts/npc/npc_escortAI.cpp
scripts/npc/npc_escortAI.h
scripts/outland/blades_edge_mountains.cpp
scripts/outland/boss_doomlord_kazzak.cpp
scripts/outland/boss_doomwalker.cpp

View File

@@ -5,8 +5,8 @@
* This program is free software licensed under GPL version 2
* Please see the included DOCS/LICENSE.TXT for more information */
#ifndef SCRIPTMGR_H
#define SCRIPTMGR_H
#ifndef SC_SCRIPTMGR_H
#define SC_SCRIPTMGR_H
#include "Common.h"
#include "Platform/CompilerDefs.h"

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"
@@ -131,7 +131,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"
@@ -215,7 +215,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"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -300,7 +300,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"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -360,21 +360,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"
>
@@ -487,22 +507,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"
>
@@ -618,18 +622,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"
>

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

View File

@@ -10,7 +10,7 @@ SDCategory: Npc
EndScriptData */
#include "precompiled.h"
#include "npc_escortAI.h"
#include "escortAI.h"
enum
{

View File

@@ -5,8 +5,8 @@
* This program is free software licensed under GPL version 2
* Please see the included DOCS/LICENSE.TXT for more information */
#ifndef SC_PLAYER_H
#define SC_PLAYER_H
#ifndef SC_GOSSIP_H
#define SC_GOSSIP_H
#include "Player.h"
#include "GossipDef.h"

View File

@@ -22,7 +22,7 @@ SDCategory: Script Examples
EndScriptData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
{

View File

@@ -26,7 +26,7 @@ npc_professor_phizzlethorpe
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_professor_phizzlethorpe

View File

@@ -30,7 +30,7 @@ go_harbinger_second_trial
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_prospector_anvilward

View File

@@ -29,7 +29,7 @@ npc_ranger_lilatha
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_blood_knight_dawnstar

View File

@@ -26,7 +26,7 @@ npc_rinji
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_rinji

View File

@@ -27,7 +27,7 @@ npc_deathstalker_erland
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_astor_hadren

View File

@@ -27,7 +27,7 @@ npc_defias_traitor
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_daphne_stilwell

View File

@@ -22,7 +22,7 @@ SDCategory: Script Examples
EndScriptData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
enum
{

View File

@@ -27,7 +27,7 @@ npc_ruul_snowhoof
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*####
# npc_torek

View File

@@ -31,7 +31,7 @@ mob_nestlewood_owlkin
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
#include <cmath>
/*######

View File

@@ -27,7 +27,7 @@ npc_threshwackonator
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*####
# npc_prospector_remtravel

View File

@@ -22,7 +22,7 @@ SDCategory: Feralas
EndScriptData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_gregan_brewspewer

View File

@@ -30,7 +30,7 @@ npc_clintar_dreamwalker
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_bunthen_plainswind

View File

@@ -28,7 +28,7 @@ npc_plains_vision
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
# npc_skorn_whitecloud

View File

@@ -27,7 +27,7 @@ npc_kaya_flathoof
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_braug_dimspirit

View File

@@ -32,7 +32,7 @@ npc_tooga
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## mob_aquementas

View File

@@ -31,7 +31,7 @@ npc_wizzlecrank_shredder
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_beaten_corpse

View File

@@ -29,7 +29,7 @@ npc_plucky
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*#####
# npc_kanati

View File

@@ -26,7 +26,7 @@ npc_injured_rainspeaker_oracle
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_injured_rainspeaker_oracle

View File

@@ -28,7 +28,7 @@ npc_wounded_blood_elf
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_aeranas

View File

@@ -29,7 +29,7 @@ npc_bessy
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_manaforge_control_console

View File

@@ -40,7 +40,7 @@ npc_enraged_spirit
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*#####
# mob_mature_netherwing_drake

View File

@@ -33,7 +33,7 @@ npc_khadgar
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npc_raliq_the_drunk

View File

@@ -32,7 +32,7 @@ npc_slim
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## mob_unkor_the_ruthless

View File

@@ -30,7 +30,7 @@ npc_kayra_longmane
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## npcs_ashyen_and_keleth

View File

@@ -38,7 +38,7 @@ npc_snake_trap_serpents 80% AI for snakes that summoned by Snake Trap
EndContentData */
#include "precompiled.h"
#include "../npc/npc_escortAI.h"
#include "escortAI.h"
#include "ObjectMgr.h"
/*########

View File

@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
EndScriptData */
#include "precompiled.h"
#include "../../../npc/npc_escortAI.h"
#include "escortAI.h"
#include "def_shadow_labyrinth.h"
enum

View File

@@ -37,7 +37,7 @@ npc_rocknot
EndContentData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#include "def_blackrock_depths.h"
/*######

View File

@@ -6,7 +6,7 @@
#define SC_HYJALAI_H
#include "def_hyjal.h"
#include "../../../npc/npc_escortAI.h"
#include "escortAI.h"
// Trash Mobs summoned in waves
#define NECROMANCER 17899//done

View File

@@ -3,7 +3,7 @@
#define SC_HYJAL_TRASH_AI_H
#include "def_hyjal.h"
#include "../../../npc/npc_escortAI.h"
#include "escortAI.h"
#define MINRAIDDAMAGE 700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies

View File

@@ -23,7 +23,7 @@ EndScriptData */
#include "precompiled.h"
#include "def_old_hillsbrad.h"
#include "../../../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
## go_barrel_old_hillsbrad

View File

@@ -28,7 +28,7 @@ npc_taretha
EndContentData */
#include "precompiled.h"
#include "../../../npc/npc_escortAI.h"
#include "escortAI.h"
#include "def_old_hillsbrad.h"
#define QUEST_ENTRY_HILLSBRAD 10282

View File

@@ -23,7 +23,7 @@ EndScriptData */
#include "precompiled.h"
#include "def_serpent_shrine.h"
#include "../../../npc/npc_escortAI.h"
#include "escortAI.h"
#define SAY_AGGRO -1548021
#define SAY_GAIN_BLESSING -1548022

View File

@@ -23,7 +23,7 @@ EndScriptData */
#include "precompiled.h"
#include "def_serpent_shrine.h"
#include "../../../creature/simple_ai.h"
#include "simple_ai.h"
#include "Spell.h"
#define SAY_INTRO -1548042

View File

@@ -23,7 +23,7 @@ EndScriptData */
#include "precompiled.h"
#include "def_serpent_shrine.h"
#include "../../../creature/simple_ai.h"
#include "simple_ai.h"
#include "Spell.h"
#define SPELL_SPOUT 37433

View File

@@ -19,7 +19,7 @@
#include "precompiled.h"
#include "Vehicle.h"
#include "ObjectMgr.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#define GCD_CAST 1

View File

@@ -22,7 +22,7 @@ SDCategory: Karazhan
EndScriptData */
#include "precompiled.h"
#include "../../creature/simple_ai.h"
#include "simple_ai.h"
#include "def_karazhan.h"
#include "GameObject.h"

View File

@@ -29,7 +29,7 @@ EndContentData */
#include "precompiled.h"
#include "def_karazhan.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
/*######
# npc_barnesAI

View File

@@ -26,7 +26,7 @@ mob_ancient_core_hound
EndContentData */
#include "precompiled.h"
#include "../../creature/simple_ai.h"
#include "simple_ai.h"
#define SPELL_CONE_OF_FIRE 19630
#define SPELL_BITE 19771

View File

@@ -26,7 +26,7 @@ npc_willix
EndContentData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#include "def_razorfen_kraul.h"
#define SAY_READY -1047000

View File

@@ -22,7 +22,7 @@ SDCategory: Scarlet Monastery
EndScriptData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#define SAY_AGGRO -1189000
#define SAY_WHIRLWIND -1189001

View File

@@ -26,7 +26,7 @@ npc_shadowfang_prisoner
EndContentData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#include "def_shadowfang_keep.h"
/*######

View File

@@ -26,7 +26,7 @@ npc_a-me
EndContentData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#define SAY_READY -1000200
#define SAY_AGGRO1 -1000201

View File

@@ -25,7 +25,7 @@ EndScriptData */
EndContentData */
#include "precompiled.h"
#include "../../npc/npc_escortAI.h"
#include "escortAI.h"
#include "def_wailing_caverns.h"
/*######