From a5d1bc77abc275402240bec1380fa87f04461ba8 Mon Sep 17 00:00:00 2001 From: Xanadu Date: Fri, 5 Feb 2010 00:31:28 +0100 Subject: A great purge of obsolete macros. --HG-- branch : trunk --- .../northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp | 6 +++--- .../northrend/ulduar/halls_of_lightning/boss_ionar.cpp | 4 ++-- .../northrend/ulduar/halls_of_lightning/boss_loken.cpp | 2 +- .../northrend/ulduar/halls_of_lightning/boss_volkhan.cpp | 4 ++-- .../halls_of_lightning/instance_halls_of_lightning.cpp | 2 +- .../northrend/ulduar/halls_of_stone/boss_krystallus.cpp | 2 +- .../northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp | 2 +- src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp | 6 +++--- .../northrend/ulduar/halls_of_stone/halls_of_stone.cpp | 4 ++-- .../ulduar/halls_of_stone/instance_halls_of_stone.cpp | 2 +- .../northrend/ulduar/ulduar/boss_assembly_of_iron.cpp | 10 +++++----- src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp | 12 ++++++------ src/scripts/northrend/ulduar/ulduar/boss_freya.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp | 2 +- src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/scripts/northrend/ulduar') diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp index d1dc90cd6bf..55a2ca3009a 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -79,7 +79,7 @@ enum eEnums ## boss_bjarngrim ######*/ -struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI +struct boss_bjarngrimAI : public ScriptedAI { boss_bjarngrimAI(Creature *pCreature) : ScriptedAI(pCreature) { @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI m_pInstance->SetData(TYPE_BJARNGRIM, DONE); } - //TODO: remove when removal is done by mangos + //TODO: remove when removal is done by the core void DoRemoveStanceAura(uint8 uiStance) { switch(uiStance) @@ -343,7 +343,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI ## mob_stormforged_lieutenant ######*/ -struct TRINITY_DLL_DECL mob_stormforged_lieutenantAI : public ScriptedAI +struct mob_stormforged_lieutenantAI : public ScriptedAI { mob_stormforged_lieutenantAI(Creature *pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 290dc68ccb7..5a90bbd54a8 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -58,7 +58,7 @@ enum eEnums ## Boss Ionar ######*/ -struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI +struct boss_ionarAI : public ScriptedAI { boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) { @@ -342,7 +342,7 @@ bool EffectDummyCreature_boss_ionar(Unit* pCaster, uint32 uiSpellId, uint32 uiEf ## mob_spark_of_ionar ######*/ -struct TRINITY_DLL_DECL mob_spark_of_ionarAI : public ScriptedAI +struct mob_spark_of_ionarAI : public ScriptedAI { mob_spark_of_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp index b7cc283e2b9..3b5a3ecebd5 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp @@ -58,7 +58,7 @@ enum eEnums ## Boss Loken ######*/ -struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI +struct boss_lokenAI : public ScriptedAI { boss_lokenAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index 4dddf375bac..0401d566c89 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -72,7 +72,7 @@ enum eEnums ## Boss Volkhan ######*/ -struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI +struct boss_volkhanAI : public ScriptedAI { boss_volkhanAI(Creature *pCreature) : ScriptedAI(pCreature) { @@ -363,7 +363,7 @@ bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, uint ## mob_molten_golem ######*/ -struct TRINITY_DLL_DECL mob_molten_golemAI : public ScriptedAI +struct mob_molten_golemAI : public ScriptedAI { mob_molten_golemAI(Creature *pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp index fc556d3ddb7..861b63858b0 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp @@ -31,7 +31,7 @@ EndScriptData */ 3 - Loken */ -struct TRINITY_DLL_DECL instance_halls_of_lightning : public ScriptedInstance +struct instance_halls_of_lightning : public ScriptedInstance { instance_halls_of_lightning(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp index f8a88e9fcc7..3c7f1f02983 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp @@ -32,7 +32,7 @@ enum Yells SAY_SHATTER = -1603010 }; -struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI +struct boss_krystallusAI : public ScriptedAI { boss_krystallusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index 615e4c5cc44..0dd47d1aa6c 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -39,7 +39,7 @@ enum Achievements ACHIEVEMENT_GOOD_GRIEF = 1866 }; -struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI +struct boss_maiden_of_griefAI : public ScriptedAI { boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp index 5986748f0c5..80ec01211ae 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -65,7 +65,7 @@ static Locations PipeLocations[] = static Locations CenterPoint = {1295.21, 667.157, 189.691}; -struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI +struct boss_sjonnirAI : public ScriptedAI { boss_sjonnirAI(Creature *c) : ScriptedAI(c), lSummons(me) { @@ -221,7 +221,7 @@ CreatureAI* GetAI_boss_sjonnir(Creature* pCreature) return new boss_sjonnirAI (pCreature); } -struct TRINITY_DLL_DECL mob_malformed_oozeAI : public ScriptedAI +struct mob_malformed_oozeAI : public ScriptedAI { mob_malformed_oozeAI(Creature *c) : ScriptedAI(c) {} @@ -257,7 +257,7 @@ CreatureAI* GetAI_mob_malformed_ooze(Creature* pCreature) return new mob_malformed_oozeAI(pCreature); } -struct TRINITY_DLL_DECL mob_iron_sludgeAI : public ScriptedAI +struct mob_iron_sludgeAI : public ScriptedAI { mob_iron_sludgeAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index 1c21f531c96..dc581610f38 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -115,7 +115,7 @@ static Locations SpawnLocations[]= {960.748, 382.944, 208.374}, }; -struct TRINITY_DLL_DECL mob_tribuna_controllerAI : public ScriptedAI +struct mob_tribuna_controllerAI : public ScriptedAI { mob_tribuna_controllerAI(Creature *c) : ScriptedAI(c) { @@ -223,7 +223,7 @@ struct TRINITY_DLL_DECL mob_tribuna_controllerAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI +struct npc_brann_hosAI : public npc_escortAI { npc_brann_hosAI(Creature *c) : npc_escortAI(c) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp index 07fece777f5..7c1c9da9142 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp @@ -10,7 +10,7 @@ 3- Sjonnir The Ironshaper */ -struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance +struct instance_halls_of_stone : public ScriptedInstance { instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp index 229f912e226..2bb001b06da 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp @@ -109,7 +109,7 @@ bool IsEncounterComplete(ScriptedInstance* pInstance, Creature* m_creature) return true; } -struct TRINITY_DLL_DECL boss_steelbreakerAI : public ScriptedAI +struct boss_steelbreakerAI : public ScriptedAI { boss_steelbreakerAI(Creature *c) : ScriptedAI(c) { @@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_steelbreakerAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_runemaster_molgeimAI : public ScriptedAI +struct boss_runemaster_molgeimAI : public ScriptedAI { boss_runemaster_molgeimAI(Creature *c) : ScriptedAI(c) { @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_runemaster_molgeimAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_lightning_elementalAI : public ScriptedAI +struct mob_lightning_elementalAI : public ScriptedAI { mob_lightning_elementalAI(Creature *c) : ScriptedAI(c) { @@ -371,7 +371,7 @@ struct TRINITY_DLL_DECL mob_lightning_elementalAI : public ScriptedAI }; -struct TRINITY_DLL_DECL mob_rune_of_summoningAI : public ScriptedAI +struct mob_rune_of_summoningAI : public ScriptedAI { mob_rune_of_summoningAI(Creature *c) : ScriptedAI(c) { @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL mob_rune_of_summoningAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_stormcaller_brundirAI : public ScriptedAI +struct boss_stormcaller_brundirAI : public ScriptedAI { boss_stormcaller_brundirAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp b/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp index c3ae8c01f59..70109eeef03 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp @@ -29,7 +29,7 @@ #define SAY_AGGRO -2615016 #define SAY_SLAY_1 -2615017 -struct TRINITY_DLL_DECL boss_auriaya_AI : public BossAI +struct boss_auriaya_AI : public BossAI { boss_auriaya_AI(Creature *pCreature) : BossAI(pCreature, TYPE_AURIAYA) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp b/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp index b05e59cad20..dd28fb5ff41 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp @@ -69,7 +69,7 @@ enum Seats SEAT_DEVICE = 2, }; -struct TRINITY_DLL_DECL boss_flame_leviathanAI : public BossAI +struct boss_flame_leviathanAI : public BossAI { boss_flame_leviathanAI(Creature *pCreature) : BossAI(pCreature, TYPE_LEVIATHAN), vehicle(me->GetVehicleKit()) { @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathanAI : public BossAI //#define BOSS_DEBUG -struct TRINITY_DLL_DECL boss_flame_leviathan_seatAI : public PassiveAI +struct boss_flame_leviathan_seatAI : public PassiveAI { boss_flame_leviathan_seatAI(Creature *c) : PassiveAI(c), vehicle(c->GetVehicleKit()) { @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_seatAI : public PassiveAI } }; -struct TRINITY_DLL_DECL boss_flame_leviathan_defense_turretAI : public TurretAI +struct boss_flame_leviathan_defense_turretAI : public TurretAI { boss_flame_leviathan_defense_turretAI(Creature *c) : TurretAI(c) {} @@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_defense_turretAI : public TurretAI } }; -struct TRINITY_DLL_DECL boss_flame_leviathan_overload_deviceAI : public PassiveAI +struct boss_flame_leviathan_overload_deviceAI : public PassiveAI { boss_flame_leviathan_overload_deviceAI(Creature *c) : PassiveAI(c) {} @@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_overload_deviceAI : public PassiveA } }; -struct TRINITY_DLL_DECL boss_flame_leviathan_safety_containerAI : public PassiveAI +struct boss_flame_leviathan_safety_containerAI : public PassiveAI { boss_flame_leviathan_safety_containerAI(Creature *c) : PassiveAI(c) {} @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_safety_containerAI : public Passive } }; -struct TRINITY_DLL_DECL spell_pool_of_tarAI : public TriggerAI +struct spell_pool_of_tarAI : public TriggerAI { spell_pool_of_tarAI(Creature *c) : TriggerAI(c) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp b/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp index 22f53c3a2e8..e44cdffff66 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp @@ -24,7 +24,7 @@ #define SAY_SLAY -1 */ -struct TRINITY_DLL_DECL boss_freyaAI : public BossAI +struct boss_freyaAI : public BossAI { boss_freyaAI(Creature* pCreature) : BossAI(pCreature, TYPE_FREYA) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp b/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp index 8603d287b99..4bf9d4f3479 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_hodir.cpp @@ -24,7 +24,7 @@ #define SAY_SLAY -1 */ -struct TRINITY_DLL_DECL boss_hodirAI : public BossAI +struct boss_hodirAI : public BossAI { boss_hodirAI(Creature *pCreature) : BossAI(pCreature, TYPE_HODIR) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp index 3c924b07289..80c81e40616 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_ignis.cpp @@ -27,7 +27,7 @@ #define SAY_AGGRO -10000002 #define SAY_SLAY -1000003 -struct TRINITY_DLL_DECL boss_ignis_AI : public BossAI +struct boss_ignis_AI : public BossAI { boss_ignis_AI(Creature *pCreature) : BossAI(pCreature, TYPE_IGNIS) {} diff --git a/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp b/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp index 4701a63fca1..ab07e5c1327 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp @@ -37,7 +37,7 @@ enum Events EVENT_SWEEP, }; -struct TRINITY_DLL_DECL boss_kologarnAI : public BossAI +struct boss_kologarnAI : public BossAI { boss_kologarnAI(Creature *pCreature) : BossAI(pCreature, TYPE_KOLOGARN), vehicle(me->GetVehicleKit()), left(false), right(false) diff --git a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp index cf114e00897..283dee2afdc 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp @@ -48,7 +48,7 @@ enum Mobs NPC_DARK_RUNE_SENTINEL = 33846 }; -struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI +struct boss_razorscaleAI : public BossAI { boss_razorscaleAI(Creature *pCreature) : BossAI(pCreature, TYPE_RAZORSCALE) {} diff --git a/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp b/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp index 2eececb76a8..c81c9308b9f 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_thorim.cpp @@ -24,7 +24,7 @@ #define SAY_SLAY -1 */ -struct TRINITY_DLL_DECL boss_thorimAI : public BossAI +struct boss_thorimAI : public BossAI { boss_thorimAI(Creature* pCreature) : BossAI(pCreature, TYPE_THORIM) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index 66be50292cb..82913a5ea2c 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -25,7 +25,7 @@ #define SAY_AGGRO -1000000 #define SAY_SLAY -1000001 -struct TRINITY_DLL_DECL boss_xt002_AI : public BossAI +struct boss_xt002_AI : public BossAI { boss_xt002_AI(Creature *pCreature) : BossAI(pCreature, TYPE_XT002) { diff --git a/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp b/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp index 2c961073d89..ea84ecb6670 100644 --- a/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp +++ b/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp @@ -31,7 +31,7 @@ enum eGameObjects GO_Freya_CHEST = 194324, }; -struct TRINITY_DLL_DECL instance_ulduar : public ScriptedInstance +struct instance_ulduar : public ScriptedInstance { instance_ulduar(Map* pMap) : ScriptedInstance(pMap), KologarnChest(NULL), ThorimChest(NULL), HodirChest(NULL), FreyaChest(NULL) { Initialize(); }; -- cgit v1.2.3