From b0b261585f4c410736548cd536642cb104cb7023 Mon Sep 17 00:00:00 2001 From: Xanadu Date: Thu, 4 Feb 2010 21:07:12 +0100 Subject: [PATCH] Move the EvilID.h includes to pch. --HG-- branch : trunk --- src/game/ScriptedPch.h | 1 + src/game/SpellId.h | 4 ++++ src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp | 1 - src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp | 1 - src/scripts/northrend/draktharon_keep/boss_trollgore.cpp | 1 - src/scripts/northrend/naxxramas/boss_anubrekhan.cpp | 1 - src/scripts/northrend/naxxramas/boss_faerlina.cpp | 1 - src/scripts/northrend/naxxramas/boss_gothik.cpp | 1 - src/scripts/northrend/naxxramas/boss_loatheb.cpp | 1 - src/scripts/northrend/naxxramas/boss_maexxna.cpp | 1 - src/scripts/northrend/naxxramas/boss_thaddius.cpp | 1 - src/scripts/northrend/violet_hold/boss_erekem.cpp | 1 - src/scripts/northrend/violet_hold/boss_ichoron.cpp | 1 - src/scripts/world/go_scripts.cpp | 2 +- 14 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/game/ScriptedPch.h b/src/game/ScriptedPch.h index bd725ded21..8a5e4bff42 100644 --- a/src/game/ScriptedPch.h +++ b/src/game/ScriptedPch.h @@ -21,6 +21,7 @@ #include "Chat.h" #include "DBCStructure.h" #include "DBCStores.h" +#include "SpellId.h" #ifdef WIN32 #include diff --git a/src/game/SpellId.h b/src/game/SpellId.h index 84ec56d262..70eda7c85a 100644 --- a/src/game/SpellId.h +++ b/src/game/SpellId.h @@ -1,5 +1,8 @@ /* This file is auto-generated. */ +#ifndef _SPELLID_H +#define _SPELLID_H + enum SpellId { // 1: Word of Recall (OLD) @@ -140134,3 +140137,4 @@ enum SpellId }; +#endif \ No newline at end of file diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 52cb2dbe06..a92866d0f3 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -20,7 +20,6 @@ #include "Vehicle.h" #include "ObjectMgr.h" #include "ScriptedEscortAI.h" -#include "SpellId.h" /*###### ##Quest 12848 diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index 627ef3954a..633c91dbc2 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -23,7 +23,6 @@ EndScriptData */ #include "ScriptedPch.h" #include "temple_of_ahnqiraj.h" -#include "SpellId.h" /* * This is a 2 phases events. Here follows an explanation of the main events and transition between phases and sub-phases. diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp index a820703961..c5ebd62d7e 100644 --- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -29,7 +29,6 @@ update creature_template set scriptname = 'boss_trollgore' where entry = ''; *** SQL END ***/ #include "ScriptedPch.h" #include "drak_tharon_keep.h" -#include "SpellId.h" enum Spells { diff --git a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp index 3b731bc272..19913ce303 100644 --- a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp +++ b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp @@ -16,7 +16,6 @@ #include "ScriptedPch.h" #include "naxxramas.h" -#include "SpellId.h" #define SAY_GREET RAND(-1533000,-1533004,-1533005,-1533006,-1533007) #define SAY_AGGRO RAND(-1533001,-1533002,-1533003) diff --git a/src/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/scripts/northrend/naxxramas/boss_faerlina.cpp index 905ed0034d..1405fd09cc 100644 --- a/src/scripts/northrend/naxxramas/boss_faerlina.cpp +++ b/src/scripts/northrend/naxxramas/boss_faerlina.cpp @@ -18,7 +18,6 @@ #include "ScriptedPch.h" #include "naxxramas.h" -#include "SpellId.h" enum Yells { diff --git a/src/scripts/northrend/naxxramas/boss_gothik.cpp b/src/scripts/northrend/naxxramas/boss_gothik.cpp index 191a5e8e91..0109fcaa56 100644 --- a/src/scripts/northrend/naxxramas/boss_gothik.cpp +++ b/src/scripts/northrend/naxxramas/boss_gothik.cpp @@ -16,7 +16,6 @@ #include "ScriptedPch.h" #include "naxxramas.h" -#include "SpellId.h" enum Yells { diff --git a/src/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/scripts/northrend/naxxramas/boss_loatheb.cpp index c1a637cc70..9bafbeda2a 100644 --- a/src/scripts/northrend/naxxramas/boss_loatheb.cpp +++ b/src/scripts/northrend/naxxramas/boss_loatheb.cpp @@ -18,7 +18,6 @@ #include "ScriptedPch.h" #include "naxxramas.h" -#include "SpellId.h" enum Spells { diff --git a/src/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/scripts/northrend/naxxramas/boss_maexxna.cpp index 8f874e4fcf..7b647b1d43 100644 --- a/src/scripts/northrend/naxxramas/boss_maexxna.cpp +++ b/src/scripts/northrend/naxxramas/boss_maexxna.cpp @@ -18,7 +18,6 @@ #include "ScriptedPch.h" #include "naxxramas.h" -#include "SpellId.h" enum Spells { diff --git a/src/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/scripts/northrend/naxxramas/boss_thaddius.cpp index b2a4b16b2a..5e023e19ce 100644 --- a/src/scripts/northrend/naxxramas/boss_thaddius.cpp +++ b/src/scripts/northrend/naxxramas/boss_thaddius.cpp @@ -18,7 +18,6 @@ #include "ScriptedPch.h" #include "naxxramas.h" -#include "SpellId.h" //Stalagg enum StalaggYells diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp index f88622ddf0..302425966e 100644 --- a/src/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp @@ -11,7 +11,6 @@ update creature_template set scriptname = '' where entry = ''; *** SQL END ***/ #include "ScriptedPch.h" #include "violet_hold.h" -#include "SpellId.h" enum Spells { diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index 8c51340acc..fb916fd02e 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -24,7 +24,6 @@ Script Data End */ #include "ScriptedPch.h" #include "violet_hold.h" -#include "SpellId.h" enum Spells { diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp index 6235c6b312..b771e3cbce 100644 --- a/src/scripts/world/go_scripts.cpp +++ b/src/scripts/world/go_scripts.cpp @@ -43,10 +43,10 @@ go_rusty_cage go_scourge_cage go_jotunheim_cage go_table_theka +go_soulwell EndContentData */ #include "ScriptedPch.h" -#include "SpellId.h" /*###### ## go_cat_figurine