From 78b5fd615350bba6dc67ac526929b28f7bdd9bcd Mon Sep 17 00:00:00 2001 From: Supabad Date: Tue, 10 May 2011 10:29:12 +0200 Subject: [PATCH] Scripts/Ulduar: Remove ScriptPCH.h completely from Ulduar and add proper headers to each boss --- .../scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp | 3 ++- .../Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp | 5 ++++- .../scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp | 3 ++- .../Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp | 9 +++++++-- .../scripts/Northrend/Ulduar/ulduar/boss_freya.cpp | 4 +++- .../Northrend/Ulduar/ulduar/boss_general_vezax.cpp | 5 ++++- .../scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp | 3 ++- .../scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp | 5 ++++- .../scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp | 6 ++++-- .../scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp | 3 ++- .../scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp | 5 ++++- .../scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp | 3 ++- .../scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp | 3 ++- .../scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp | 6 +++++- .../scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 5 ++++- src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h | 2 -- .../Northrend/Ulduar/ulduar/ulduar_teleporter.cpp | 3 ++- 17 files changed, 53 insertions(+), 20 deletions(-) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 854624727d..da3185323d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -15,7 +15,8 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "ulduar.h" #define GAMEOBJECT_GIVE_OF_THE_OBSERVER 194821 diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 5388bd47ad..978718e325 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -22,7 +22,10 @@ SDComment: Runes need DB support, chain lightning won't cast, supercharge won't SDCategory: Ulduar - Ulduar EndScriptData */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "ulduar.h" enum eSpells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index cee7b17ec6..e06d99d6c9 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -15,7 +15,8 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "ulduar.h" //boss_auriaya diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 94316e29f0..211cfc7e4a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -22,10 +22,15 @@ * if reached brann speaks through his radio.. */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "CombatAI.h" +#include "PassiveAI.h" #include "ScriptedEscortAI.h" +#include "ObjectMgr.h" #include "ulduar.h" -#include "Vehicle.h" + enum Spells { diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 817fcfcd4c..4c5edaa553 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -15,7 +15,9 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" #include "ulduar.h" enum Yells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index 0b724a5447..d31a642b22 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -15,7 +15,10 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "ulduar.h" enum eYells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index 293d6fd3bd..902305dacc 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -15,7 +15,8 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "ulduar.h" enum Yells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index ba0e77cbee..2b6cb76dc1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -15,7 +15,10 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "ulduar.h" enum Yells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index ae416693f7..b4daa8bc79 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -15,9 +15,11 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "ulduar.h" -#include "Vehicle.h" /* ScriptData SDName: boss_kologarn diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp index 2ba9ed5132..7d25f22cd5 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp @@ -15,7 +15,8 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "SpellScript.h" #include "ulduar.h" enum Yells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 1687fd6bee..523011b79c 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -17,7 +17,10 @@ //TODO: Harpoon chain from 62505 should not get removed when other chain is applied -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "SpellScript.h" #include "ulduar.h" enum Says diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index fe66401a66..0f7ea5bf17 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -15,7 +15,8 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "ulduar.h" enum Yells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 96d7168f46..37c6b690fa 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -27,7 +27,8 @@ make the life sparks visible... */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "ulduar.h" enum Spells diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp index feb5360bdb..e4b21e1f66 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp @@ -15,7 +15,7 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" #include "ulduar.h" enum Sara_Yells @@ -52,3 +52,7 @@ enum { ACHIEV_TIMED_START_EVENT = 21001, }; +//not in scriptloader yet just to remove warning boss_yoggsaron.obj : warning LNK4221: no public symbols found; archive member will be inaccessible +void AddSC_boss_yoggsaron() +{ +} diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index 671a8c7257..33809ce618 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -15,7 +15,10 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "InstanceScript.h" +#include "ObjectMgr.h" #include "ulduar.h" static const DoorData doorData[] = diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index 9497136d46..7580d97186 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -15,8 +15,6 @@ * with this program. If not, see . */ -#include "SpellAuraEffects.h" - #ifndef DEF_ULDUAR_H #define DEF_ULDUAR_H diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp index 53da5b5038..3c7feb8052 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp @@ -16,7 +16,8 @@ * with this program. If not, see . */ -#include "ScriptPCH.h" +#include "ScriptMgr.h" +#include "ScriptedGossip.h" #include "ulduar.h" /*