diff options
Diffstat (limited to 'src/scripts')
435 files changed, 872 insertions, 872 deletions
diff --git a/src/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/scripts/eastern_kingdoms/arathi_highlands.cpp index f48326d22c6..d316bf67df9 100644 --- a/src/scripts/eastern_kingdoms/arathi_highlands.cpp +++ b/src/scripts/eastern_kingdoms/arathi_highlands.cpp @@ -49,7 +49,7 @@ enum eEnums MOB_VENGEFUL_SURGE = 2776 }; -struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI +struct npc_professor_phizzlethorpeAI : public npc_escortAI { npc_professor_phizzlethorpeAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index 0b03bfbd2a8..e9256750d31 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -119,7 +119,7 @@ enum GrimstoneTexts }; //TODO: implement quest part of event (different end boss) -struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI +struct npc_grimstoneAI : public npc_escortAI { npc_grimstoneAI(Creature *c) : npc_escortAI(c) { @@ -352,7 +352,7 @@ enum PhalanxSpells SPELL_MIGHTYBLOW = 14099 }; -struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI +struct mob_phalanxAI : public ScriptedAI { mob_phalanxAI(Creature *c) : ScriptedAI(c) {} @@ -566,7 +566,7 @@ enum DughalQuests #define GOSSIP_DUGHAL "You're free, Dughal! Get out of here!" /* -struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI +struct npc_dughal_stormwingAI : public npc_escortAI { npc_dughal_stormwingAI(Creature *c) : npc_escortAI(c) {} @@ -666,7 +666,7 @@ bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature, uin Player* pPlayerStart; /* -struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI +struct npc_marshal_windsorAI : public npc_escortAI { npc_marshal_windsorAI(Creature *c) : npc_escortAI(c) { @@ -831,7 +831,7 @@ bool QuestAccept_npc_marshal_windsor(Player* pPlayer, Creature* pCreature, Quest int wp = 0; /* -struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI +struct npc_marshal_reginald_windsorAI : public npc_escortAI { npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c) { @@ -1026,7 +1026,7 @@ CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature* pCreature) #define SAY_TOBIAS_FREE "Thank you! I will run for safety immediately!" /* -struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI +struct npc_tobias_seecherAI : public npc_escortAI { npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {} @@ -1134,7 +1134,7 @@ enum RocknotQuests QUEST_ALE = 4295 }; -struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI +struct npc_rocknotAI : public npc_escortAI { npc_rocknotAI(Creature *c) : npc_escortAI(c) { diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp index 82475e89fec..acbef7f482b 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp @@ -28,7 +28,7 @@ enum Spells SPELL_FIREBLAST = 15573 }; -struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI +struct boss_ambassador_flamelashAI : public ScriptedAI { boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp index 1d96cffca7d..2d13f4abc52 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp @@ -32,7 +32,7 @@ enum Spells SPELL_ENVELOPINGWEB = 15471 }; -struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI +struct boss_anubshiahAI : public ScriptedAI { boss_anubshiahAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 09cf80a19b9..8ea01ff5933 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -35,7 +35,7 @@ enum Spells SPELL_AVATAROFFLAME = 15636 }; -struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI +struct boss_draganthaurissanAI : public ScriptedAI { boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp index fe33defffd7..1ddfa7e959a 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp @@ -30,7 +30,7 @@ enum Spells SPELL_CLEAVE = 20691 }; -struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI +struct boss_general_angerforgeAI : public ScriptedAI { boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp index b6c2b3321f7..8a9ad969c72 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -29,7 +29,7 @@ enum Spells SPELL_MORTALSTRIKE = 24573 }; -struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI +struct boss_gorosh_the_dervishAI : public ScriptedAI { boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp index 38b2809f71d..0014fc5fe73 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp @@ -34,7 +34,7 @@ enum Spells SPELL_FRENZY = 28371 }; -struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI +struct boss_grizzleAI : public ScriptedAI { boss_grizzleAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp index d1505628512..0a7f380138a 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -31,7 +31,7 @@ enum Spells SPELL_SHADOWSHIELD = 22417 }; -struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI +struct boss_high_interrogator_gerstahnAI : public ScriptedAI { boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp index db3f895ea10..773eaf913cd 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp @@ -29,7 +29,7 @@ enum Spells SPELL_WARSTOMP = 24375 }; -struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI +struct boss_magmusAI : public ScriptedAI { boss_magmusAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp index cc25152c46a..570fdb086a7 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_SMITE = 10934 }; -struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI +struct boss_moira_bronzebeardAI : public ScriptedAI { boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index c569cfaf8e0..44417bf1579 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -94,7 +94,7 @@ enum DoomrelSpells SPELL_SUMMON_VOIDWALKERS = 15092 }; -struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI +struct boss_doomrelAI : public ScriptedAI { boss_doomrelAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp index cd07c706e39..e04ed9e99c6 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp @@ -70,7 +70,7 @@ enum eEnums GO_CHEST_SEVEN = 169243 }; -struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance +struct instance_blackrock_depths : public ScriptedInstance { instance_blackrock_depths(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp index d9f8a42688c..fab2c73dc4d 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_CONFLIGURATION 16805 #define SPELL_THUNDERCLAP 15548 //Not sure if right ID. 23931 would be a harder possibility. -struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI +struct boss_drakkisathAI : public ScriptedAI { boss_drakkisathAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp index 7321036e8ed..60885cc4de4 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_FREEZE 18763 #define SPELL_FLAMEBREATH 20712 -struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI +struct boss_gythAI : public ScriptedAI { boss_gythAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp index 932a4c24366..62aff7322e8 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define ADD_1Z 64.401443 #define ADD_1O 3.124724 -struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI +struct boss_halyconAI : public ScriptedAI { boss_halyconAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp index f0cf6a0b34a..9ec1ded5abe 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define SPELL_KNOCKAWAY 20686 #define SPELL_SLOW 22356 -struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI +struct boss_highlordomokkAI : public ScriptedAI { boss_highlordomokkAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp index c8e2f7719bf..6cfd8b5ca0e 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_MOTHERSMILK 16468 #define SPELL_SUMMON_SPIRE_SPIDERLING 16103 -struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI +struct boss_mothersmolderwebAI : public ScriptedAI { boss_mothersmolderwebAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp index 8923032c70e..1032dc06c78 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define ADD_2Z 88.195160 #define ADD_2O 4.613114 -struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI +struct boss_overlordwyrmthalakAI : public ScriptedAI { boss_overlordwyrmthalakAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp index 1a55ca0006e..25f7a2be61d 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_FLAMEBUFFET 23341 #define SPELL_PYROBLAST 17274 -struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI +struct boss_pyroguard_emberseerAI : public ScriptedAI { boss_pyroguard_emberseerAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp index 39e12905a24..5d88df69915 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_HEALING_POTION 15504 #define SPELL_HOOKEDNET 15609 -struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI +struct boss_quatermasterzigrisAI : public ScriptedAI { boss_quatermasterzigrisAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp index 9c6054f3600..342c110bdaa 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_CLEAVE 20691 #define SPELL_THUNDERCLAP 23931 //Not sure if he cast this spell -struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI +struct boss_rend_blackhandAI : public ScriptedAI { boss_rend_blackhandAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index 765cc4ea81b..4a81b4cd5b2 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_HEX 16708 #define SPELL_CLEAVE 20691 -struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI +struct boss_shadowvoshAI : public ScriptedAI { boss_shadowvoshAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp index 2ebe9016aed..bd60eab0404 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_IMMOLATE 20294 #define SPELL_TERRIFYINGROAR 14100 -struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI +struct boss_thebeastAI : public ScriptedAI { boss_thebeastAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp index 8ec565a9adc..b598b40cb8a 100644 --- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp @@ -30,7 +30,7 @@ EndScriptData */ #define SPELL_PUMMEL 15615 #define SPELL_THROWAXE 16075 -struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI +struct boss_warmastervooneAI : public ScriptedAI { boss_warmastervooneAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp index 664cdb5121d..7706ede2e1f 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define SPELL_MORTALSTRIKE 24573 #define SPELL_KNOCKBACK 25778 -struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI +struct boss_broodlordAI : public ScriptedAI { boss_broodlordAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp index 4fc1be6c306..cee08a0bbec 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp @@ -57,7 +57,7 @@ enum Spells SPELL_ENRAGE = 28747 }; -struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI +struct boss_chromaggusAI : public ScriptedAI { boss_chromaggusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp index 531c292bd3b..0ccdffbdb90 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_SHADOWOFEBONROC 23340 #define SPELL_HEAL 41386 //Thea Heal spell of his Shadow -struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI +struct boss_ebonrocAI : public ScriptedAI { boss_ebonrocAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp index 56b89f7f969..7bcbf72d144 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_WINGBUFFET 23339 #define SPELL_FLAMEBUFFET 23341 -struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI +struct boss_firemawAI : public ScriptedAI { boss_firemawAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp index 1992a9f61a7..8349d308c4f 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_WINGBUFFET 23339 #define SPELL_FRENZY 23342 //This spell periodically triggers fire nova -struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI +struct boss_flamegorAI : public ScriptedAI { boss_flamegorAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp index b233829d7f5..a81ca4c9640 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp @@ -58,7 +58,7 @@ EndScriptData */ #define SPELL_HUNTER 23436 //bow broke #define SPELL_ROGUE 23414 //Paralise -struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI +struct boss_nefarianAI : public ScriptedAI { boss_nefarianAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp index db7cd5770bc..44ec9cb83f3 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define SPELL_FIREBALLVOLLEY 22425 #define SPELL_CONFLAGRATION 23023 -struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI +struct boss_razorgoreAI : public ScriptedAI { boss_razorgoreAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp index 036a9cee3c6..5fff79ad04c 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define SPELL_BURNINGADRENALINE 23620 #define SPELL_CLEAVE 20684 //Chain cleave is most likely named something different and contains a dummy effect -struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI +struct boss_vaelAI : public ScriptedAI { boss_vaelAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp index 3e041de6cea..8d841e71011 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp @@ -67,7 +67,7 @@ EndScriptData */ //If nefarian dies then he will kill himself then he will kill himself in his hiding place //To prevent players from doing the event twice -struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI +struct boss_victor_nefariusAI : public ScriptedAI { boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/boss_kruul.cpp b/src/scripts/eastern_kingdoms/boss_kruul.cpp index 2e06e33b51b..94ec16b7256 100644 --- a/src/scripts/eastern_kingdoms/boss_kruul.cpp +++ b/src/scripts/eastern_kingdoms/boss_kruul.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define SPELL_RAGE 21340 #define SPELL_CAPTURESOUL 21054 -struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI +struct boss_kruulAI : public ScriptedAI { boss_kruulAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/burning_steppes.cpp b/src/scripts/eastern_kingdoms/burning_steppes.cpp index 4c66ef78412..a4e481dea83 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes.cpp @@ -44,7 +44,7 @@ EndContentData */ #define GOSSIP_SELECT10 "Ahh... Ironfoe" #define GOSSIP_SELECT11 "Thanks, Ragged John. Your story was very uplifting and informative" -struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI +struct npc_ragged_johnAI : public ScriptedAI { npc_ragged_johnAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp b/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp index 5d5ce9f7969..78baa137d14 100644 --- a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp +++ b/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp @@ -38,7 +38,7 @@ enum eSpels SAY_AGGRO = -1036001 }; -struct TRINITY_DLL_DECL boss_mr_smiteAI : public ScriptedAI +struct boss_mr_smiteAI : public ScriptedAI { boss_mr_smiteAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp b/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp index 57042f9e6f1..1da65ed611a 100644 --- a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp +++ b/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp @@ -41,7 +41,7 @@ enum Misc DATA_PIRATES_DELAY_TIMER = 1000 }; -struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance +struct instance_deadmines : public ScriptedInstance { instance_deadmines(Map* pMap) : ScriptedInstance(pMap) { Initialize(); }; diff --git a/src/scripts/eastern_kingdoms/dun_morogh.cpp b/src/scripts/eastern_kingdoms/dun_morogh.cpp index 72aeca1b7e3..bdaedb4212c 100644 --- a/src/scripts/eastern_kingdoms/dun_morogh.cpp +++ b/src/scripts/eastern_kingdoms/dun_morogh.cpp @@ -34,7 +34,7 @@ EndContentData */ // signed for 6172 #define SAY_HEAL -1000280 -struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI +struct npc_narm_faulkAI : public ScriptedAI { uint32 lifeTimer; bool spellHit; diff --git a/src/scripts/eastern_kingdoms/duskwood.cpp b/src/scripts/eastern_kingdoms/duskwood.cpp index a3e5d90033f..d9aa69a4545 100644 --- a/src/scripts/eastern_kingdoms/duskwood.cpp +++ b/src/scripts/eastern_kingdoms/duskwood.cpp @@ -54,7 +54,7 @@ bool AreaTrigger_at_twilight_grove(Player* pPlayer, const AreaTriggerEntry *at) #define SPELL_CREATURE_OF_NIGHTMARE 25806 #define SPELL_LEVEL_UP 24312 -struct TRINITY_DLL_DECL boss_twilight_corrupterAI : public ScriptedAI +struct boss_twilight_corrupterAI : public ScriptedAI { boss_twilight_corrupterAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp index 32316c8def7..83fe34bb572 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp @@ -34,7 +34,7 @@ EndContentData */ //id8531 - gibbering ghoul //id8532 - diseased flayer -struct TRINITY_DLL_DECL mobs_ghoul_flayerAI : public ScriptedAI +struct mobs_ghoul_flayerAI : public ScriptedAI { mobs_ghoul_flayerAI(Creature *c) : ScriptedAI(c) {} @@ -83,7 +83,7 @@ bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature, #define SPELL_SPIRIT_SPAWNIN 17321 -struct TRINITY_DLL_DECL npc_darrowshire_spiritAI : public ScriptedAI +struct npc_darrowshire_spiritAI : public ScriptedAI { npc_darrowshire_spiritAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/scripts/eastern_kingdoms/elwynn_forest.cpp index ccef7344808..c4b764cb2bf 100644 --- a/src/scripts/eastern_kingdoms/elwynn_forest.cpp +++ b/src/scripts/eastern_kingdoms/elwynn_forest.cpp @@ -33,7 +33,7 @@ EndContentData */ #define SAY_HEAL -1000280 -struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI +struct npc_henze_faulkAI : public ScriptedAI { uint32 lifeTimer; bool spellHit; diff --git a/src/scripts/eastern_kingdoms/eversong_woods.cpp b/src/scripts/eastern_kingdoms/eversong_woods.cpp index d4d0a0aaaa7..0a6b725f7c6 100644 --- a/src/scripts/eastern_kingdoms/eversong_woods.cpp +++ b/src/scripts/eastern_kingdoms/eversong_woods.cpp @@ -44,7 +44,7 @@ EndContentData */ #define QUEST_THE_DWARVEN_SPY 8483 -struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI +struct npc_prospector_anvilwardAI : public npc_escortAI { // CreatureAI functions npc_prospector_anvilwardAI(Creature *c) : npc_escortAI(c) {} @@ -164,7 +164,7 @@ static uint32 PaladinEntry[] = {CHAMPION_BLOODWRATH, CHAMPION_LIGHTREND, CHAMPIO ## npc_second_trial_paladin ######*/ -struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI +struct npc_secondTrialAI : public ScriptedAI { npc_secondTrialAI(Creature *c) : ScriptedAI(c) {} @@ -296,7 +296,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI ## npc_second_trial_controller ######*/ -struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI +struct master_kelerun_bloodmournAI : public ScriptedAI { master_kelerun_bloodmournAI(Creature *c) : ScriptedAI(c) {} @@ -496,7 +496,7 @@ bool GOHello_go_second_trial(Player* pPlayer, GameObject* pGO) #define MOB_GHARZUL 15958 #define MOB_ANGERSHADE 15656 -struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI +struct npc_apprentice_mirvedaAI : public ScriptedAI { npc_apprentice_mirvedaAI(Creature* c) : ScriptedAI(c), Summons(m_creature) {} @@ -590,7 +590,7 @@ static Location SpawnLocations[] = {8267.97, -7239.17, 139.517} }; -struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI +struct npc_infused_crystalAI : public Scripted_NoMovementAI { npc_infused_crystalAI(Creature* c) : Scripted_NoMovementAI(c) {} diff --git a/src/scripts/eastern_kingdoms/ghostlands.cpp b/src/scripts/eastern_kingdoms/ghostlands.cpp index bb9dd0aceed..91bdca62fe6 100644 --- a/src/scripts/eastern_kingdoms/ghostlands.cpp +++ b/src/scripts/eastern_kingdoms/ghostlands.cpp @@ -151,7 +151,7 @@ enum eEnums FACTION_SMOON_E = 1603, }; -struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI +struct npc_ranger_lilathaAI : public npc_escortAI { npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp index 4c265a27c77..fd8d34d0bbd 100644 --- a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp @@ -86,7 +86,7 @@ const Position SpawnPosition[] = {-494.195,-89.553,-149.131,3.254} }; -struct TRINITY_DLL_DECL npc_blastmaster_emi_shortfuseAI : public npc_escortAI +struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI { npc_blastmaster_emi_shortfuseAI(Creature* pCreature) : npc_escortAI(pCreature) { @@ -536,7 +536,7 @@ bool GossipSelect_npc_blastmaster_emi_shortfuse(Player* pPlayer, Creature* pCrea return true; } -struct TRINITY_DLL_DECL boss_grubbisAI : public ScriptedAI +struct boss_grubbisAI : public ScriptedAI { boss_grubbisAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp index 20041b6e889..3331b69c497 100644 --- a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp @@ -21,7 +21,7 @@ #define MAX_ENCOUNTER 1 -struct TRINITY_DLL_DECL instance_gnomeregan : public ScriptedInstance +struct instance_gnomeregan : public ScriptedInstance { instance_gnomeregan(Map* pMap) : ScriptedInstance(pMap) { diff --git a/src/scripts/eastern_kingdoms/hinterlands.cpp b/src/scripts/eastern_kingdoms/hinterlands.cpp index feb873f2450..082f8895e3c 100644 --- a/src/scripts/eastern_kingdoms/hinterlands.cpp +++ b/src/scripts/eastern_kingdoms/hinterlands.cpp @@ -50,7 +50,7 @@ enum eOOX FACTION_ESCORTEE_H = 775 }; -struct TRINITY_DLL_DECL npc_00x09hlAI : public npc_escortAI +struct npc_00x09hlAI : public npc_escortAI { npc_00x09hlAI(Creature* pCreature) : npc_escortAI(pCreature) { } @@ -177,7 +177,7 @@ Location m_afAmbushMoveTo[] = {70.886589, -2874.335449, 116.675} }; -struct TRINITY_DLL_DECL npc_rinjiAI : public npc_escortAI +struct npc_rinjiAI : public npc_escortAI { npc_rinjiAI(Creature* pCreature) : npc_escortAI(pCreature) { diff --git a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp index 2c1abb16e29..50bbeaec1f5 100644 --- a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp +++ b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp @@ -37,7 +37,7 @@ EndContentData */ #define SPELL_CONVERT_CREDIT 45009 -struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI +struct npc_converted_sentryAI : public ScriptedAI { npc_converted_sentryAI(Creature *c) : ScriptedAI(c) {} @@ -89,7 +89,7 @@ CreatureAI* GetAI_npc_converted_sentry(Creature* pCreature) #define QUESTG 11541 #define DM 25060 -struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI +struct npc_greengill_slaveAI : public ScriptedAI { npc_greengill_slaveAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp index 4db36f9e384..d723cb3e678 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_ENRAGE 30403 //Arcane Infusion: Transforms Curator and adds damage. #define SPELL_BERSERK 26662 -struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI +struct boss_curatorAI : public ScriptedAI { boss_curatorAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp index beb79831bcc..d4b0e9c7806 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp @@ -37,7 +37,7 @@ EndScriptData */ #define SPELL_HOLYGROUND 29512 #define SPELL_BERSERK 26662 -struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI +struct boss_maiden_of_virtueAI : public ScriptedAI { boss_maiden_of_virtueAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp index eaee589e7c9..d684844c993 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp @@ -44,7 +44,7 @@ EndScriptData */ //Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us) #define SUMMON_ATTUMEN 15550 -struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI +struct boss_midnightAI : public ScriptedAI { boss_midnightAI(Creature *c) : ScriptedAI(c) {} @@ -155,7 +155,7 @@ CreatureAI* GetAI_boss_midnight(Creature* pCreature) return new boss_midnightAI(pCreature); } -struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI +struct boss_attumenAI : public ScriptedAI { boss_attumenAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp index 9afabe63ed7..48573456f9a 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp @@ -58,7 +58,7 @@ const uint32 Adds[6]= 19876, }; -struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI +struct boss_moroesAI : public ScriptedAI { boss_moroesAI(Creature *c) : ScriptedAI(c) { @@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI +struct boss_moroes_guestAI : public ScriptedAI { ScriptedInstance* pInstance; @@ -367,7 +367,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI #define SPELL_SWPAIN 34441 #define SPELL_SHADOWFORM 29406 -struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI +struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI { //Shadow Priest boss_baroness_dorothea_millstipeAI(Creature *c) : boss_moroes_guestAI(c) {} @@ -423,7 +423,7 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_ #define SPELL_JUDGEMENTOFCOMMAND 29386 #define SPELL_SEALOFCOMMAND 29385 -struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI +struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI { //Retr Pally boss_baron_rafe_dreugerAI(Creature *c) : boss_moroes_guestAI(c){} @@ -474,7 +474,7 @@ struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI #define SPELL_HOLYFIRE 29563 #define SPELL_PWSHIELD 29408 -struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guestAI +struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI { //Holy Priest boss_lady_catriona_von_indiAI(Creature *c) : boss_moroes_guestAI(c) {} @@ -538,7 +538,7 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest #define SPELL_HOLYLIGHT 29562 //Self or other guest+Moroes #define SPELL_DIVINESHIELD 41367 -struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI +struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI { //Holy Pally boss_lady_keira_berrybuckAI(Creature *c) : boss_moroes_guestAI(c) {} @@ -605,7 +605,7 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI #define SPELL_MORTALSTRIKE 29572 #define SPELL_WHIRLWIND 29573 -struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI +struct boss_lord_robin_darisAI : public boss_moroes_guestAI { //Arms Warr boss_lord_robin_darisAI(Creature *c) : boss_moroes_guestAI(c) {} @@ -655,7 +655,7 @@ struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI #define SPELL_SHIELDBASH 11972 #define SPELL_SHIELDWALL 29390 -struct TRINITY_DLL_DECL boss_lord_crispin_ferenceAI : public boss_moroes_guestAI +struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI { //Arms Warr boss_lord_crispin_ferenceAI(Creature *c) : boss_moroes_guestAI(c) {} diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp index b7de8aa8700..40f6f2bdab8 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp @@ -56,7 +56,7 @@ const uint32 PlayerBuff[3] = {30421,30422,30423}; const uint32 NetherBuff[3] = {30466,30467,30468}; const uint32 PlayerDebuff[3] = {38637,38638,38639}; -struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI +struct boss_netherspiteAI : public ScriptedAI { boss_netherspiteAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp index 9c2cf99bfce..d90c0f74e7d 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp @@ -56,7 +56,7 @@ float IntroWay[8][3] = {-11163 , -1903 ,91.473} }; -struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI +struct boss_nightbaneAI : public ScriptedAI { boss_nightbaneAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index dcba83ab249..3434ea54e1a 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -94,7 +94,7 @@ static InfernalPoint InfernalPoints[] = #define EQUIP_ID_AXE 33542 //Axes info //---------Infernal code first -struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI +struct netherspite_infernalAI : public ScriptedAI { netherspite_infernalAI(Creature *c) : ScriptedAI(c) , malchezaar(0), HellfireTimer(0), CleanupTimer(0), point(NULL) {} @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI void Cleanup(); //below ... }; -struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI +struct boss_malchezaarAI : public ScriptedAI { boss_malchezaarAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index 24979901574..39dc4481bbc 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -79,7 +79,7 @@ enum SuperSpell SUPER_AE, }; -struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI +struct boss_aranAI : public ScriptedAI { boss_aranAI(Creature *c) : ScriptedAI(c) { @@ -495,7 +495,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI +struct water_elementalAI : public ScriptedAI { water_elementalAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp index 71331dd516c..3e5b888d211 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp @@ -54,7 +54,7 @@ EndScriptData */ #define CREATURE_PORTAL 17265 #define CREATURE_KILREK 17229 -struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI +struct mob_kilrekAI : public ScriptedAI { mob_kilrekAI(Creature *c) : ScriptedAI(c) { @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI +struct mob_demon_chainAI : public ScriptedAI { mob_demon_chainAI(Creature *c) : ScriptedAI(c) {} @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_fiendish_portalAI : public PassiveAI +struct mob_fiendish_portalAI : public PassiveAI { mob_fiendish_portalAI(Creature *c) : PassiveAI(c),summons(m_creature){} @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL mob_fiendish_portalAI : public PassiveAI } }; -struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI +struct boss_terestianAI : public ScriptedAI { boss_terestianAI(Creature *c) : ScriptedAI(c) { @@ -330,7 +330,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI #define SPELL_FIREBOLT 30050 // Blasts a target for 181-209 Fire damage. -struct TRINITY_DLL_DECL mob_fiendish_impAI : public ScriptedAI +struct mob_fiendish_impAI : public ScriptedAI { mob_fiendish_impAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp index 28e67098ada..a1322895e35 100644 --- a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp @@ -100,7 +100,7 @@ void SummonCroneIfReady(ScriptedInstance* pInstance, Creature* pCreature) } }; -struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI +struct boss_dorotheeAI : public ScriptedAI { boss_dorotheeAI(Creature* c) : ScriptedAI(c) { @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI +struct mob_titoAI : public ScriptedAI { mob_titoAI(Creature* c) : ScriptedAI(c) {} @@ -258,7 +258,7 @@ void boss_dorotheeAI::SummonTito() } } -struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI +struct boss_strawmanAI : public ScriptedAI { boss_strawmanAI(Creature* c) : ScriptedAI(c) { @@ -361,7 +361,7 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI +struct boss_tinheadAI : public ScriptedAI { boss_tinheadAI(Creature* c) : ScriptedAI(c) { @@ -459,7 +459,7 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI +struct boss_roarAI : public ScriptedAI { boss_roarAI(Creature* c) : ScriptedAI(c) { @@ -556,7 +556,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI +struct boss_croneAI : public ScriptedAI { boss_croneAI(Creature* c) : ScriptedAI(c) { @@ -626,7 +626,7 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI +struct mob_cycloneAI : public ScriptedAI { mob_cycloneAI(Creature* c) : ScriptedAI(c) {} @@ -734,7 +734,7 @@ bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 u return true; } -struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI +struct boss_bigbadwolfAI : public ScriptedAI { boss_bigbadwolfAI(Creature* c) : ScriptedAI(c) { @@ -926,7 +926,7 @@ void Resurrect(Creature *pTarget) pTarget->GetMotionMaster()->Initialize(); }; -struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI +struct boss_julianneAI : public ScriptedAI { boss_julianneAI(Creature* c) : ScriptedAI(c) { @@ -1037,7 +1037,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI void UpdateAI(const uint32 diff); }; -struct TRINITY_DLL_DECL boss_romuloAI : public ScriptedAI +struct boss_romuloAI : public ScriptedAI { boss_romuloAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp index ab643fefab5..1026a576e95 100644 --- a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp @@ -41,7 +41,7 @@ EndScriptData */ 11 - Nightbane */ -struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance +struct instance_karazhan : public ScriptedInstance { instance_karazhan(Map* pMap) : ScriptedInstance(pMap) {Initialize();} diff --git a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp index 846cf51f433..754e206d778 100644 --- a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp @@ -100,7 +100,7 @@ float Spawns[6][2]= #define SPAWN_Y -1758 #define SPAWN_O 4.738 -struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI +struct npc_barnesAI : public npc_escortAI { npc_barnesAI(Creature* c) : npc_escortAI(c) { @@ -444,7 +444,7 @@ bool GossipSelect_npc_berthold(Player* pPlayer, Creature* pCreature, uint32 uiSe static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94}; static float ArcanagosPos[4] = {-11169.75,-1881.48,95.39,4.83}; -struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI +struct npc_image_of_medivhAI : public ScriptedAI { npc_image_of_medivhAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index 037c948f237..bf61a663521 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -75,7 +75,7 @@ float KaelLocations[3][2]= #define LOCATION_Z -16.727455 -struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI +struct boss_felblood_kaelthasAI : public ScriptedAI { boss_felblood_kaelthasAI(Creature* c) : ScriptedAI(c) { @@ -415,7 +415,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI +struct mob_felkael_flamestrikeAI : public ScriptedAI { mob_felkael_flamestrikeAI(Creature *c) : ScriptedAI(c) { @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI +struct mob_felkael_phoenixAI : public ScriptedAI { mob_felkael_phoenixAI(Creature* c) : ScriptedAI(c) { @@ -553,7 +553,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI +struct mob_felkael_phoenix_eggAI : public ScriptedAI { mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {} @@ -578,7 +578,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_arcane_sphereAI : public ScriptedAI +struct mob_arcane_sphereAI : public ScriptedAI { mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) { Reset(); } diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index cdbfe3d088f..f14e1933988 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -85,7 +85,7 @@ const uint32 m_auiAddEntries[] = 24556, //Zelfan }; -struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI +struct boss_priestess_delrissaAI : public ScriptedAI { boss_priestess_delrissaAI(Creature* c) : ScriptedAI(c) { @@ -332,7 +332,7 @@ enum eHealingPotion }; //all 8 possible lackey use this common -struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI +struct boss_priestess_lackey_commonAI : public ScriptedAI { boss_priestess_lackey_commonAI(Creature* c) : ScriptedAI(c) { @@ -475,7 +475,7 @@ enum eRogueSpells SPELL_EVISCERATE = 27611 }; -struct TRINITY_DLL_DECL boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI +struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI { //Rogue boss_kagani_nightstrikeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -573,7 +573,7 @@ enum eWarlockSpells SPELL_SUMMON_IMP = 44163 }; -struct TRINITY_DLL_DECL boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI +struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI { //Warlock boss_ellris_duskhallowAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -658,7 +658,7 @@ enum eKickDown SPELL_SNAP_KICK = 46182 }; -struct TRINITY_DLL_DECL boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI +struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI { //Monk boss_eramas_brightblazeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -713,7 +713,7 @@ enum eMageSpells SPELL_BLINK = 14514 }; -struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI +struct boss_yazzaiAI : public boss_priestess_lackey_commonAI { //Mage boss_yazzaiAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -837,7 +837,7 @@ enum eWarriorSpells SPELL_MORTAL_STRIKE = 44268 }; -struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_commonAI +struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI { //Warrior boss_warlord_salarisAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -951,7 +951,7 @@ enum eHunterSpells NPC_SLIVER = 24552 }; -struct TRINITY_DLL_DECL boss_garaxxasAI : public boss_priestess_lackey_commonAI +struct boss_garaxxasAI : public boss_priestess_lackey_commonAI { //Hunter boss_garaxxasAI(Creature *c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; } @@ -1064,7 +1064,7 @@ enum Spells SPELL_EARTHBIND_TOTEM = 15786 }; -struct TRINITY_DLL_DECL boss_apokoAI : public boss_priestess_lackey_commonAI +struct boss_apokoAI : public boss_priestess_lackey_commonAI { //Shaman boss_apokoAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -1156,7 +1156,7 @@ enum eEngineerSpells SPELL_SHEEP_EXPLOSION = 44279 }; -struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_lackey_commonAI +struct boss_zelfanAI : public boss_priestess_lackey_commonAI { //Engineer boss_zelfanAI(Creature *c) : boss_priestess_lackey_commonAI(c) {} @@ -1234,7 +1234,7 @@ CreatureAI* GetAI_zelfan(Creature* pCreature) return new boss_zelfanAI(pCreature); } -//struct TRINITY_DLL_DECL mob_high_explosive_sheepAI : public ScriptedAI +//struct mob_high_explosive_sheepAI : public ScriptedAI //{ // mob_high_explosive_sheepAI(Creature *c) : ScriptedAI(c) {} // diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp index b8c8c5d6e62..79b92eaa3a5 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp @@ -49,7 +49,7 @@ EndScriptData */ #define CREATURE_FEL_CRYSTAL 24722 -struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI +struct boss_selin_fireheartAI : public ScriptedAI { boss_selin_fireheartAI(Creature* c) : ScriptedAI(c) { @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI if (pUnit) { if (!pUnit->isAlive()) - CAST_CRE(pUnit)->Respawn(); // Let MaNGOS handle setting death state, etc. + CAST_CRE(pUnit)->Respawn(); // Let the core handle setting death state, etc. // Only need to set unselectable flag. You can't attack unselectable units so non_attackable flag is not necessary here. pUnit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -310,7 +310,7 @@ CreatureAI* GetAI_boss_selin_fireheart(Creature* pCreature) return new boss_selin_fireheartAI (pCreature); }; -struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI +struct mob_fel_crystalAI : public ScriptedAI { mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index c358a93bd6b..8a3cd78442c 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -57,7 +57,7 @@ enum eEnums INTERVAL_SWITCH = 6 }; -struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI +struct boss_vexallusAI : public ScriptedAI { boss_vexallusAI(Creature *c) : ScriptedAI(c) { @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI else DoCast(m_creature, SPELL_SUMMON_PURE_ENERGY, false); - //below are workaround summons, remove when summoning spells w/implicitTarget 73 implemented in Mangos + //below are workaround summons, remove when summoning spells w/implicitTarget 73 implemented in the core m_creature->SummonCreature(NPC_PURE_ENERGY, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (IsHeroic()) @@ -185,7 +185,7 @@ CreatureAI* GetAI_boss_vexallus(Creature* pCreature) return new boss_vexallusAI (pCreature); }; -struct TRINITY_DLL_DECL mob_pure_energyAI : public ScriptedAI +struct mob_pure_energyAI : public ScriptedAI { mob_pure_energyAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp index e181ec9bd41..a501cef391d 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp @@ -33,7 +33,7 @@ EndScriptData */ 3 - Kael'thas Sunstrider */ -struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance +struct instance_magisters_terrace : public ScriptedInstance { instance_magisters_terrace(Map* pMap) : ScriptedInstance(pMap) {Initialize();} diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp index 3bd45f85187..96837858535 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp @@ -49,7 +49,7 @@ const float afKaelLandPoint[] = {225.045, -276.236, -5.434}; // This is friendly keal that appear after used Orb. // If we assume DB handle summon, summon appear somewhere outside the platform where Orb is -struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI +struct npc_kalecgosAI : public ScriptedAI { npc_kalecgosAI(Creature* pCreature) : ScriptedAI(pCreature) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp index 4a64f38dcfd..ca20931fc47 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp @@ -30,7 +30,7 @@ EndScriptData */ #define SPELL_LIVINGBOMB 20475 #define SPELL_ARMAGEDDOM 20479 -struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI +struct boss_baron_geddonAI : public ScriptedAI { boss_baron_geddonAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp index 41261972560..447ebc19c98 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp @@ -32,7 +32,7 @@ EndScriptData */ #define SPELL_ERUPTION 19497 #define SPELL_IMMOLATE 20294 -struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI +struct boss_garrAI : public ScriptedAI { boss_garrAI(Creature *c) : ScriptedAI(c) {} @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI +struct mob_fireswornAI : public ScriptedAI { mob_fireswornAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp index e91d3eea75c..5dd34a54b00 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_RAINOFFIRE 19717 #define SPELL_GEHENNASCURSE 19716 -struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI +struct boss_gehennasAI : public ScriptedAI { boss_gehennasAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp index cf3f2b22536..4ea1f5514c6 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp @@ -37,7 +37,7 @@ enum eEnums SPELL_MANGLE = 19820 }; -struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI +struct boss_golemaggAI : public ScriptedAI { boss_golemaggAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI +struct mob_core_ragerAI : public ScriptedAI { mob_core_ragerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp index c5cab836fa0..cf46b06f052 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_LUCIFRONCURSE 19703 #define SPELL_SHADOWSHOCK 20603 -struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI +struct boss_lucifronAI : public ScriptedAI { boss_lucifronAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp index da25998246f..f2a23746d10 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define SPELL_LAVABOMB 19411 //This calls a dummy server side effect that isn't implemented yet #define SPELL_LAVABOMB_ALT 19428 //This is the spell that the lava bomb casts -struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI +struct boss_magmadarAI : public ScriptedAI { boss_magmadarAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp index cf39b9a0835..35fd2dbffe6 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp @@ -51,7 +51,7 @@ EndScriptData */ #define ENTRY_FLAMEWALKER_HEALER 11663 #define ENTRY_FLAMEWALKER_ELITE 11664 -struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI +struct boss_majordomoAI : public ScriptedAI { boss_majordomoAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp index e6139b5bf60..3195ad82591 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp @@ -83,7 +83,7 @@ EndScriptData */ #define ADD_8Z -229.683182 #define ADD_8O 4.693108 -struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI +struct boss_ragnarosAI : public ScriptedAI { boss_ragnarosAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp index ae8b4845c5a..471bffa635f 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_DEADENMAGIC 19714 #define SPELL_COUNTERSPELL 19715 -struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI +struct boss_shazzrahAI : public ScriptedAI { boss_shazzrahAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp index 69819fd2b34..8fa89d97b54 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define SPELL_SHADOWWORDPAIN 19776 #define SPELL_IMMOLATE 20294 -struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI +struct boss_sulfuronAI : public ScriptedAI { boss_sulfuronAI(Creature *c) : ScriptedAI(c) {} @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI +struct mob_flamewaker_priestAI : public ScriptedAI { mob_flamewaker_priestAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp index d4399a281a0..ae7693c7b16 100644 --- a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define ID_RAGNAROS 11502 #define ID_FLAMEWAKERPRIEST 11662 -struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance +struct instance_molten_core : public ScriptedInstance { instance_molten_core(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains.cpp index f26e0131181..46378353282 100644 --- a/src/scripts/eastern_kingdoms/redridge_mountains.cpp +++ b/src/scripts/eastern_kingdoms/redridge_mountains.cpp @@ -38,7 +38,7 @@ enum eCorporalKeeshan SPELL_SHIELD_BASH = 11972, }; -struct TRINITY_DLL_DECL npc_corporal_keeshanAI : public npc_escortAI +struct npc_corporal_keeshanAI : public npc_escortAI { npc_corporal_keeshanAI(Creature* pCreature) : npc_escortAI(pCreature) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index a92866d0f35..40aca9d9696 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -91,7 +91,7 @@ enum UnworthyInitiatePhase PHASE_ATTACKING, }; -struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI +struct npc_unworthy_initiateAI : public ScriptedAI { npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c) { @@ -170,7 +170,7 @@ CreatureAI* GetAI_npc_unworthy_initiate(Creature* pCreature) return new npc_unworthy_initiateAI(pCreature); } -struct TRINITY_DLL_DECL npc_unworthy_initiate_anchorAI : public PassiveAI +struct npc_unworthy_initiate_anchorAI : public PassiveAI { npc_unworthy_initiate_anchorAI(Creature *c) : PassiveAI(c), prisonerGUID(0) {} @@ -337,7 +337,7 @@ int32 m_auiRandomSay[] = SAY_DUEL_A, SAY_DUEL_B, SAY_DUEL_C, SAY_DUEL_D, SAY_DUEL_E, SAY_DUEL_F, SAY_DUEL_G, SAY_DUEL_H, SAY_DUEL_I }; -struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public CombatAI +struct npc_death_knight_initiateAI : public CombatAI { npc_death_knight_initiateAI(Creature* pCreature) : CombatAI(pCreature) { @@ -492,7 +492,7 @@ bool GossipSelect_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature #define DESPAWN_HORSE 52267 #define SAY_DARK_RIDER "The realm of shadows awaits..." -struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI +struct npc_dark_rider_of_acherusAI : public ScriptedAI { npc_dark_rider_of_acherusAI(Creature *c) : ScriptedAI(c) {} @@ -576,7 +576,7 @@ enum eSalanar SPELL_EFFECT_OVERTAKE = 52349 }; -struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI +struct npc_salanar_the_horsemanAI : public ScriptedAI { npc_salanar_the_horsemanAI(Creature *c) : ScriptedAI(c) {} @@ -635,7 +635,7 @@ CreatureAI* GetAI_npc_salanar_the_horseman(Creature* pCreature) ## npc_ros_dark_rider ######*/ -struct TRINITY_DLL_DECL npc_ros_dark_riderAI : public ScriptedAI +struct npc_ros_dark_riderAI : public ScriptedAI { npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {} @@ -679,7 +679,7 @@ enum SG GHOULS = 28845, GHOSTS = 28846, }; -struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI +struct npc_dkc1_gothikAI : public ScriptedAI { npc_dkc1_gothikAI(Creature *c) : ScriptedAI(c) {} @@ -716,7 +716,7 @@ CreatureAI* GetAI_npc_dkc1_gothik(Creature* pCreature) return new npc_dkc1_gothikAI(pCreature); } -struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI +struct npc_scarlet_ghoulAI : public ScriptedAI { npc_scarlet_ghoulAI(Creature *c) : ScriptedAI(c) { @@ -799,7 +799,7 @@ CreatureAI* GetAI_npc_scarlet_ghoul(Creature* pCreature) #define SPELL_CART_CHECK 54173 #define SPELL_CART_DRAG 52465 -struct TRINITY_DLL_DECL npc_scarlet_miner_cartAI : public PassiveAI +struct npc_scarlet_miner_cartAI : public PassiveAI { npc_scarlet_miner_cartAI(Creature *c) : PassiveAI(c), minerGUID(0) { @@ -846,7 +846,7 @@ CreatureAI* GetAI_npc_scarlet_miner_cart(Creature *_Creature) #define SAY_SCARLET_MINER1 "Where'd this come from? I better get this down to the ships before the foreman sees it!" #define SAY_SCARLET_MINER2 "Now I can have a rest!" -struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI +struct npc_scarlet_minerAI : public npc_escortAI { npc_scarlet_minerAI(Creature *c) : npc_escortAI(c) { diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp index 25c786c4938..45300e9fb1c 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp @@ -45,7 +45,7 @@ enum win_friends SPELL_PERSUASIVE_STRIKE = 52781 }; -struct TRINITY_DLL_DECL npc_crusade_persuadedAI : public ScriptedAI +struct npc_crusade_persuadedAI : public ScriptedAI { npc_crusade_persuadedAI(Creature *pCreature) : ScriptedAI(pCreature) {} @@ -166,7 +166,7 @@ enum eKoltira MODEL_DEATH_KNIGHT_MOUNT = 25278 }; -struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI +struct npc_koltira_deathweaverAI : public npc_escortAI { npc_koltira_deathweaverAI(Creature *pCreature) : npc_escortAI(pCreature) { @@ -338,7 +338,7 @@ enum ScarletCourierEnum NPC_SCARLET_COURIER = 29076 }; -struct TRINITY_DLL_DECL mob_scarlet_courierAI : public ScriptedAI +struct mob_scarlet_courierAI : public ScriptedAI { mob_scarlet_courierAI(Creature *pCreature) : ScriptedAI(pCreature) {} @@ -425,7 +425,7 @@ enum valroth SPELL_SUMMON_VALROTH_REMAINS = 52929 }; -struct TRINITY_DLL_DECL mob_high_inquisitor_valrothAI : public ScriptedAI +struct mob_high_inquisitor_valrothAI : public ScriptedAI { mob_high_inquisitor_valrothAI(Creature *pCreature) : ScriptedAI(pCreature) {} @@ -554,7 +554,7 @@ enum SpecialSurprise NPC_PLAGUEFIST = 29053 }; -struct TRINITY_DLL_DECL npc_a_special_surpriseAI : public ScriptedAI +struct npc_a_special_surpriseAI : public ScriptedAI { npc_a_special_surpriseAI(Creature *pCreature) : ScriptedAI(pCreature) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp index 6e97f4b831f..4561ec48212 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp @@ -284,7 +284,7 @@ static Locations LightofDawnLoc[]= {2273.972, -5257.676, 78.862, 0} // 29 Lich king moves forward }; -struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI +struct npc_highlord_darion_mograineAI : public npc_escortAI { npc_highlord_darion_mograineAI(Creature *pCreature) : npc_escortAI(pCreature) { @@ -1635,7 +1635,7 @@ bool GossipSelect_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreat /*###### ## npc the lich king in dawn of light ######*/ -struct TRINITY_DLL_DECL npc_the_lich_king_tirion_dawnAI : public ScriptedAI +struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } void Reset() {} diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp index 55f45b11127..f1ed1ded9b2 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp @@ -24,7 +24,7 @@ #define SPELL_REVIVE 51918 #define VALK_WHISPER "It is not yet your time, champion. Rise! Rise and fight once more!" -struct TRINITY_DLL_DECL npc_valkyr_battle_maidenAI : public PassiveAI +struct npc_valkyr_battle_maidenAI : public PassiveAI { npc_valkyr_battle_maidenAI(Creature *c) : PassiveAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp index c077f6fcb34..2b357367797 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp @@ -35,7 +35,7 @@ enum eEnums SPELL_ARCANEBUBBLE = 9438, }; -struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI +struct boss_arcanist_doanAI : public ScriptedAI { boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp index 6430b6fafcd..e8236dd7ce0 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_TERRIFY 7399 #define SPELL_SOULSIPHON 7290 -struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI +struct boss_azshir_the_sleeplessAI : public ScriptedAI { boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp index ba39fc29675..6b1be49136b 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -35,7 +35,7 @@ enum eEnums SPELL_FIRENOVA = 16079, }; -struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI +struct boss_bloodmage_thalnosAI : public ScriptedAI { boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index c4afca740b2..e79a8204e17 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -131,7 +131,7 @@ static Summon Text[]= #define EMOTE_LAUGHS "Headless Horseman laughs" -struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI +struct mob_wisp_invisAI : public ScriptedAI { mob_wisp_invisAI(Creature *c) : ScriptedAI(c) { @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI +struct mob_headAI : public ScriptedAI { mob_headAI(Creature *c) : ScriptedAI(c) {} @@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI +struct boss_headless_horsemanAI : public ScriptedAI { boss_headless_horsemanAI(Creature *c) : ScriptedAI(c) { @@ -749,7 +749,7 @@ void mob_headAI::Disappear() } } -struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI +struct mob_pulsing_pumpkinAI : public ScriptedAI { mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp index 06b3e3df55e..9df10bd2b13 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define ENTRY_SCARLET_TRAINEE 6575 #define ENTRY_SCARLET_MYRMIDON 4295 -struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI +struct boss_herodAI : public ScriptedAI { boss_herodAI(Creature *c) : ScriptedAI(c) {} @@ -109,7 +109,7 @@ CreatureAI* GetAI_boss_herod(Creature* pCreature) return new boss_herodAI(pCreature); } -struct TRINITY_DLL_DECL mob_scarlet_traineeAI : public npc_escortAI +struct mob_scarlet_traineeAI : public npc_escortAI { mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c) { diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index b549eb7787d..572831eca3a 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -33,7 +33,7 @@ enum eSpells SPELL_SLEEP = 8399 }; -struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI +struct boss_high_inquisitor_fairbanksAI : public ScriptedAI { boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp index b6f71066ac5..0579f007255 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -30,7 +30,7 @@ enum eEnums SPELL_BLOODLUST = 6742 }; -struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI +struct boss_houndmaster_lokseyAI : public ScriptedAI { boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp index 29d7a8e389b..e614341ed04 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp @@ -35,7 +35,7 @@ enum eEnums SPELL_SHADOWWORDPAIN = 2767, }; -struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI +struct boss_interrogator_vishasAI : public ScriptedAI { boss_interrogator_vishasAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp index 752970bef73..08ddc37a12a 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -51,7 +51,7 @@ enum eEnums SPELL_POWERWORDSHIELD = 22187 }; -struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI +struct boss_scarlet_commander_mograineAI : public ScriptedAI { boss_scarlet_commander_mograineAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI +struct boss_high_inquisitor_whitemaneAI : public ScriptedAI { boss_high_inquisitor_whitemaneAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp index dc5adaeed30..88adb538129 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_MINDFLAY 17313 #define SPELL_FROSTNOVA 15531 -struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI +struct boss_scornAI : public ScriptedAI { boss_scornAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp index 041268cf425..53dcfba5fe5 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define MAX_ENCOUNTER 2 -struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance +struct instance_scarlet_monastery : public ScriptedInstance { instance_scarlet_monastery(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp index b1db5b8ac51..a1543413ef5 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp @@ -48,7 +48,7 @@ EndScriptData */ #define ADD_4Z 104.732 #define ADD_4O 3.16 -struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI +struct boss_darkmaster_gandlingAI : public ScriptedAI { boss_darkmaster_gandlingAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp index 805410d287e..d0158244bba 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "ScriptedPch.h" -struct TRINITY_DLL_DECL boss_death_knight_darkreaverAI : public ScriptedAI +struct boss_death_knight_darkreaverAI : public ScriptedAI { boss_death_knight_darkreaverAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp index ae96e4c4e8d..232ba904a4e 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp @@ -33,7 +33,7 @@ enum eEnums SPELL_FRENZY = 8269 }; -struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI +struct boss_theolenkrastinovAI : public ScriptedAI { boss_theolenkrastinovAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp index 7a07d29483c..23df3ad2c59 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_SILENCE 15487 #define SPELL_FEAR 6215 -struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI +struct boss_illuciabarovAI : public ScriptedAI { boss_illuciabarovAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp index f1ed0cb1255..8c49730e919 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp @@ -30,7 +30,7 @@ EndScriptData */ #define SPELL_RENEW 10929 #define SPELL_HEALINGTOUCH 9889 -struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI +struct boss_instructormaliciaAI : public ScriptedAI { boss_instructormaliciaAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp index e836037ec0e..7f45e9f1f0a 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp @@ -29,7 +29,7 @@ EndScriptData */ //Spells of Illusion of Jandice Barov #define SPELL_CLEAVE 15584 -struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI +struct boss_jandicebarovAI : public ScriptedAI { boss_jandicebarovAI(Creature *c) : ScriptedAI(c) {} @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI // Illusion of Jandice Barov Script -struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI +struct mob_illusionofjandicebarovAI : public ScriptedAI { mob_illusionofjandicebarovAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp index 15a7729bf36..d4c677e6b78 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define SPELL_SHADOWBOLTVOLLEY 20741 #define SPELL_BONESHIELD 27688 -struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI +struct boss_kormokAI : public ScriptedAI { boss_kormokAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp index c827622c819..b3b51a48f65 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_IMMOLATE 20294 // Old ID was 15570 #define SPELL_VEILOFSHADOW 17820 -struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI +struct boss_lordalexeibarovAI : public ScriptedAI { boss_lordalexeibarovAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp index 330e54bc287..94cdbe300f5 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_CORROSIVEACID 23313 #define SPELL_NOXIOUSCATALYST 18151 -struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI +struct boss_lorekeeperpolkeltAI : public ScriptedAI { boss_lorekeeperpolkeltAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp index 8e97ae92428..a4a796f71d8 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp @@ -30,7 +30,7 @@ EndScriptData */ #define SPELL_CHILLNOVA 18099 #define SPELL_FROSTVOLLEY 8398 -struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI +struct boss_rasfrostAI : public ScriptedAI { boss_rasfrostAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp index f0dbee97e00..2e0066487de 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_SUNDERINCLEAVE 25174 #define SPELL_KNOCKAWAY 10101 -struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI +struct boss_theravenianAI : public ScriptedAI { boss_theravenianAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp index 7cee6fc0b0d..cb0535bd0b3 100644 --- a/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp @@ -33,7 +33,7 @@ enum eEnums SPELL_FRENZY = 8269 //28371, }; -struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI +struct boss_vectusAI : public ScriptedAI { boss_vectusAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp index 819f25fc16b..ce82f3b95df 100644 --- a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp +++ b/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define MAX_ENCOUNTER 2 -struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance +struct instance_scholomance : public ScriptedInstance { instance_scholomance(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp index 556f47fcf30..a0f097c9b02 100644 --- a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp @@ -52,7 +52,7 @@ const Position SpawnLocation[] = {-140.794,2178.037,128.448,4.090}, {-138.640,2170.159,136.577,2.737} }; -struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance +struct instance_shadowfang_keep : public ScriptedInstance { instance_shadowfang_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp index f948d664204..27d5002e9c1 100644 --- a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp +++ b/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp @@ -51,7 +51,7 @@ enum eEnums #define GOSSIP_ITEM_DOOR "Thanks, I'll follow you to the door." -struct TRINITY_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI +struct npc_shadowfang_prisonerAI : public npc_escortAI { npc_shadowfang_prisonerAI(Creature *c) : npc_escortAI(c) { @@ -131,7 +131,7 @@ bool GossipSelect_npc_shadowfang_prisoner(Player* pPlayer, Creature* pCreature, return true; } -struct TRINITY_DLL_DECL npc_arugal_voidwalkerAI : public ScriptedAI +struct npc_arugal_voidwalkerAI : public ScriptedAI { npc_arugal_voidwalkerAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/scripts/eastern_kingdoms/silvermoon_city.cpp index 226a1794dfb..1c81d701fb0 100644 --- a/src/scripts/eastern_kingdoms/silvermoon_city.cpp +++ b/src/scripts/eastern_kingdoms/silvermoon_city.cpp @@ -37,7 +37,7 @@ EndContentData */ #define SPELL_SHIMMERING_VESSEL 31225 #define SPELL_REVIVE_SELF 32343 -struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI +struct npc_blood_knight_stillbladeAI : public ScriptedAI { npc_blood_knight_stillbladeAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/scripts/eastern_kingdoms/silverpine_forest.cpp index 3fb546697bf..21667d1fc91 100644 --- a/src/scripts/eastern_kingdoms/silverpine_forest.cpp +++ b/src/scripts/eastern_kingdoms/silverpine_forest.cpp @@ -37,7 +37,7 @@ EndContentData */ #define GOSSIP_HAH "You're Astor Hadren, right?" #define GOSSIP_SAH "You've got something I need, Astor. And I'll be taking it now." -struct TRINITY_DLL_DECL npc_astor_hadrenAI : public ScriptedAI +struct npc_astor_hadrenAI : public ScriptedAI { npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {} @@ -115,7 +115,7 @@ enum eErland NPC_QUINN = 1951 }; -struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI +struct npc_deathstalker_erlandAI : public npc_escortAI { npc_deathstalker_erlandAI(Creature *c) : npc_escortAI(c) {} @@ -203,7 +203,7 @@ static float PyrewoodSpawnPoints[3][4] = #define WAIT_SECS 6000 -struct TRINITY_DLL_DECL pyrewood_ambushAI : public ScriptedAI +struct pyrewood_ambushAI : public ScriptedAI { pyrewood_ambushAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { diff --git a/src/scripts/eastern_kingdoms/stormwind_city.cpp b/src/scripts/eastern_kingdoms/stormwind_city.cpp index 03193e76765..6a9136fa73f 100644 --- a/src/scripts/eastern_kingdoms/stormwind_city.cpp +++ b/src/scripts/eastern_kingdoms/stormwind_city.cpp @@ -75,7 +75,7 @@ enum eBartleby QUEST_BEAT = 1640 }; -struct TRINITY_DLL_DECL npc_bartlebyAI : public ScriptedAI +struct npc_bartlebyAI : public ScriptedAI { npc_bartlebyAI(Creature *c) : ScriptedAI(c) { @@ -140,7 +140,7 @@ enum eDashel FACTION_HOSTILE = 168 }; -struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI +struct npc_dashel_stonefistAI : public ScriptedAI { npc_dashel_stonefistAI(Creature *c) : ScriptedAI(c) { @@ -262,7 +262,7 @@ enum eLordGregorLescovar QUEST_THE_ATTACK = 434 }; -struct TRINITY_DLL_DECL npc_lord_gregor_lescovarAI : public npc_escortAI +struct npc_lord_gregor_lescovarAI : public npc_escortAI { npc_lord_gregor_lescovarAI(Creature* pCreature) : npc_escortAI(pCreature) { @@ -403,7 +403,7 @@ CreatureAI* GetAI_npc_lord_gregor_lescovar(Creature* pCreature) ## npc_marzon_silent_blade ######*/ -struct TRINITY_DLL_DECL npc_marzon_silent_bladeAI : public ScriptedAI +struct npc_marzon_silent_bladeAI : public ScriptedAI { npc_marzon_silent_bladeAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -492,7 +492,7 @@ enum eTyrionSpybot NPC_LORD_GREGOR_LESCOVAR = 1754, }; -struct TRINITY_DLL_DECL npc_tyrion_spybotAI : public npc_escortAI +struct npc_tyrion_spybotAI : public npc_escortAI { npc_tyrion_spybotAI(Creature* pCreature) : npc_escortAI(pCreature) {} diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp index b39179624d3..08893ea977f 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp @@ -31,7 +31,7 @@ EndContentData */ ## mob_yenniku ######*/ -struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI +struct mob_yennikuAI : public ScriptedAI { mob_yennikuAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp index 93dbb8d83d8..4fd3e6c9b9e 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp @@ -75,7 +75,7 @@ EndScriptData */ #define SPELL_RAISE_DEAD5 17479 #define SPELL_RAISE_DEAD6 17480 -struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI +struct boss_baron_rivendareAI : public ScriptedAI { boss_baron_rivendareAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp index b3ea1b999d1..2ae770ec5b8 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_SILENCE 18327 //#define SPELL_POSSESS 17244 -struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI +struct boss_baroness_anastariAI : public ScriptedAI { boss_baroness_anastariAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp index 9dee5f470d2..f1a0a57e85c 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp @@ -74,7 +74,7 @@ EndScriptData */ #define SPELL_SHOOT 16496 //#define SPELL_SUMMONCRIMSONRIFLEMAN 17279 -struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI +struct boss_cannon_master_willeyAI : public ScriptedAI { boss_cannon_master_willeyAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp index 4075bf7d79d..83684cb4fe9 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp @@ -63,7 +63,7 @@ SummonDef m_aSummonPoint[]= {3457.338, -3073.979, 135.002, 3.784} //G2 back, right }; -struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI +struct boss_dathrohan_balnazzarAI : public ScriptedAI { boss_dathrohan_balnazzarAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp index 5e58a7b4e8c..d99e6f36044 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp @@ -32,7 +32,7 @@ EndScriptData */ #define MODEL_NORMAL 10433 #define MODEL_HUMAN 3637 -struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI +struct boss_magistrate_barthilasAI : public ScriptedAI { boss_magistrate_barthilasAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp index 70491c2965a..60e7db37da2 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_DRAIN_MANA 17243 #define SPELL_ICETOMB 16869 -struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI +struct boss_maleki_the_pallidAI : public ScriptedAI { boss_maleki_the_pallidAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp index e3b965926ea..4f3905e8698 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_CRYPT_SCARABS 31602 #define SPELL_RAISEUNDEADSCARAB 17235 -struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI +struct boss_nerubenkanAI : public ScriptedAI { boss_nerubenkanAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp index c35712758c9..6c20e18bcfb 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_HOLY_LIGHT 25263 #define SPELL_DIVINE_SHIELD 13874 -struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI +struct boss_silver_hand_bossesAI : public ScriptedAI { boss_silver_hand_bossesAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp index fe3145dffaa..0aea76c10f8 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp @@ -34,7 +34,7 @@ EndScriptData */ #define SPELL_CURSEOFTONGUES 12889 #define SPELL_CALLOFTHEGRAVE 17831 -struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI +struct boss_postmaster_malownAI : public ScriptedAI { boss_postmaster_malownAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp index 403c72afffa..5eaa4775b04 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define C_MINDLESS_UNDEAD 11030 -struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI +struct boss_ramstein_the_gorgerAI : public ScriptedAI { boss_ramstein_the_gorgerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp index c49b33d8bdc..ccff3b32b77 100644 --- a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_RAVENOUSCLAW 17470 -struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI +struct boss_timmy_the_cruelAI : public ScriptedAI { boss_timmy_the_cruelAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp index f2ccb1794d5..05f59f2c786 100644 --- a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp @@ -47,7 +47,7 @@ EndScriptData */ #define MAX_ENCOUNTER 6 -struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance +struct instance_stratholme : public ScriptedInstance { instance_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp index 4c00585647d..6b6bbe13cbd 100644 --- a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp @@ -77,7 +77,7 @@ bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* pGo) #define SAY_ZAPPED2 -1329002 #define SAY_ZAPPED3 -1329003 -struct TRINITY_DLL_DECL mob_freed_soulAI : public ScriptedAI +struct mob_freed_soulAI : public ScriptedAI { mob_freed_soulAI(Creature *c) : ScriptedAI(c) {} @@ -104,7 +104,7 @@ CreatureAI* GetAI_mob_freed_soul(Creature* pCreature) #define ENTRY_RESTLESS 11122 #define ENTRY_FREED 11136 -struct TRINITY_DLL_DECL mob_restless_soulAI : public ScriptedAI +struct mob_restless_soulAI : public ScriptedAI { mob_restless_soulAI(Creature *c) : ScriptedAI(c) {} @@ -175,7 +175,7 @@ enum eGhostlyCitizenSpells SPELL_SLAP = 6754 }; -struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI +struct mobs_spectral_ghostly_citizenAI : public ScriptedAI { mobs_spectral_ghostly_citizenAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp index 378ca8324d6..be4c5901ebc 100644 --- a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp +++ b/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp @@ -37,7 +37,7 @@ EndScriptData */ #define NPC_MALFURION_STORMRAGE 15362 -struct TRINITY_DLL_DECL instance_sunken_temple : public ScriptedInstance +struct instance_sunken_temple : public ScriptedInstance { instance_sunken_temple(Map* pMap) : ScriptedInstance(pMap) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp index 4bd2e00691a..1f0b1e3a57e 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp @@ -64,7 +64,7 @@ enum Spells #define FELMYST 25038 -struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI +struct boss_brutallusAI : public ScriptedAI { boss_brutallusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp index de17f5ec850..103b008c8d9 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp @@ -91,7 +91,7 @@ enum Creatures LADY_SACROLASH = 25165 }; -struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI +struct boss_sacrolashAI : public ScriptedAI { boss_sacrolashAI(Creature *c) : ScriptedAI(c) { @@ -346,7 +346,7 @@ CreatureAI* GetAI_boss_sacrolash(Creature* pCreature) return new boss_sacrolashAI (pCreature); }; -struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI +struct boss_alythessAI : public Scripted_NoMovementAI { boss_alythessAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -673,7 +673,7 @@ CreatureAI* GetAI_boss_alythess(Creature* pCreature) return new boss_alythessAI (pCreature); }; -struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI +struct mob_shadow_imageAI : public ScriptedAI { mob_shadow_imageAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp index 6e680a16f19..48a51020e73 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp @@ -124,7 +124,7 @@ static EventFelmyst MaxTimer[]= EVENT_SUMMON_FOG, }; -struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI +struct boss_felmystAI : public ScriptedAI { boss_felmystAI(Creature *c) : ScriptedAI(c) { @@ -548,7 +548,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI +struct mob_felmyst_vaporAI : public ScriptedAI { mob_felmyst_vaporAI(Creature *c) : ScriptedAI(c) { @@ -569,7 +569,7 @@ struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_felmyst_trailAI : public ScriptedAI +struct mob_felmyst_trailAI : public ScriptedAI { mob_felmyst_trailAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp index f18587fecb5..575bb0afaa1 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp @@ -107,7 +107,7 @@ enum SWPActions uint32 WildMagic[] = { 44978, 45001, 45002, 45004, 45006, 45010 }; -struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI +struct boss_kalecgosAI : public ScriptedAI { boss_kalecgosAI(Creature *c) : ScriptedAI(c) { @@ -429,7 +429,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI +struct boss_sathrovarrAI : public ScriptedAI { boss_sathrovarrAI(Creature *c) : ScriptedAI(c) { @@ -653,7 +653,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI +struct boss_kalecAI : public ScriptedAI { ScriptedInstance *pInstance; diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index d85af40496e..cdb79d5e2f6 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -300,7 +300,7 @@ bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* pGo) } //AI for Kalecgos -struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI +struct boss_kalecgos_kjAI : public ScriptedAI { boss_kalecgos_kjAI(Creature* c) : ScriptedAI(c) { @@ -431,7 +431,7 @@ CreatureAI* GetAI_boss_kalecgos_kj(Creature* pCreature) } //AI for Kil'jaeden -struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI +struct boss_kiljaedenAI : public Scripted_NoMovementAI { boss_kiljaedenAI(Creature* c) : Scripted_NoMovementAI(c), Summons(m_creature) { @@ -780,7 +780,7 @@ CreatureAI* GetAI_boss_kiljaeden(Creature* pCreature) } //AI for Kil'jaeden Event Controller -struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementAI +struct mob_kiljaeden_controllerAI : public Scripted_NoMovementAI { mob_kiljaeden_controllerAI(Creature* c) : Scripted_NoMovementAI(c), Summons(m_creature) { @@ -875,7 +875,7 @@ CreatureAI* GetAI_mob_kiljaeden_controller(Creature* pCreature) } //AI for Hand of the Deceiver -struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI +struct mob_hand_of_the_deceiverAI : public ScriptedAI { mob_hand_of_the_deceiverAI(Creature* c) : ScriptedAI(c) { @@ -965,7 +965,7 @@ CreatureAI* GetAI_mob_hand_of_the_deceiver(Creature* pCreature) } //AI for Felfire Portal -struct TRINITY_DLL_DECL mob_felfire_portalAI : public Scripted_NoMovementAI +struct mob_felfire_portalAI : public Scripted_NoMovementAI { mob_felfire_portalAI(Creature* c) : Scripted_NoMovementAI(c) {} @@ -1010,7 +1010,7 @@ CreatureAI* GetAI_mob_felfire_portal(Creature* pCreature) } //AI for Felfire Fiend -struct TRINITY_DLL_DECL mob_volatile_felfire_fiendAI : public ScriptedAI +struct mob_volatile_felfire_fiendAI : public ScriptedAI { mob_volatile_felfire_fiendAI(Creature* c) : ScriptedAI(c) {} @@ -1061,7 +1061,7 @@ CreatureAI* GetAI_mob_volatile_felfire_fiend(Creature* pCreature) } //AI for Armageddon target -struct TRINITY_DLL_DECL mob_armageddonAI : public Scripted_NoMovementAI +struct mob_armageddonAI : public Scripted_NoMovementAI { mob_armageddonAI(Creature* c) : Scripted_NoMovementAI(c) {} @@ -1109,7 +1109,7 @@ CreatureAI* GetAI_mob_armageddon(Creature* pCreature) } //AI for Shield Orbs -struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI +struct mob_shield_orbAI : public ScriptedAI { mob_shield_orbAI(Creature* c) : ScriptedAI(c) { @@ -1193,7 +1193,7 @@ CreatureAI* GetAI_mob_shield_orb(Creature* pCreature) } //AI for Sinister Reflection -struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI +struct mob_sinster_reflectionAI : public ScriptedAI { mob_sinster_reflectionAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp index 997933725f7..c1b672af831 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp @@ -113,7 +113,7 @@ float Humanoides[6][5] = }; uint32 EnrageTimer = 600000; -struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI +struct boss_entropiusAI : public ScriptedAI { boss_entropiusAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { @@ -206,7 +206,7 @@ CreatureAI* GetAI_boss_entropius(Creature* pCreature) return new boss_entropiusAI (pCreature); } -struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI +struct boss_muruAI : public Scripted_NoMovementAI { boss_muruAI(Creature *c) : Scripted_NoMovementAI(c), Summons(m_creature) { @@ -364,7 +364,7 @@ CreatureAI* GetAI_boss_muru(Creature* pCreature) return new boss_muruAI (pCreature); } -struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI +struct npc_muru_portalAI : public Scripted_NoMovementAI { npc_muru_portalAI(Creature *c) : Scripted_NoMovementAI(c), Summons(m_creature) { @@ -442,7 +442,7 @@ CreatureAI* GetAI_npc_muru_portal(Creature* pCreature) return new npc_muru_portalAI (pCreature); } -struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI +struct npc_dark_fiendAI : public ScriptedAI { npc_dark_fiendAI(Creature *c) : ScriptedAI(c) {} @@ -498,7 +498,7 @@ CreatureAI* GetAI_npc_dark_fiend(Creature* pCreature) return new npc_dark_fiendAI (pCreature); } -struct TRINITY_DLL_DECL npc_void_sentinelAI : public ScriptedAI +struct npc_void_sentinelAI : public ScriptedAI { npc_void_sentinelAI(Creature *c) : ScriptedAI(c){} @@ -547,7 +547,7 @@ CreatureAI* GetAI_npc_void_sentinel(Creature* pCreature) return new npc_void_sentinelAI (pCreature); } -struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI +struct npc_blackholeAI : public ScriptedAI { npc_blackholeAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp index 199746468cd..cb472e32bdd 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp @@ -23,7 +23,7 @@ EndScriptData */ 5 - Kil'Jaeden */ -struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance +struct instance_sunwell_plateau : public ScriptedInstance { instance_sunwell_plateau(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades.cpp index 5782898864b..65acac15c3b 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades.cpp @@ -41,7 +41,7 @@ enum eCalvin FACTION_HOSTILE = 168 }; -struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI +struct npc_calvin_montagueAI : public ScriptedAI { npc_calvin_montagueAI(Creature* pCreature) : ScriptedAI(pCreature) { } diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp index bccd01aed00..6eeb54f0fa7 100644 --- a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp @@ -46,7 +46,7 @@ EndScriptData */ #define SPELL_AWAKEN_VAULT_WALKER 10258 #define SPELL_AWAKEN_EARTHEN_GUARDIAN 10252 -struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI +struct boss_archaedasAI : public ScriptedAI { boss_archaedasAI(Creature *c) : ScriptedAI(c) { @@ -200,7 +200,7 @@ EndScriptData */ #define SPELL_ARCHAEDAS_AWAKEN 10347 -struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI +struct mob_archaedas_minionsAI : public ScriptedAI { mob_archaedas_minionsAI(Creature *c) : ScriptedAI(c) { @@ -350,9 +350,9 @@ EndScriptData */ #include "ScriptedPch.h" -#define SPELL_SELF_DESTRUCT 9874 +#define SPELL_SELF_DESTRUCT 9874 -struct TRINITY_DLL_DECL mob_stonekeepersAI : public ScriptedAI +struct mob_stonekeepersAI : public ScriptedAI { mob_stonekeepersAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp index 5e980d45ae0..604b3453d45 100644 --- a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_KNOCKAWAY 10101 #define SPELL_WSTOMP 11876 -struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI +struct boss_ironayaAI : public ScriptedAI { boss_ironayaAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index 76160ba057c..3e3fcc18adf 100644 --- a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -27,7 +27,7 @@ #define ANCIENT_VAULT_DOOR 124369 -struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance +struct instance_uldaman : public ScriptedInstance { instance_uldaman(Map* pMap) : ScriptedInstance(pMap) { diff --git a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp index 92f8721fee3..8a9ac246d52 100644 --- a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp @@ -34,7 +34,7 @@ EndContentData */ #define SPELL_CSLUMBER 3636 -struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI +struct mob_jadespine_basiliskAI : public ScriptedAI { mob_jadespine_basiliskAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/undercity.cpp b/src/scripts/eastern_kingdoms/undercity.cpp index 06373a839e4..4e0e03208b4 100644 --- a/src/scripts/eastern_kingdoms/undercity.cpp +++ b/src/scripts/eastern_kingdoms/undercity.cpp @@ -55,7 +55,7 @@ float HighborneLoc[4][3]= #define HIGHBORNE_LOC_Y -61.00 #define HIGHBORNE_LOC_Y_NEW -55.50 -struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI +struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI { npc_lady_sylvanas_windrunnerAI(Creature *c) : ScriptedAI(c) {} @@ -136,7 +136,7 @@ bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature* pCreat ## npc_highborne_lamenter ######*/ -struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI +struct npc_highborne_lamenterAI : public ScriptedAI { npc_highborne_lamenterAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/scripts/eastern_kingdoms/western_plaguelands.cpp index 801969e1e76..14f65bd9c80 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands.cpp @@ -137,7 +137,7 @@ bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature, uint ## npc_the_scourge_cauldron ######*/ -struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI +struct npc_the_scourge_cauldronAI : public ScriptedAI { npc_the_scourge_cauldronAI(Creature *c) : ScriptedAI(c) {} @@ -214,7 +214,7 @@ enum eAndorhalTower GO_BEACON_TORCH = 176093 }; -struct TRINITY_DLL_DECL npc_andorhal_towerAI : public Scripted_NoMovementAI +struct npc_andorhal_towerAI : public Scripted_NoMovementAI { npc_andorhal_towerAI(Creature *c) : Scripted_NoMovementAI(c) {} diff --git a/src/scripts/eastern_kingdoms/westfall.cpp b/src/scripts/eastern_kingdoms/westfall.cpp index 06861a4975d..c5e72109006 100644 --- a/src/scripts/eastern_kingdoms/westfall.cpp +++ b/src/scripts/eastern_kingdoms/westfall.cpp @@ -47,7 +47,7 @@ enum eEnums EQUIP_ID_RIFLE = 2511 }; -struct TRINITY_DLL_DECL npc_daphne_stilwellAI : public npc_escortAI +struct npc_daphne_stilwellAI : public npc_escortAI { npc_daphne_stilwellAI(Creature* pCreature) : npc_escortAI(pCreature) {} @@ -191,7 +191,7 @@ CreatureAI* GetAI_npc_daphne_stilwell(Creature* pCreature) #define QUEST_DEFIAS_BROTHERHOOD 155 -struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI +struct npc_defias_traitorAI : public npc_escortAI { npc_defias_traitorAI(Creature *c) : npc_escortAI(c) { Reset(); } diff --git a/src/scripts/eastern_kingdoms/wetlands.cpp b/src/scripts/eastern_kingdoms/wetlands.cpp index 3c3c4662abb..a7a4b247da9 100644 --- a/src/scripts/eastern_kingdoms/wetlands.cpp +++ b/src/scripts/eastern_kingdoms/wetlands.cpp @@ -43,7 +43,7 @@ enum eTapokeSlim NPC_TAPOKE_SLIM_JAHN = 4962 }; -struct TRINITY_DLL_DECL npc_tapoke_slim_jahnAI : public npc_escortAI +struct npc_tapoke_slim_jahnAI : public npc_escortAI { npc_tapoke_slim_jahnAI(Creature* pCreature) : npc_escortAI(pCreature) { } diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp index 825059efd67..7090fc8ddb5 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp @@ -57,7 +57,7 @@ EndScriptData */ #define SE_LOC_Y_MAX 1435 #define SE_LOC_Y_MIN 1370 -struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI +struct boss_akilzonAI : public ScriptedAI { boss_akilzonAI(Creature *c) : ScriptedAI(c) { @@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI +struct mob_soaring_eagleAI : public ScriptedAI { mob_soaring_eagleAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp index d7f795275b9..809de7631d3 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp @@ -71,7 +71,7 @@ enum PhaseHalazzi PHASE_ENRAGE = 5 }; -struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI +struct boss_halazziAI : public ScriptedAI { boss_halazziAI(Creature *c) : ScriptedAI(c) { @@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI // Spirits Lynx AI -struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI +struct boss_spiritlynxAI : public ScriptedAI { boss_spiritlynxAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp index 51898b2dc19..dee092536a9 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp @@ -173,7 +173,7 @@ static PlayerAbilityStruct PlayerAbility[][3] = {SPELL_DR_MOONFIRE, ABILITY_TARGET_ENEMY, 8000}} }; -struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI +struct boss_hexlord_addAI : public ScriptedAI { ScriptedInstance* pInstance; @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI +struct boss_hex_lord_malacrassAI : public ScriptedAI { boss_hex_lord_malacrassAI(Creature *c) : ScriptedAI(c) { @@ -461,7 +461,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI #define SPELL_BLOODLUST 43578 #define SPELL_CLEAVE 15496 -struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI +struct boss_thurgAI : public boss_hexlord_addAI { boss_thurgAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -506,7 +506,7 @@ struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI #define SPELL_FLASH_HEAL 43575 #define SPELL_DISPEL_MAGIC 43577 -struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI +struct boss_alyson_antilleAI : public boss_hexlord_addAI { //Holy Priest boss_alyson_antilleAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -591,7 +591,7 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI #define SPELL_FIREBOLT 43584 -struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI +struct boss_gazakrothAI : public boss_hexlord_addAI { boss_gazakrothAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -636,7 +636,7 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI #define SPELL_FLAME_BREATH 43582 #define SPELL_THUNDERCLAP 43583 -struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI +struct boss_lord_raadanAI : public boss_hexlord_addAI { boss_lord_raadanAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -674,7 +674,7 @@ struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI #define SPELL_PSYCHIC_WAIL 43590 -struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI +struct boss_darkheartAI : public boss_hexlord_addAI { boss_darkheartAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -702,7 +702,7 @@ struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI #define SPELL_VENOM_SPIT 43579 -struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI +struct boss_slitherAI : public boss_hexlord_addAI { boss_slitherAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -748,7 +748,7 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI //Fenstalker #define SPELL_VOLATILE_INFECTION 43586 -struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI +struct boss_fenstalkerAI : public boss_hexlord_addAI { boss_fenstalkerAI(Creature *c) : boss_hexlord_addAI(c) {} @@ -780,7 +780,7 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI #define SPELL_COLD_STARE 43593 #define SPELL_MIGHTY_BLOW 43592 -struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI +struct boss_koraggAI : public boss_hexlord_addAI { boss_koraggAI(Creature *c) : boss_hexlord_addAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp index 905fd45d420..8546deb5237 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp @@ -100,7 +100,7 @@ float hatcherway[2][5][3] = } }; -struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI +struct boss_janalaiAI : public ScriptedAI { boss_janalaiAI(Creature *c) : ScriptedAI(c) { @@ -434,7 +434,7 @@ CreatureAI* GetAI_boss_janalaiAI(Creature* pCreature) return new boss_janalaiAI(pCreature); } -struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI +struct mob_janalai_firebombAI : public ScriptedAI { mob_janalai_firebombAI(Creature *c) : ScriptedAI(c){} @@ -460,7 +460,7 @@ CreatureAI* GetAI_mob_janalai_firebombAI(Creature* pCreature) return new mob_janalai_firebombAI(pCreature); } -struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI +struct mob_amanishi_hatcherAI : public ScriptedAI { mob_amanishi_hatcherAI(Creature *c) : ScriptedAI(c) { @@ -583,7 +583,7 @@ CreatureAI* GetAI_mob_amanishi_hatcherAI(Creature* pCreature) return new mob_amanishi_hatcherAI(pCreature); } -struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI +struct mob_hatchlingAI : public ScriptedAI { mob_hatchlingAI(Creature *c) : ScriptedAI(c) { @@ -632,7 +632,7 @@ CreatureAI* GetAI_mob_hatchlingAI(Creature* pCreature) return new mob_hatchlingAI(pCreature); } -struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI +struct mob_eggAI : public ScriptedAI { mob_eggAI(Creature *c) : ScriptedAI(c){} void Reset() {} diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp index a694ba8d346..4662ee6253e 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp @@ -88,7 +88,7 @@ float NalorakkWay[8][3] = #define YELL_SHIFTEDTOBEAR "You call on da beast, you gonna get more dan you bargain for!" #define SOUND_YELL_TOBEAR 12072 -struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI +struct boss_nalorakkAI : public ScriptedAI { boss_nalorakkAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp index 1f559a9b359..2d374a63e50 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp @@ -138,7 +138,7 @@ static TransformStruct Transform[] = {SOUND_TRANSFORM_TO_DRAGONHAWK, YELL_TRANSFORM_TO_DRAGONHAWK, SPELL_SHAPE_OF_THE_DRAGONHAWK, SPELL_SHAPE_OF_THE_LYNX} }; -struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI +struct boss_zuljinAI : public ScriptedAI { boss_zuljinAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { @@ -580,7 +580,7 @@ CreatureAI* GetAI_boss_zuljin(Creature* pCreature) return new boss_zuljinAI (pCreature); } -struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI +struct feather_vortexAI : public ScriptedAI { feather_vortexAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp index e21f7c6f31c..a06c30637c8 100644 --- a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp @@ -49,7 +49,7 @@ static SHostageInfo HostageInfo[] = }; -struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance +struct instance_zulaman : public ScriptedInstance { instance_zulaman(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp index c1dbccfa3f3..a7476bb6595 100644 --- a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp @@ -36,7 +36,7 @@ EndContentData */ #define SPELL_PUSH_MOJO 43923 #define ENTRY_FOREST_FROG 24396 -struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI +struct npc_forest_frogAI : public ScriptedAI { npc_forest_frogAI(Creature* c) : ScriptedAI(c) { @@ -105,7 +105,7 @@ CreatureAI* GetAI_npc_forest_frog(Creature* pCreature) static uint32 HostageEntry[] = {23790, 23999, 24024, 24001}; static uint32 ChestEntry[] = {186648, 187021, 186672, 186667}; -struct TRINITY_DLL_DECL npc_zulaman_hostageAI : public ScriptedAI +struct npc_zulaman_hostageAI : public ScriptedAI { npc_zulaman_hostageAI(Creature *c) : ScriptedAI(c) {IsLoot = false;} bool IsLoot; diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp index 7cea97bb7c2..27130cf8350 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -57,7 +57,7 @@ enum eEnums NPC_ZULIAN_PROWLER = 15101 }; -struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI +struct boss_arlokkAI : public ScriptedAI { boss_arlokkAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp index d0bae61187b..cd3a6b47560 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_MASSIVEGEYSER 22421 //Not working. Cause its a summon... #define SPELL_SLAM 24326 -struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI +struct boss_gahzrankaAI : public ScriptedAI { boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {} uint32 Frostbreath_Timer; diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp index 110a66e1c3c..e53e05d4682 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_AVARTAR 24646 //The Enrage Spell #define SPELL_GROUNDTREMOR 6524 -struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI +struct boss_grilekAI : public ScriptedAI { boss_grilekAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp index 718b5c4936c..134a081b95b 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp @@ -42,7 +42,7 @@ EndScriptData */ #define SPELL_ASPECT_OF_THEKAL 24689 #define SPELL_ASPECT_OF_ARLOKK 24690 -struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI +struct boss_hakkarAI : public ScriptedAI { boss_hakkarAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp index 6e6debe7b19..820bd875b3c 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_MANABURN 26046 #define SPELL_SLEEP 24664 -struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI +struct boss_hazzarahAI : public ScriptedAI { boss_hazzarahAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp index 8b1cc05083a..3a0302efebd 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_BOMB 40332 //Wrong ID but Magmadars bomb is not working... -struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI +struct boss_jeklikAI : public ScriptedAI { boss_jeklikAI(Creature *c) : ScriptedAI(c) { @@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI }; //Flying Bat -struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI +struct mob_batriderAI : public ScriptedAI { mob_batriderAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp index b4454225fa7..5673fbfc4a8 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp @@ -39,7 +39,7 @@ EndScriptData */ #define SPELL_SHADOWSHOCK 19460 #define SPELL_INVISIBLE 24699 -struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI +struct boss_jindoAI : public ScriptedAI { boss_jindoAI(Creature *c) : ScriptedAI(c) {} @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI }; //Healing Ward -struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI +struct mob_healing_wardAI : public ScriptedAI { mob_healing_wardAI(Creature *c) : ScriptedAI(c) { @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI }; //Shade of Jindo -struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI +struct mob_shade_of_jindoAI : public ScriptedAI { mob_shade_of_jindoAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index 66e800e1b37..0f8a3d515f3 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -42,7 +42,7 @@ EndScriptData */ //Ohgans Spells #define SPELL_SUNDERARMOR 24317 -struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI +struct boss_mandokirAI : public ScriptedAI { boss_mandokirAI(Creature *c) : ScriptedAI(c) { @@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI }; //Ohgan -struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI +struct mob_ohganAI : public ScriptedAI { mob_ohganAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp index e4b12ffb972..ff57c3c8b1d 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp @@ -38,7 +38,7 @@ EndScriptData */ //The Spider Spells #define SPELL_LEVELUP 24312 //Not right Spell. -struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI +struct boss_marliAI : public ScriptedAI { boss_marliAI(Creature *c) : ScriptedAI(c) { @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI }; //Spawn of Marli -struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI +struct mob_spawn_of_marliAI : public ScriptedAI { mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp index dc1653d04ee..1bc15936035 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define EQUIP_ID_MAIN_HAND 0 //was item display id 31818, but this id does not exist -struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI +struct boss_renatakiAI : public ScriptedAI { boss_renatakiAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp index e7002673cd3..85a03475569 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp @@ -50,7 +50,7 @@ EndScriptData */ #define SPELL_KICK 15614 #define SPELL_BLIND 21060 -struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI +struct boss_thekalAI : public ScriptedAI { boss_thekalAI(Creature *c) : ScriptedAI(c) { @@ -243,7 +243,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI }; //Zealot Lor'Khan -struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI +struct mob_zealot_lorkhanAI : public ScriptedAI { mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c) { @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI }; //Zealot Zath -struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI +struct mob_zealot_zathAI : public ScriptedAI { mob_zealot_zathAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp index 3b094b74b1e..bcfa15d97af 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp @@ -37,7 +37,7 @@ EndScriptData */ #define SPELL_BERSERK 23537 #define SPELL_DISPELL 23859 -struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI +struct boss_venoxisAI : public ScriptedAI { boss_venoxisAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp index e3752f60304..c9fc61394b5 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_LIGHTNINGCLOUD 25033 #define SPELL_LIGHTNINGWAVE 24819 -struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI +struct boss_wushoolayAI : public ScriptedAI { boss_wushoolayAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp b/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp index 347e478f55e..aaed1c6df3a 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "ScriptedPch.h" #include "zulgurub.h" -struct TRINITY_DLL_DECL instance_zulgurub : public ScriptedInstance +struct instance_zulgurub : public ScriptedInstance { instance_zulgurub(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/examples/example_creature.cpp b/src/scripts/examples/example_creature.cpp index 65dcdb43a78..3bce98e30ea 100644 --- a/src/scripts/examples/example_creature.cpp +++ b/src/scripts/examples/example_creature.cpp @@ -66,7 +66,7 @@ enum eEnums //List of gossip item texts. Items will appear in the gossip window. #define GOSSIP_ITEM "I'm looking for a fight" -struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI +struct example_creatureAI : public ScriptedAI { //*** HANDLED FUNCTION *** //This is the constructor, called only once when the Creature is first created diff --git a/src/scripts/examples/example_escort.cpp b/src/scripts/examples/example_escort.cpp index d5d6d2e59ee..bf0241eaeb5 100644 --- a/src/scripts/examples/example_escort.cpp +++ b/src/scripts/examples/example_escort.cpp @@ -50,7 +50,7 @@ enum eEnums #define GOSSIP_ITEM_2 "Click to Test Escort(NoAttack, Walk)" #define GOSSIP_ITEM_3 "Click to Test Escort(NoAttack, Run)" -struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI +struct example_escortAI : public npc_escortAI { // CreatureAI functions example_escortAI(Creature* pCreature) : npc_escortAI(pCreature) { } diff --git a/src/scripts/kalimdor/ashenvale.cpp b/src/scripts/kalimdor/ashenvale.cpp index 6b7061d9f09..961600ba91d 100644 --- a/src/scripts/kalimdor/ashenvale.cpp +++ b/src/scripts/kalimdor/ashenvale.cpp @@ -49,7 +49,7 @@ EndContentData */ #define ENTRY_SILVERWING_SENTINEL 12896 #define ENTRY_SILVERWING_WARRIOR 12897 -struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI +struct npc_torekAI : public npc_escortAI { npc_torekAI(Creature *c) : npc_escortAI(c) {} @@ -131,7 +131,7 @@ bool QuestAccept_npc_torek(Player* pPlayer, Creature* pCreature, Quest const* qu { if (quest->GetQuestId() == QUEST_TOREK_ASSULT) { - //TODO: find companions, make them follow Torek, at any time (possibly done by mangos/database in future?) + //TODO: find companions, make them follow Torek, at any time (possibly done by core/database in future?) DoScriptText(SAY_READY, pCreature, pPlayer); pCreature->setFaction(113); @@ -154,7 +154,7 @@ CreatureAI* GetAI_npc_torek(Creature* pCreature) #define QUEST_FREEDOM_TO_RUUL 6482 #define GO_CAGE 178147 -struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI +struct npc_ruul_snowhoofAI : public npc_escortAI { npc_ruul_snowhoofAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/kalimdor/azshara.cpp b/src/scripts/kalimdor/azshara.cpp index 66df7c8d779..df6a67ed279 100644 --- a/src/scripts/kalimdor/azshara.cpp +++ b/src/scripts/kalimdor/azshara.cpp @@ -36,7 +36,7 @@ EndContentData */ ## mobs_spitelashes ######*/ -struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI +struct mobs_spitelashesAI : public ScriptedAI { mobs_spitelashesAI(Creature *c) : ScriptedAI(c) {} @@ -242,7 +242,7 @@ float WPs[58][4] = {1873.57, -3695.32, 33.9118, 3.44} }; -struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI +struct mob_rizzle_sprysprocketAI : public ScriptedAI { mob_rizzle_sprysprocketAI(Creature *c) : ScriptedAI(c) {} @@ -432,7 +432,7 @@ CreatureAI* GetAI_mob_rizzle_sprysprocket(Creature* pCreature) # mob_depth_charge ####*/ -struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI +struct mob_depth_chargeAI : public ScriptedAI { mob_depth_chargeAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/azuremyst_isle.cpp b/src/scripts/kalimdor/azuremyst_isle.cpp index 0cc35d8fb25..bcbdfaa8760 100644 --- a/src/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/scripts/kalimdor/azuremyst_isle.cpp @@ -56,7 +56,7 @@ enum eEnums SPELL_STUNNED = 28630 }; -struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI +struct npc_draenei_survivorAI : public ScriptedAI { npc_draenei_survivorAI(Creature *c) : ScriptedAI(c) {} @@ -181,7 +181,7 @@ enum eOvergrind #define GOSSIP_FIGHT "Traitor! You will be brought to justice!" -struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI +struct npc_engineer_spark_overgrindAI : public ScriptedAI { npc_engineer_spark_overgrindAI(Creature *c) : ScriptedAI(c) { @@ -272,7 +272,7 @@ bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreat ## npc_injured_draenei ######*/ -struct TRINITY_DLL_DECL npc_injured_draeneiAI : public ScriptedAI +struct npc_injured_draeneiAI : public ScriptedAI { npc_injured_draeneiAI(Creature *c) : ScriptedAI(c) {} @@ -321,7 +321,7 @@ enum eMagwin QUEST_A_CRY_FOR_SAY_HELP = 9528 }; -struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI +struct npc_magwinAI : public npc_escortAI { npc_magwinAI(Creature *c) : npc_escortAI(c) {} @@ -401,7 +401,7 @@ enum eGeezle static float SparkPos[3] = {-5029.91, -11291.79, 8.096}; -struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI +struct npc_geezleAI : public ScriptedAI { npc_geezleAI(Creature *c) : ScriptedAI(c) {} @@ -545,7 +545,7 @@ enum eOwlkin ENTRY_OWLKIN_INOC = 16534 }; -struct TRINITY_DLL_DECL npc_nestlewood_owlkinAI : public ScriptedAI +struct npc_nestlewood_owlkinAI : public ScriptedAI { npc_nestlewood_owlkinAI(Creature *c) : ScriptedAI(c) {} @@ -625,7 +625,7 @@ bool go_ravager_cage(Player* pPlayer, GameObject* pGo) return true ; } -struct TRINITY_DLL_DECL npc_death_ravagerAI : public ScriptedAI +struct npc_death_ravagerAI : public ScriptedAI { npc_death_ravagerAI(Creature *c) : ScriptedAI(c){} diff --git a/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp b/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp index d7fd62baa97..3df3451c5bb 100644 --- a/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp @@ -54,7 +54,7 @@ bool GoHello_blackfathom_fire(Player *pPlayer, GameObject* pGo) return false; } -struct TRINITY_DLL_DECL npc_blackfathom_deeps_eventAI : public ScriptedAI +struct npc_blackfathom_deeps_eventAI : public ScriptedAI { npc_blackfathom_deeps_eventAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -176,7 +176,7 @@ enum eMorridune SAY_MORRIDUNE_2 = -1048004 }; -struct TRINITY_DLL_DECL npc_morriduneAI : public npc_escortAI +struct npc_morriduneAI : public npc_escortAI { npc_morriduneAI(Creature* pCreature) : npc_escortAI(pCreature) { diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp b/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp index e0cc5da648d..634f84ae6a3 100644 --- a/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp @@ -25,7 +25,7 @@ enum Spells SPELL_FRENZIED_RAGE = 3490 }; -struct TRINITY_DLL_DECL boss_aku_maiAI : public ScriptedAI +struct boss_aku_maiAI : public ScriptedAI { boss_aku_maiAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp b/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp index 439f0c30f25..8b3de327a12 100644 --- a/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp @@ -24,7 +24,7 @@ enum Spells SPELL_NET = 6533 }; -struct TRINITY_DLL_DECL boss_gelihastAI : public ScriptedAI +struct boss_gelihastAI : public ScriptedAI { boss_gelihastAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp b/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp index fa40ceff795..4578d4ba0e2 100644 --- a/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp @@ -33,7 +33,7 @@ enum Yells SAY_DEATH = -1048000 }; -struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI +struct boss_kelrisAI : public ScriptedAI { boss_kelrisAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp b/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp index 2cf6b2315e0..0300b0737ce 100644 --- a/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp +++ b/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp @@ -49,7 +49,7 @@ const Position SpawnsLocation[] = {-863.895, -458.899, -33.891, 5.637} }; -struct TRINITY_DLL_DECL instance_blackfathom_deeps : public ScriptedInstance +struct instance_blackfathom_deeps : public ScriptedInstance { instance_blackfathom_deeps(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/bloodmyst_isle.cpp b/src/scripts/kalimdor/bloodmyst_isle.cpp index d8cf37a3d79..f0a41a1e954 100644 --- a/src/scripts/kalimdor/bloodmyst_isle.cpp +++ b/src/scripts/kalimdor/bloodmyst_isle.cpp @@ -35,7 +35,7 @@ EndContentData */ //possible creatures to be spawned const uint32 possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327}; -struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI +struct mob_webbed_creatureAI : public ScriptedAI { mob_webbed_creatureAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/boss_azuregos.cpp b/src/scripts/kalimdor/boss_azuregos.cpp index 624dc6b1491..94af33c83be 100644 --- a/src/scripts/kalimdor/boss_azuregos.cpp +++ b/src/scripts/kalimdor/boss_azuregos.cpp @@ -33,7 +33,7 @@ EndScriptData */ #define SPELL_CLEAVE 8255 //Perhaps not right ID #define SPELL_ENRAGE 23537 -struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI +struct boss_azuregosAI : public ScriptedAI { boss_azuregosAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp index 103631ef348..7cde29ee855 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp @@ -56,7 +56,7 @@ enum CombatPhases COMBAT }; -struct TRINITY_DLL_DECL boss_epochAI : public ScriptedAI +struct boss_epochAI : public ScriptedAI { boss_epochAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp index 122121cf123..6691b8fd2b0 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp @@ -25,7 +25,7 @@ enum Spells SPELL_VOID_STRIKE = 60590 }; -struct TRINITY_DLL_DECL boss_infiniteAI : public ScriptedAI +struct boss_infiniteAI : public ScriptedAI { boss_infiniteAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp index 86fbc90ccf7..0c4f7dbdaca 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp @@ -69,7 +69,7 @@ enum CombatPhases OUTRO }; -struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI +struct boss_mal_ganisAI : public ScriptedAI { boss_mal_ganisAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index fc24ab837d7..597a4159fa8 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -46,7 +46,7 @@ enum Yells SAY_DEATH = -1595031 }; -struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI +struct boss_meathookAI : public ScriptedAI { boss_meathookAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index ffa6e41a130..ae8a9f0fe52 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -59,7 +59,7 @@ enum Yells SAY_SUMMON_GHOULS_2 = -1595044 }; -struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI +struct boss_salrammAI : public ScriptedAI { boss_salrammAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp index 661756ebe17..685af07cf2f 100644 --- a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp +++ b/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp @@ -29,7 +29,7 @@ 4 - Infinite Corruptor (Heroic only) */ -struct TRINITY_DLL_DECL instance_culling_of_stratholme : public ScriptedInstance +struct instance_culling_of_stratholme : public ScriptedInstance { instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp index 233719da11d..b918f4ed00f 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -41,7 +41,7 @@ enum eEnums H_SPELL_SAND_BREATH = 39049 }; -struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI +struct boss_aeonusAI : public ScriptedAI { boss_aeonusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index c58f6f85d61..9fdca97475e 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -41,7 +41,7 @@ enum eEnums SPELL_ATTRACTION = 38540 //Not Implemented (Heroic mode) }; -struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI +struct boss_chrono_lord_dejaAI : public ScriptedAI { boss_chrono_lord_dejaAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp index 4bab9fcae30..9ae361f394e 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp @@ -40,7 +40,7 @@ enum eEnums SPELL_REFLECT = 38592 //Not Implemented (Heroic mod) }; -struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI +struct boss_temporusAI : public ScriptedAI { boss_temporusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp index a9846b3b87a..2efed11fcf8 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp @@ -54,7 +54,7 @@ EndContentData */ #define C_COUNCIL_ENFORCER 17023 -struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI +struct npc_medivh_bmAI : public ScriptedAI { npc_medivh_bmAI(Creature *c) : ScriptedAI(c) { @@ -240,7 +240,7 @@ static Wave PortalWaves[]= {C_EXECU, C_VANQU, C_CHRON, C_ASSAS} }; -struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI +struct npc_time_riftAI : public ScriptedAI { npc_time_riftAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp index 9d8cb34706f..d6b85409e1a 100644 --- a/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -59,7 +59,7 @@ static Wave RiftWaves[]= {C_AEONUS, 0} }; -struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance +struct instance_dark_portal : public ScriptedInstance { instance_dark_portal(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp index 4ad13500434..82a89faacce 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp @@ -36,7 +36,7 @@ #define SAY_ONAGGRO "You are defenders of a doomed world! Flee here, and perhaps you will prolong your pathetic lives!" #define SOUND_ONAGGRO 10977 -struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI +struct boss_anetheronAI : public hyjal_trashAI { boss_anetheronAI(Creature *c) : hyjal_trashAI(c) { @@ -219,7 +219,7 @@ CreatureAI* GetAI_boss_anetheron(Creature* pCreature) #define SPELL_IMMOLATION 31303 #define SPELL_INFERNO_EFFECT 31302 -struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI +struct mob_towering_infernalAI : public ScriptedAI { mob_towering_infernalAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp index 7510e337968..30aeaceffc1 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp @@ -116,7 +116,7 @@ struct mob_ancient_wispAI : public ScriptedAI /* This script is merely a placeholder for the Doomfire that triggers Doomfire spell. It will MoveChase the Doomfire Spirit always, until despawn (AttackStart is called upon it's spawn) */ -struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI +struct mob_doomfireAI : public ScriptedAI { mob_doomfireAI(Creature* c) : ScriptedAI(c) {} @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI /* This is the script for the Doomfire Spirit Mob. This mob simply follow players or travels in random directions if pTarget cannot be found. */ -struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI +struct mob_doomfire_targettingAI : public ScriptedAI { mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) {} @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI For Doomfire, we summon a mob (Doomfire Spirit) for the Doomfire mob to follow. It's spirit will randomly select it's pTarget to follow and then we create the random movement making it unpredictable. */ -struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI +struct boss_archimondeAI : public hyjal_trashAI { boss_archimondeAI(Creature *c) : hyjal_trashAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp index cbc500c0909..259e92c3cc4 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp @@ -27,7 +27,7 @@ #define SAY_ONAGGRO "Abandon all hope! The legion has returned to finish what was begun so many years ago. This time there will be no escape!" #define SOUND_ONAGGRO 10999 -struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI +struct boss_azgalorAI : public hyjal_trashAI { boss_azgalorAI(Creature *c) : hyjal_trashAI(c) { @@ -183,7 +183,7 @@ CreatureAI* GetAI_boss_azgalor(Creature* pCreature) #define SPELL_CRIPPLE 31406 #define SPELL_WARSTOMP 31408 -struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI +struct mob_lesser_doomguardAI : public hyjal_trashAI { mob_lesser_doomguardAI(Creature *c) : hyjal_trashAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp index 1c5b34bfd72..a5c0f27fade 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -24,7 +24,7 @@ #define SAY_ONAGGRO "Cry for mercy! Your meaningless lives will soon be forfeit." #define SOUND_ONAGGRO 11015 -struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI +struct boss_kazrogalAI : public hyjal_trashAI { boss_kazrogalAI(Creature *c) : hyjal_trashAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp index b4ef2447f1d..2e74c701f23 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp @@ -30,7 +30,7 @@ #define SAY_ONAGGRO "The Legion's final conquest has begun! Once again the subjugation of this world is within our grasp. Let none survive!" #define SOUND_ONAGGRO 11022 -struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI +struct boss_rage_winterchillAI : public hyjal_trashAI { boss_rage_winterchillAI(Creature *c) : hyjal_trashAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h index 4aeda071999..05c992f434a 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h @@ -153,7 +153,7 @@ static Yells ThrallQuotes[]= {DEATH, -1534017}, }; -struct TRINITY_DLL_DECL hyjalAI : public npc_escortAI +struct hyjalAI : public npc_escortAI { hyjalAI(Creature *c); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp index 8c0710997d1..b485ff26998 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp @@ -1326,7 +1326,7 @@ CreatureAI* GetAI_mob_gargoyle(Creature* pCreature) #define SPELL_EXPLODING_SHOT 7896 -struct TRINITY_DLL_DECL alliance_riflemanAI : public Scripted_NoMovementAI +struct alliance_riflemanAI : public Scripted_NoMovementAI { alliance_riflemanAI(Creature *c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h index 9397243834f..bd9f64417fc 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h @@ -7,7 +7,7 @@ #define MINRAIDDAMAGE 700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies -struct TRINITY_DLL_DECL hyjal_trashAI : public npc_escortAI +struct hyjal_trashAI : public npc_escortAI { hyjal_trashAI(Creature *c); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp index 265a6d02258..163a530bede 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp @@ -39,7 +39,7 @@ enum eEnums 4 - Archimonde event */ -struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance +struct instance_mount_hyjal : public ScriptedInstance { instance_mount_hyjal(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index 336a26d1f21..645614e8d23 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define SPELL_DEVOTION_AURA 8258 #define SPELL_CONSECRATION 38385 -struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI +struct boss_captain_skarlocAI : public ScriptedAI { boss_captain_skarlocAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index 3f126805b5f..c7a1bc34f72 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_MAGIC_DISRUPTION_AURA 33834 #define SPELL_WING_BUFFET 31475 -struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI +struct boss_epoch_hunterAI : public ScriptedAI { boss_epoch_hunterAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index 2a6a27411b9..ee6860b1858 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -90,7 +90,7 @@ static Location DrakeWP[]= {18, 2128.20, 70.9763, 64.4221} }; -struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI +struct boss_lieutenant_drakeAI : public ScriptedAI { boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index 625743ab0e6..2c36f377b29 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define QUEST_ENTRY_DIVERSION 10283 #define LODGE_QUEST_TRIGGER 20155 -struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance +struct instance_old_hillsbrad : public ScriptedInstance { instance_old_hillsbrad(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 5dd9a77f768..3e71ba5bd8f 100644 --- a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -178,7 +178,7 @@ bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 uiSen #define GOSSIP_ITEM_WALKING "[PH] Start walking." -struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI +struct npc_thrall_old_hillsbradAI : public npc_escortAI { npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) { @@ -553,7 +553,7 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, #define GOSSIP_ID_EPOCH2 9613 //Yes, friends. This man was no wizard of #define GOSSIP_ITEM_EPOCH2 "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away." -struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI +struct npc_tarethaAI : public npc_escortAI { npc_tarethaAI(Creature *c) : npc_escortAI(c) { diff --git a/src/scripts/kalimdor/darkshore.cpp b/src/scripts/kalimdor/darkshore.cpp index c8bfd0d2bfb..5fbb554f546 100644 --- a/src/scripts/kalimdor/darkshore.cpp +++ b/src/scripts/kalimdor/darkshore.cpp @@ -63,7 +63,7 @@ enum eKerlonian }; //TODO: make concept similar as "ringo" -escort. Find a way to run the scripted attacks, _if_ player are choosing road. -struct TRINITY_DLL_DECL npc_kerlonianAI : public FollowerAI +struct npc_kerlonianAI : public FollowerAI { npc_kerlonianAI(Creature* pCreature) : FollowerAI(pCreature) { } @@ -195,7 +195,7 @@ enum eRemtravel NPC_GRAVEL_GEO = 2160 }; -struct TRINITY_DLL_DECL npc_prospector_remtravelAI : public npc_escortAI +struct npc_prospector_remtravelAI : public npc_escortAI { npc_prospector_remtravelAI(Creature* pCreature) : npc_escortAI(pCreature) {} @@ -310,7 +310,7 @@ enum eThreshwackonator #define GOSSIP_ITEM_INSERT_KEY "[PH] Insert key" -struct TRINITY_DLL_DECL npc_threshwackonatorAI : public FollowerAI +struct npc_threshwackonatorAI : public FollowerAI { npc_threshwackonatorAI(Creature* pCreature) : FollowerAI(pCreature) { } diff --git a/src/scripts/kalimdor/desolace.cpp b/src/scripts/kalimdor/desolace.cpp index 0c91cba01d3..920542d9167 100644 --- a/src/scripts/kalimdor/desolace.cpp +++ b/src/scripts/kalimdor/desolace.cpp @@ -49,7 +49,7 @@ enum eDyingKodo }; -struct TRINITY_DLL_DECL npc_aged_dying_ancient_kodoAI : public ScriptedAI +struct npc_aged_dying_ancient_kodoAI : public ScriptedAI { npc_aged_dying_ancient_kodoAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } diff --git a/src/scripts/kalimdor/dustwallow_marsh.cpp b/src/scripts/kalimdor/dustwallow_marsh.cpp index d5e122f30e3..8caecc70ab1 100644 --- a/src/scripts/kalimdor/dustwallow_marsh.cpp +++ b/src/scripts/kalimdor/dustwallow_marsh.cpp @@ -50,7 +50,7 @@ enum eHuskSpirit NPC_RESTLESS_APPARITION = 23861 }; -struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI +struct mobs_risen_husk_spiritAI : public ScriptedAI { mobs_risen_husk_spiritAI(Creature *c) : ScriptedAI(c) {} @@ -118,7 +118,7 @@ enum eRestlessApparition SAY_RESTLESS_3 = -1000471 }; -struct TRINITY_DLL_DECL npc_restless_apparitionAI : public ScriptedAI +struct npc_restless_apparitionAI : public ScriptedAI { npc_restless_apparitionAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -143,7 +143,7 @@ enum eAgitator FACTION_THER_DESERTER = 1883 }; -struct TRINITY_DLL_DECL npc_deserter_agitatorAI : public ScriptedAI +struct npc_deserter_agitatorAI : public ScriptedAI { npc_deserter_agitatorAI(Creature* pCreature) : ScriptedAI(pCreature) { } @@ -261,7 +261,7 @@ enum eHendel }; //TODO: develop this further, end event not created -struct TRINITY_DLL_DECL npc_private_hendelAI : public ScriptedAI +struct npc_private_hendelAI : public ScriptedAI { npc_private_hendelAI(Creature* pCreature) : ScriptedAI(pCreature) { } @@ -321,7 +321,7 @@ enum eZelfrax SAY_ZELFRAX_2 = -1000473 }; -struct TRINITY_DLL_DECL npc_zelfraxAI : public ScriptedAI +struct npc_zelfraxAI : public ScriptedAI { npc_zelfraxAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/kalimdor/feralas.cpp b/src/scripts/kalimdor/feralas.cpp index fc9b7a0a627..fb180552944 100644 --- a/src/scripts/kalimdor/feralas.cpp +++ b/src/scripts/kalimdor/feralas.cpp @@ -79,7 +79,7 @@ enum eOOX FACTION_ESCORTEE_H = 775 }; -struct TRINITY_DLL_DECL npc_oox22feAI : public npc_escortAI +struct npc_oox22feAI : public npc_escortAI { npc_oox22feAI(Creature* pCreature) : npc_escortAI(pCreature) { } diff --git a/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp b/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp index de9033e7910..83c62b7085f 100644 --- a/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp +++ b/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_ENTANGLINGROOTS 12747 #define SPELL_CORRUPT_FORCES 21968 -struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI +struct celebras_the_cursedAI : public ScriptedAI { celebras_the_cursedAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/maraudon/boss_landslide.cpp b/src/scripts/kalimdor/maraudon/boss_landslide.cpp index ec6557edb4f..65b00702107 100644 --- a/src/scripts/kalimdor/maraudon/boss_landslide.cpp +++ b/src/scripts/kalimdor/maraudon/boss_landslide.cpp @@ -27,7 +27,7 @@ EndScriptData */ #define SPELL_TRAMPLE 5568 #define SPELL_LANDSLIDE 21808 -struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI +struct boss_landslideAI : public ScriptedAI { boss_landslideAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/maraudon/boss_noxxion.cpp b/src/scripts/kalimdor/maraudon/boss_noxxion.cpp index 9fa9a9079cf..e68eb2928fb 100644 --- a/src/scripts/kalimdor/maraudon/boss_noxxion.cpp +++ b/src/scripts/kalimdor/maraudon/boss_noxxion.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define SPELL_TOXICVOLLEY 21687 #define SPELL_UPPERCUT 22916 -struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI +struct boss_noxxionAI : public ScriptedAI { boss_noxxionAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp b/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp index b1da1c29b5e..79ce7351fa2 100644 --- a/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp +++ b/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define SPELL_THRASH 3391 #define SPELL_REPULSIVEGAZE 21869 -struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI +struct boss_ptheradrasAI : public ScriptedAI { boss_ptheradrasAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/moonglade.cpp b/src/scripts/kalimdor/moonglade.cpp index 782a69a66c0..62b4f4cb743 100644 --- a/src/scripts/kalimdor/moonglade.cpp +++ b/src/scripts/kalimdor/moonglade.cpp @@ -257,7 +257,7 @@ float Clintar_spirit_WP[41][5] = #define CLINTAR_SPIRIT_SAY_GET_THREE -1000291 #define CLINTAR_SPIRIT_SAY_GET_FINAL -1000292 -struct TRINITY_DLL_DECL npc_clintar_spiritAI : public npc_escortAI +struct npc_clintar_spiritAI : public npc_escortAI { public: npc_clintar_spiritAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/kalimdor/mulgore.cpp b/src/scripts/kalimdor/mulgore.cpp index 9f8131d0295..dba0bf46b9b 100644 --- a/src/scripts/kalimdor/mulgore.cpp +++ b/src/scripts/kalimdor/mulgore.cpp @@ -74,7 +74,7 @@ enum eKyleFrenzied POINT_ID = 1 }; -struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI +struct npc_kyle_frenziedAI : public ScriptedAI { npc_kyle_frenziedAI(Creature *c) : ScriptedAI(c) {} @@ -240,7 +240,7 @@ float wp_plain_vision[50][3] = {-1508.68, 366.822, 62.733} }; -struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI +struct npc_plains_visionAI : public ScriptedAI { npc_plains_visionAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp index 99e821367bc..b2d83a76ae2 100644 --- a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp +++ b/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp @@ -62,7 +62,7 @@ static float SpawnLocations[4][3]= {17.372, -190.840, -85.2810}, }; -struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI +struct boss_onyxiaAI : public ScriptedAI { boss_onyxiaAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/orgrimmar.cpp b/src/scripts/kalimdor/orgrimmar.cpp index c84ad06916b..d940c81aa46 100644 --- a/src/scripts/kalimdor/orgrimmar.cpp +++ b/src/scripts/kalimdor/orgrimmar.cpp @@ -74,7 +74,7 @@ enum eShenthul QUEST_SHATTERED_SALUTE = 2460 }; -struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI +struct npc_shenthulAI : public ScriptedAI { npc_shenthulAI(Creature* c) : ScriptedAI(c) {} @@ -172,7 +172,7 @@ bool QuestAccept_npc_shenthul(Player* pPlayer, Creature* pCreature, Quest const* #define GOSSIP_STW6 "Of course, Warchief!" //TODO: verify abilities/timers -struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI +struct npc_thrall_warchiefAI : public ScriptedAI { npc_thrall_warchiefAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp index 71a9831b1ae..fc912474ef7 100644 --- a/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -34,7 +34,7 @@ EndScriptData */ #define SPELL_FROST_NOVA 15531 #define SPELL_FROST_SPECTRES 12642 -struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI +struct boss_amnennar_the_coldbringerAI : public ScriptedAI { boss_amnennar_the_coldbringerAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp index 0c0db440d4d..714141cc0b0 100644 --- a/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp +++ b/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define WARD_KEEPERS_NR 2 -struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance +struct instance_razorfen_kraul : public ScriptedInstance { instance_razorfen_kraul(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp b/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp index 4caace4c30a..e3081bbd757 100644 --- a/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp +++ b/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp @@ -45,7 +45,7 @@ EndContentData */ #define ENTRY_BOAR 4514 #define SPELL_QUILLBOAR_CHANNELING 7083 -struct TRINITY_DLL_DECL npc_willixAI : public npc_escortAI +struct npc_willixAI : public npc_escortAI { npc_willixAI(Creature *c) : npc_escortAI(c) {} @@ -131,7 +131,7 @@ bool QuestAccept_npc_willix(Player* pPlayer, Creature* pCreature, Quest const* q return true; } -struct TRINITY_DLL_DECL npc_deaths_head_ward_keeperAI : public ScriptedAI +struct npc_deaths_head_ward_keeperAI : public ScriptedAI { npc_deaths_head_ward_keeperAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp index 1e391d7a470..f0ce0d41472 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -37,7 +37,7 @@ enum Spells SPELL_PARALYZE = 23414 //doesnt work correct (core) }; -struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI +struct boss_ayamissAI : public ScriptedAI { boss_ayamissAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp index 2fee3eddac6..dff5b0a5585 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp @@ -29,7 +29,7 @@ enum Yells EMOTE_TARGET = -1509002 }; -struct TRINITY_DLL_DECL boss_buruAI : public ScriptedAI +struct boss_buruAI : public ScriptedAI { boss_buruAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index a1dfe702bec..1838a69e4ec 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -34,7 +34,7 @@ enum Spells SPELL_WIDE_SLASH = 25814 }; -struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI +struct boss_kurinnaxxAI : public ScriptedAI { boss_kurinnaxxAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp index 44b343342b1..397b0c7463b 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp @@ -50,7 +50,7 @@ enum CombatPhase STONE }; -struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI +struct boss_moamAI : public ScriptedAI { boss_moamAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp index 63eb8ca655f..70520b11d8b 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp @@ -37,7 +37,7 @@ enum Yells SAY_DEATH = -1509027 }; -struct TRINITY_DLL_DECL boss_ossirianAI : public ScriptedAI +struct boss_ossirianAI : public ScriptedAI { boss_ossirianAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp index c702d1e3648..7c9c01ceaad 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -43,7 +43,7 @@ enum Yells SAY_COMPLETE_QUEST = -1509017 //Yell when realm complete quest 8743 for world event }; -struct TRINITY_DLL_DECL boss_rajaxxAI : public ScriptedAI +struct boss_rajaxxAI : public ScriptedAI { boss_rajaxxAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp index eb9bb86363d..fdc2215c670 100644 --- a/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp @@ -34,7 +34,7 @@ EndScriptData */ 4 - Ayamiss the Hunter 5 - Ossirian the Unscarred */ -struct TRINITY_DLL_DECL instance_ruins_of_ahn_qiraj : public ScriptedInstance +struct instance_ruins_of_ahn_qiraj : public ScriptedInstance { instance_ruins_of_ahn_qiraj(Map* pMap) : ScriptedInstance(pMap) { Initialize(); } diff --git a/src/scripts/kalimdor/silithus.cpp b/src/scripts/kalimdor/silithus.cpp index cc8d0d757ea..2637543637d 100644 --- a/src/scripts/kalimdor/silithus.cpp +++ b/src/scripts/kalimdor/silithus.cpp @@ -466,7 +466,7 @@ static SpawnSpells SpawnCast[]=// /*##### # npc_anachronos_the_ancient ######*/ -struct TRINITY_DLL_DECL npc_anachronos_the_ancientAI : public ScriptedAI +struct npc_anachronos_the_ancientAI : public ScriptedAI { npc_anachronos_the_ancientAI(Creature* c) : ScriptedAI(c) {} @@ -775,7 +775,7 @@ struct TRINITY_DLL_DECL npc_anachronos_the_ancientAI : public ScriptedAI # mob_qiraj_war_spawn ######*/ -struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI +struct mob_qiraj_war_spawnAI : public ScriptedAI { mob_qiraj_war_spawnAI(Creature* c) : ScriptedAI(c) {} @@ -878,7 +878,7 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI # npc_anachronos_quest_trigger #####*/ -struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI +struct npc_anachronos_quest_triggerAI : public ScriptedAI { npc_anachronos_quest_triggerAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/stonetalon_mountains.cpp b/src/scripts/kalimdor/stonetalon_mountains.cpp index 7b8e16c8f55..3e97dea14c6 100644 --- a/src/scripts/kalimdor/stonetalon_mountains.cpp +++ b/src/scripts/kalimdor/stonetalon_mountains.cpp @@ -95,7 +95,7 @@ enum eKaya QUEST_PROTECT_KAYA = 6523 }; -struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI +struct npc_kaya_flathoofAI : public npc_escortAI { npc_kaya_flathoofAI(Creature* c) : npc_escortAI(c) {} diff --git a/src/scripts/kalimdor/tanaris.cpp b/src/scripts/kalimdor/tanaris.cpp index e9f2d761165..b343b00139f 100644 --- a/src/scripts/kalimdor/tanaris.cpp +++ b/src/scripts/kalimdor/tanaris.cpp @@ -44,7 +44,7 @@ EndContentData */ #define SPELL_AQUA_JET 13586 #define SPELL_FROST_SHOCK 15089 -struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI +struct mob_aquementasAI : public ScriptedAI { mob_aquementasAI(Creature *c) : ScriptedAI(c) {} @@ -148,7 +148,7 @@ CreatureAI* GetAI_mob_aquementas(Creature* pCreature) #define WHISPER_CUSTODIAN_13 -1000162 #define WHISPER_CUSTODIAN_14 -1000163 -struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI +struct npc_custodian_of_timeAI : public npc_escortAI { npc_custodian_of_timeAI(Creature *c) : npc_escortAI(c) {} @@ -357,7 +357,7 @@ enum e00X17 SPAWN_SECOND_2 = 7805 }; -struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI +struct npc_OOX17AI : public npc_escortAI { npc_OOX17AI(Creature *c) : npc_escortAI(c) {} @@ -453,7 +453,7 @@ enum eTooga const float m_afToWaterLoc[] = {-7032.664551, -4906.199219, -1.606446}; -struct TRINITY_DLL_DECL npc_toogaAI : public FollowerAI +struct npc_toogaAI : public FollowerAI { npc_toogaAI(Creature* pCreature) : FollowerAI(pCreature) { } diff --git a/src/scripts/kalimdor/teldrassil.cpp b/src/scripts/kalimdor/teldrassil.cpp index 19cce895e41..7da2a8f8799 100644 --- a/src/scripts/kalimdor/teldrassil.cpp +++ b/src/scripts/kalimdor/teldrassil.cpp @@ -41,7 +41,7 @@ enum eMist FACTION_DARNASSUS = 79 }; -struct TRINITY_DLL_DECL npc_mistAI : public FollowerAI +struct npc_mistAI : public FollowerAI { npc_mistAI(Creature* pCreature) : FollowerAI(pCreature) { } diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp index 32e51f993ce..3167a2f2e92 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define SPELL_HEAL 25807 #define SPELL_FEAR 19408 -struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI +struct boss_kriAI : public ScriptedAI { boss_kriAI(Creature *c) : ScriptedAI(c) { @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI +struct boss_vemAI : public ScriptedAI { boss_vemAI(Creature *c) : ScriptedAI(c) { @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI +struct boss_yaujAI : public ScriptedAI { boss_yaujAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index 633c91dbc2b..3b578e9395a 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -162,7 +162,7 @@ const Position FleshTentaclePos[2] = //Kick out position const Position KickPos = { -8545.0f, 1984.0f, -96.0f}; -struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI +struct eye_of_cthunAI : public Scripted_NoMovementAI { eye_of_cthunAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -452,7 +452,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI +struct cthunAI : public Scripted_NoMovementAI { cthunAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -897,7 +897,7 @@ struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL eye_tentacleAI : public Scripted_NoMovementAI +struct eye_tentacleAI : public Scripted_NoMovementAI { eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -958,7 +958,7 @@ struct TRINITY_DLL_DECL eye_tentacleAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL claw_tentacleAI : public Scripted_NoMovementAI +struct claw_tentacleAI : public Scripted_NoMovementAI { claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -1054,7 +1054,7 @@ struct TRINITY_DLL_DECL claw_tentacleAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL giant_claw_tentacleAI : public Scripted_NoMovementAI +struct giant_claw_tentacleAI : public Scripted_NoMovementAI { giant_claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -1161,7 +1161,7 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL giant_eye_tentacleAI : public Scripted_NoMovementAI +struct giant_eye_tentacleAI : public Scripted_NoMovementAI { giant_eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -1213,7 +1213,7 @@ struct TRINITY_DLL_DECL giant_eye_tentacleAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL flesh_tentacleAI : public Scripted_NoMovementAI +struct flesh_tentacleAI : public Scripted_NoMovementAI { flesh_tentacleAI(Creature *c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp index c64d4f90c70..d01ee456ee5 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp @@ -35,7 +35,7 @@ EndScriptData */ // Enrage for his spawns #define SPELL_ENRAGE 28798 -struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI +struct boss_fankrissAI : public ScriptedAI { boss_fankrissAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp index 9792b4cc265..4a8c93300da 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp @@ -33,7 +33,7 @@ EndScriptData */ #define SPELL_WYVERNSTING 26180 #define SPELL_ACIDSPIT 26050 -struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI +struct boss_huhuranAI : public ScriptedAI { boss_huhuranAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp index d3de7047dd5..7e782836be5 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp @@ -31,7 +31,7 @@ EndScriptData */ #define SPELL_DIRTMOUND_PASSIVE 26092 -struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI +struct boss_ouroAI : public ScriptedAI { boss_ouroAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp index 9082763a6ae..88e6c93ab6e 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define SPELL_WHIRLWINDADD 26038 #define SPELL_KNOCKBACK 26027 -struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI +struct boss_sarturaAI : public ScriptedAI { boss_sarturaAI(Creature *c) : ScriptedAI(c) {} @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI +struct mob_sartura_royal_guardAI : public ScriptedAI { mob_sartura_royal_guardAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp index 72222889c98..7e64259efad 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp @@ -49,7 +49,7 @@ class ov_mycoordinates } }; -struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI +struct boss_skeramAI : public ScriptedAI { boss_skeramAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp index 2e8ff1dcd4e..4949cd5369d 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -57,7 +57,7 @@ EndScriptData */ #define SPELL_BLIZZARD 26607 #define SPELL_ARCANEBURST 568 -struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI +struct boss_twinemperorsAI : public ScriptedAI { boss_twinemperorsAI(Creature *c): ScriptedAI(c) { @@ -384,7 +384,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI +struct boss_veknilashAI : public boss_twinemperorsAI { bool IAmVeklor() {return false;} boss_veknilashAI(Creature *c) : boss_twinemperorsAI(c) {} @@ -458,7 +458,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI } }; -struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI +struct boss_veklorAI : public boss_twinemperorsAI { bool IAmVeklor() {return true;} boss_veklorAI(Creature *c) : boss_twinemperorsAI(c) {} diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index 606e1c9be42..633a209ff77 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "ScriptedPch.h" #include "temple_of_ahnqiraj.h" -struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance +struct instance_temple_of_ahnqiraj : public ScriptedInstance { instance_temple_of_ahnqiraj(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index e829180c730..1c09e7e8eda 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -53,7 +53,7 @@ EndScriptData */ #define SPELL_STORM_BUFF 2148 #define SPELL_STORM 26546 -struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI +struct aqsentinelAI : public ScriptedAI { uint32 ability; int abselected; diff --git a/src/scripts/kalimdor/the_barrens.cpp b/src/scripts/kalimdor/the_barrens.cpp index a3aab934796..bfd4682705a 100644 --- a/src/scripts/kalimdor/the_barrens.cpp +++ b/src/scripts/kalimdor/the_barrens.cpp @@ -86,7 +86,7 @@ enum eGilthares FACTION_ESCORTEE = 232 //guessed, possible not needed for this quest }; -struct TRINITY_DLL_DECL npc_giltharesAI : public npc_escortAI +struct npc_giltharesAI : public npc_escortAI { npc_giltharesAI(Creature* pCreature) : npc_escortAI(pCreature) { } @@ -197,7 +197,7 @@ enum eEnums SPELL_FOLLY = 10137, }; -struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI +struct npc_taskmaster_fizzuleAI : public ScriptedAI { npc_taskmaster_fizzuleAI(Creature* c) : ScriptedAI(c) { @@ -306,7 +306,7 @@ float AffrayChallengerLoc[6][4]= {-1677, -4334, 2.79, 1.66} }; -struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI +struct npc_twiggy_flatheadAI : public ScriptedAI { npc_twiggy_flatheadAI(Creature *c) : ScriptedAI(c) {} @@ -520,7 +520,7 @@ enum eEnums_Wizzlecrank NPC_MERCENARY = 3282, }; -struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI +struct npc_wizzlecrank_shredderAI : public npc_escortAI { npc_wizzlecrank_shredderAI(Creature* pCreature) : npc_escortAI(pCreature) { diff --git a/src/scripts/kalimdor/thousand_needles.cpp b/src/scripts/kalimdor/thousand_needles.cpp index 742e17660c7..1a92c6a7226 100644 --- a/src/scripts/kalimdor/thousand_needles.cpp +++ b/src/scripts/kalimdor/thousand_needles.cpp @@ -47,7 +47,7 @@ enum eKanati const float m_afGalakLoc[]= {-4867.387695, -1357.353760, -48.226 }; -struct TRINITY_DLL_DECL npc_kanatiAI : public npc_escortAI +struct npc_kanatiAI : public npc_escortAI { npc_kanatiAI(Creature* pCreature) : npc_escortAI(pCreature) { } @@ -128,7 +128,7 @@ float m_afBanditLoc[6][6]= {-4788.861328, -1888.007813, 89.888} }; -struct TRINITY_DLL_DECL npc_lakota_windsongAI : public npc_escortAI +struct npc_lakota_windsongAI : public npc_escortAI { npc_lakota_windsongAI(Creature* pCreature) : npc_escortAI(pCreature) { } @@ -206,7 +206,7 @@ float m_afWyvernLoc[3][3]= {-4985.364, -952.528, -5.199} }; -struct TRINITY_DLL_DECL npc_paoka_swiftmountainAI : public npc_escortAI +struct npc_paoka_swiftmountainAI : public npc_escortAI { npc_paoka_swiftmountainAI(Creature* pCreature) : npc_escortAI(pCreature) { } @@ -271,7 +271,7 @@ enum ePlucky SPELL_PLUCKY_CHICKEN = 9220 }; -struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI +struct npc_pluckyAI : public ScriptedAI { npc_pluckyAI(Creature *c) : ScriptedAI(c) { m_uiNormFaction = c->getFaction(); } @@ -388,7 +388,7 @@ bool go_panther_cage(Player* pPlayer, GameObject* pGo) return true ; } -struct TRINITY_DLL_DECL npc_enraged_pantherAI : public ScriptedAI +struct npc_enraged_pantherAI : public ScriptedAI { npc_enraged_pantherAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/thunder_bluff.cpp b/src/scripts/kalimdor/thunder_bluff.cpp index 5644f3f790d..1f776bbb048 100644 --- a/src/scripts/kalimdor/thunder_bluff.cpp +++ b/src/scripts/kalimdor/thunder_bluff.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define GOSSIP_HCB "I know this is rather silly but a young ward who is a bit shy would like your hoofprint." //TODO: verify abilities/timers -struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI +struct npc_cairne_bloodhoofAI : public ScriptedAI { npc_cairne_bloodhoofAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/kalimdor/ungoro_crater.cpp b/src/scripts/kalimdor/ungoro_crater.cpp index 25a4fcfe339..b288538acba 100644 --- a/src/scripts/kalimdor/ungoro_crater.cpp +++ b/src/scripts/kalimdor/ungoro_crater.cpp @@ -44,7 +44,7 @@ EndContentData */ #define ENTRY_TARLORD1 6519 #define ENTRY_STOMPER 6513 -struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI +struct npc_ameAI : public npc_escortAI { npc_ameAI(Creature *c) : npc_escortAI(c) {} @@ -167,7 +167,7 @@ enum eRingo FACTION_ESCORTEE = 113 }; -struct TRINITY_DLL_DECL npc_ringoAI : public FollowerAI +struct npc_ringoAI : public FollowerAI { npc_ringoAI(Creature* pCreature) : FollowerAI(pCreature) { } diff --git a/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp b/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp index ed6e35c254a..432e2994507 100644 --- a/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp +++ b/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define MAX_ENCOUNTER 9 -struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance +struct instance_wailing_caverns : public ScriptedInstance { instance_wailing_caverns(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp index dfe4457394b..1dfefaa4be3 100644 --- a/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp +++ b/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp @@ -73,7 +73,7 @@ enum eEnums #define GOSSIP_ITEM_NARALEX "Let the event begin!" #define ACHIEVEMENT_WAILING_CAVERNS 630 -struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI +struct npc_disciple_of_naralexAI : public npc_escortAI { npc_disciple_of_naralexAI(Creature *c) : npc_escortAI(c) { diff --git a/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp b/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp index 77b880e4791..b32ad99ce1e 100644 --- a/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp +++ b/src/scripts/kalimdor/zulfarrak/zulfarrak.cpp @@ -40,7 +40,7 @@ EndContentData */ #define GOSSIP_BLY "[PH] In that case, I will take my reward!" -struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI +struct npc_sergeant_blyAI : public ScriptedAI { npc_sergeant_blyAI(Creature *c) : ScriptedAI(c) { @@ -137,7 +137,7 @@ bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature* pCreature, uint32 #define GOSSIP_WEEGLI "[PH] Please blow up the door." -struct TRINITY_DLL_DECL npc_weegli_blastfuseAI : public ScriptedAI +struct npc_weegli_blastfuseAI : public ScriptedAI { npc_weegli_blastfuseAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp index 8ae95c6a18c..1600f0ce248 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -49,7 +49,7 @@ enum Creatures #define NPC_POISONOUS_MUSHROOM 30435 }; -struct TRINITY_DLL_DECL boss_amanitarAI : public ScriptedAI +struct boss_amanitarAI : public ScriptedAI { boss_amanitarAI(Creature *c) : ScriptedAI(c) { @@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_amanitarAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_amanitar_mushroomsAI : public Scripted_NoMovementAI +struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI { mob_amanitar_mushroomsAI(Creature* c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index aad211d7f89..f39ea93a11e 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -53,7 +53,7 @@ bool DeadAhnkaharGuardian; // needed for achievement: Respect Your Elders(2038) #define EMOTE_HATCHES "An Ahn'kahar Guardian hatches!" -struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI +struct boss_elder_nadoxAI : public ScriptedAI { boss_elder_nadoxAI(Creature *c) : ScriptedAI(c) { @@ -188,7 +188,7 @@ CreatureAI* GetAI_boss_elder_nadox(Creature* pCreature) #define SPELL_SPRINT 56354 -struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI +struct mob_ahnkahar_nerubianAI : public ScriptedAI { mob_ahnkahar_nerubianAI(Creature *c) : ScriptedAI(c) { @@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_nadox_eggsAI : public Scripted_NoMovementAI +struct mob_nadox_eggsAI : public Scripted_NoMovementAI { mob_nadox_eggsAI(Creature* c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index ab2c23fd955..4f3957c7565 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -59,7 +59,7 @@ enum Achievements ACHIEVEMENT_QUICK_DEMISE = 1862 }; -struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI +struct boss_volazjAI : public ScriptedAI { boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature),Summons(m_creature) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 76f9e32a007..d0b009f5e25 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -63,7 +63,7 @@ float JEDOGA_POS[2][4] = {372.330994f, -705.278015f, -16.179716f, 5.427970f} }; -struct TRINITY_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI +struct boss_jedoga_shadowseekerAI : public ScriptedAI { boss_jedoga_shadowseekerAI(Creature* c) : ScriptedAI(c) { @@ -333,7 +333,7 @@ struct TRINITY_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_jedoga_initiandAI : public ScriptedAI +struct mob_jedoga_initiandAI : public ScriptedAI { mob_jedoga_initiandAI(Creature* c) : ScriptedAI(c) { @@ -487,7 +487,7 @@ enum AufseherSpell SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_2 = 56312 }; -struct TRINITY_DLL_DECL npc_jedogas_aufseher_triggerAI : public Scripted_NoMovementAI +struct npc_jedogas_aufseher_triggerAI : public Scripted_NoMovementAI { npc_jedogas_aufseher_triggerAI(Creature* c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 3bc5c8e8ba9..cea11171861 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -79,7 +79,7 @@ enum CombatPhase FEEDING }; -struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI +struct boss_taldaramAI : public ScriptedAI { boss_taldaramAI(Creature *c) : ScriptedAI(c) { @@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_taldaram_flamesphereAI : public ScriptedAI +struct mob_taldaram_flamesphereAI : public ScriptedAI { mob_taldaram_flamesphereAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp index e4cc5d2e422..a89121f031d 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp @@ -39,7 +39,7 @@ EndScriptData */ 4 - Amanitar (Heroic only) */ -struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance +struct instance_ahnkahet : public ScriptedInstance { instance_ahnkahet(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp index 81d8a6daae9..ba17d5c228f 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -72,7 +72,7 @@ float SpawnPoint[2][2] = {551.1, 229.4}, }; -struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI +struct boss_anub_arakAI : public ScriptedAI { boss_anub_arakAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp index 1a290b8e7df..c0dc08b7fe2 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -50,7 +50,7 @@ This is the timed gauntlet - waves of non-elite spiders #define SPELL_LEECH_POISON_H 59417 #define SPELL_WEB_GRAB_H 59421 -struct TRINITY_DLL_DECL boss_hadronoxAI : public ScriptedAI +struct boss_hadronoxAI : public ScriptedAI { boss_hadronoxAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index cb50470a2a0..dda95f0005d 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -95,7 +95,7 @@ enum Misc { ACHIEVEMENT_WATCH_HIM_DIE = 1296 }; -struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI +struct boss_krik_thirAI : public ScriptedAI { boss_krik_thirAI(Creature *c) : ScriptedAI(c) { @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_skittering_infectorAI : public ScriptedAI +struct npc_skittering_infectorAI : public ScriptedAI { npc_skittering_infectorAI(Creature *c) : ScriptedAI(c) {} @@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL npc_skittering_infectorAI : public ScriptedAI }; -struct TRINITY_DLL_DECL npc_anub_ar_skirmisherAI : public ScriptedAI +struct npc_anub_ar_skirmisherAI : public ScriptedAI { npc_anub_ar_skirmisherAI(Creature *c) : ScriptedAI(c) {} @@ -271,7 +271,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_skirmisherAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_anub_ar_shadowcasterAI : public ScriptedAI +struct npc_anub_ar_shadowcasterAI : public ScriptedAI { npc_anub_ar_shadowcasterAI(Creature *c) : ScriptedAI(c) {} @@ -306,7 +306,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_shadowcasterAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_anub_ar_warriorAI : public ScriptedAI +struct npc_anub_ar_warriorAI : public ScriptedAI { npc_anub_ar_warriorAI(Creature *c) : ScriptedAI(c){} @@ -342,7 +342,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_warriorAI : public ScriptedAI }; -struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI +struct npc_watcher_gashraAI : public ScriptedAI { npc_watcher_gashraAI(Creature *c) : ScriptedAI(c) {} @@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_watcher_narjilAI : public ScriptedAI +struct npc_watcher_narjilAI : public ScriptedAI { npc_watcher_narjilAI(Creature *c) : ScriptedAI(c) {} @@ -425,7 +425,7 @@ struct TRINITY_DLL_DECL npc_watcher_narjilAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_watcher_silthikAI : public ScriptedAI +struct npc_watcher_silthikAI : public ScriptedAI { npc_watcher_silthikAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp index 0de63148a08..8f80d0cc4d0 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp @@ -34,7 +34,7 @@ EndScriptData */ 2 - Anub'arak */ -struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance +struct instance_azjol_nerub : public ScriptedInstance { instance_azjol_nerub(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/scripts/northrend/borean_tundra.cpp index 48a0c8c354b..4622877c9fe 100644 --- a/src/scripts/northrend/borean_tundra.cpp +++ b/src/scripts/northrend/borean_tundra.cpp @@ -203,7 +203,7 @@ enum eSinkhole SPELL_SUMMON_WORM = 46800, }; -struct TRINITY_DLL_DECL npc_sinkhole_kill_creditAI : public ScriptedAI +struct npc_sinkhole_kill_creditAI : public ScriptedAI { npc_sinkhole_kill_creditAI(Creature* c) : ScriptedAI(c){} @@ -307,7 +307,7 @@ CreatureAI* GetAI_npc_sinkhole_kill_credit(Creature* pCreature) ## npc_khunok_the_behemoth ######*/ -struct TRINITY_DLL_DECL npc_khunok_the_behemothAI : public ScriptedAI +struct npc_khunok_the_behemothAI : public ScriptedAI { npc_khunok_the_behemothAI(Creature *c) : ScriptedAI(c) {} @@ -458,7 +458,7 @@ const uint32 nerubarVictims[3] = { 45526, 45527, 45514 }; -struct TRINITY_DLL_DECL mob_nerubar_victimAI : public ScriptedAI +struct mob_nerubar_victimAI : public ScriptedAI { mob_nerubar_victimAI(Creature *c) : ScriptedAI(c) {} @@ -497,7 +497,7 @@ enum eScourgePrisoner GO_SCOURGE_CAGE = 187867 }; -struct TRINITY_DLL_DECL npc_scourge_prisonerAI : public ScriptedAI +struct npc_scourge_prisonerAI : public ScriptedAI { npc_scourge_prisonerAI(Creature* pCreature) : ScriptedAI (pCreature){} @@ -531,7 +531,7 @@ enum eJenny SPELL_DROP_CRATE = 46342 }; -struct TRINITY_DLL_DECL npc_jennyAI : public ScriptedAI +struct npc_jennyAI : public ScriptedAI { npc_jennyAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -586,7 +586,7 @@ CreatureAI* GetAI_npc_jenny(Creature *pCreature) ## npc_fezzix_geartwist ######*/ -struct TRINITY_DLL_DECL npc_fezzix_geartwistAI : public ScriptedAI +struct npc_fezzix_geartwistAI : public ScriptedAI { npc_fezzix_geartwistAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -649,7 +649,7 @@ enum eNesingwaryTrapper //#define SAY_NESINGWARY_1 -1571008 -struct TRINITY_DLL_DECL npc_nesingwary_trapperAI : public ScriptedAI +struct npc_nesingwary_trapperAI : public ScriptedAI { npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisibility(VISIBILITY_OFF); } @@ -775,7 +775,7 @@ enum eLurgglbr #define SAY_WP_41_LUR_START -1571006 #define SAY_WP_41_LUR_END -1571007*/ -struct TRINITY_DLL_DECL npc_lurgglbrAI : public npc_escortAI +struct npc_lurgglbrAI : public npc_escortAI { npc_lurgglbrAI(Creature* pCreature) : npc_escortAI(pCreature){} @@ -914,7 +914,7 @@ enum eNexusDrakeHatchling QUEST_DRAKE_HUNT_D = 11940 }; -struct TRINITY_DLL_DECL npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the npc follow the player is missing, also we can use FollowerAI! +struct npc_nexus_drake_hatchlingAI : public FollowerAI //The spell who makes the npc follow the player is missing, also we can use FollowerAI! { npc_nexus_drake_hatchlingAI(Creature *c) : FollowerAI(c) { @@ -1036,7 +1036,7 @@ enum eThassarian #define GOSSIP_ITEM_T "Let's do this, Thassarian. It's now or never." -struct TRINITY_DLL_DECL npc_thassarianAI : public npc_escortAI +struct npc_thassarianAI : public npc_escortAI { npc_thassarianAI(Creature* pCreature) : npc_escortAI(pCreature) { @@ -1328,7 +1328,7 @@ CreatureAI* GetAI_npc_thassarian(Creature *pCreature) ## npc_image_lich_king ######*/ -struct TRINITY_DLL_DECL npc_image_lich_kingAI : public ScriptedAI +struct npc_image_lich_kingAI : public ScriptedAI { npc_image_lich_kingAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -1357,7 +1357,7 @@ CreatureAI* GetAI_npc_image_lich_king(Creature* pCreature) ## npc_general_arlos ######*/ -struct TRINITY_DLL_DECL npc_general_arlosAI : public ScriptedAI +struct npc_general_arlosAI : public ScriptedAI { npc_general_arlosAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -1389,7 +1389,7 @@ enum eCounselotTalbot SPELL_SOUL_BLAST = 50992, }; -struct TRINITY_DLL_DECL npc_counselor_talbotAI : public ScriptedAI +struct npc_counselor_talbotAI : public ScriptedAI { npc_counselor_talbotAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -1490,7 +1490,7 @@ CreatureAI* GetAI_npc_counselor_talbot(Creature* pCreature) ## npc_leryssa ######*/ -struct TRINITY_DLL_DECL npc_leryssaAI : public ScriptedAI +struct npc_leryssaAI : public ScriptedAI { npc_leryssaAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -1619,7 +1619,7 @@ enum eBerylSorcerer SPELL_COSMETIC_ENSLAVE_CHAINS_SELF = 45631 }; -struct TRINITY_DLL_DECL npc_beryl_sorcererAI : public FollowerAI +struct npc_beryl_sorcererAI : public FollowerAI { npc_beryl_sorcererAI(Creature* pCreature) : FollowerAI(pCreature) {} @@ -1696,7 +1696,7 @@ enum eImprisionedBerylSorcerer SAY_IMPRISIONED_BERYL_7 = -1571030, }; -struct TRINITY_DLL_DECL npc_imprisoned_beryl_sorcererAI : public ScriptedAI +struct npc_imprisoned_beryl_sorcererAI : public ScriptedAI { npc_imprisoned_beryl_sorcererAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -1846,7 +1846,7 @@ bool QuestAccept_npc_mootoo_the_younger(Player* pPlayer, Creature* pCreature, Qu } return true; } -struct TRINITY_DLL_DECL npc_mootoo_the_youngerAI : public npc_escortAI +struct npc_mootoo_the_youngerAI : public npc_escortAI { npc_mootoo_the_youngerAI(Creature *c) : npc_escortAI(c) {} @@ -1931,7 +1931,7 @@ bool QuestAccept_npc_bonker_togglevolt(Player* pPlayer, Creature* pCreature, Que } return true; } -struct TRINITY_DLL_DECL npc_bonker_togglevoltAI : public npc_escortAI +struct npc_bonker_togglevoltAI : public npc_escortAI { npc_bonker_togglevoltAI(Creature *c) : npc_escortAI(c) {} uint32 Bonker_agro; diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp index 5709150b70e..5d2f8323b45 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp @@ -57,7 +57,7 @@ enum eSpells SPELL_WAKING_NIGHTMARE_H = 67677 }; -struct TRINITY_DLL_DECL boss_eadricAI : public ScriptedAI +struct boss_eadricAI : public ScriptedAI { boss_eadricAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -156,7 +156,7 @@ CreatureAI* GetAI_boss_eadric(Creature* pCreature) return new boss_eadricAI(pCreature); } -struct TRINITY_DLL_DECL boss_paletressAI : public ScriptedAI +struct boss_paletressAI : public ScriptedAI { boss_paletressAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -306,7 +306,7 @@ CreatureAI* GetAI_boss_paletress(Creature* pCreature) return new boss_paletressAI(pCreature); } -struct TRINITY_DLL_DECL npc_memoryAI : public ScriptedAI +struct npc_memoryAI : public ScriptedAI { npc_memoryAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -374,7 +374,7 @@ CreatureAI* GetAI_npc_memory(Creature* pCreature) } // THIS AI NEEDS MORE IMPROVEMENTS -struct TRINITY_DLL_DECL npc_argent_soldierAI : public npc_escortAI +struct npc_argent_soldierAI : public npc_escortAI { npc_argent_soldierAI(Creature* pCreature) : npc_escortAI(pCreature) { diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp index 122e4430707..4085605facb 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp @@ -72,7 +72,7 @@ enum ePhases PHASE_GHOST = 3 }; -struct TRINITY_DLL_DECL boss_black_knightAI : public ScriptedAI +struct boss_black_knightAI : public ScriptedAI { boss_black_knightAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -290,7 +290,7 @@ CreatureAI* GetAI_boss_black_knight(Creature *pCreature) return new boss_black_knightAI (pCreature); } -struct TRINITY_DLL_DECL npc_risen_ghoulAI : public ScriptedAI +struct npc_risen_ghoulAI : public ScriptedAI { npc_risen_ghoulAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -325,7 +325,7 @@ CreatureAI* GetAI_npc_risen_ghoul(Creature* pCreature) return new npc_risen_ghoulAI(pCreature); } -struct TRINITY_DLL_DECL npc_black_knight_skeletal_gryphonAI : public npc_escortAI +struct npc_black_knight_skeletal_gryphonAI : public npc_escortAI { npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) { diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp index 7e4161090d3..9d745c8775a 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp @@ -141,7 +141,7 @@ bool GrandChampionsOutVehicle(Creature* m_creature) * Script Complete: 25%. * */ -struct TRINITY_DLL_DECL generic_vehicleAI_toc5AI : public npc_escortAI +struct generic_vehicleAI_toc5AI : public npc_escortAI { generic_vehicleAI_toc5AI(Creature* pCreature) : npc_escortAI(pCreature), pVehicle(pCreature->GetVehicleKit()) { @@ -290,7 +290,7 @@ CreatureAI* GetAI_generic_vehicleAI_toc5(Creature* pCreature) } // Marshal Jacob Alerius && Mokra the Skullcrusher || Warrior -struct TRINITY_DLL_DECL boss_warrior_toc5AI : public ScriptedAI +struct boss_warrior_toc5AI : public ScriptedAI { boss_warrior_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -417,7 +417,7 @@ CreatureAI* GetAI_boss_warrior_toc5(Creature* pCreature) } // Ambrose Boltspark && Eressea Dawnsinger || Mage -struct TRINITY_DLL_DECL boss_mage_toc5AI : public ScriptedAI +struct boss_mage_toc5AI : public ScriptedAI { boss_mage_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -551,7 +551,7 @@ CreatureAI* GetAI_boss_mage_toc5(Creature* pCreature) } // Colosos && Runok Wildmane || Shaman -struct TRINITY_DLL_DECL boss_shaman_toc5AI : public ScriptedAI +struct boss_shaman_toc5AI : public ScriptedAI { boss_shaman_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -692,7 +692,7 @@ CreatureAI* GetAI_boss_shaman_toc5(Creature* pCreature) } // Jaelyne Evensong && Zul'tore || Hunter -struct TRINITY_DLL_DECL boss_hunter_toc5AI : public ScriptedAI +struct boss_hunter_toc5AI : public ScriptedAI { boss_hunter_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -841,7 +841,7 @@ CreatureAI* GetAI_boss_hunter_toc5(Creature* pCreature) } // Lana Stouthammer Evensong && Deathstalker Visceri || Rouge -struct TRINITY_DLL_DECL boss_rouge_toc5AI : public ScriptedAI +struct boss_rouge_toc5AI : public ScriptedAI { boss_rouge_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp index 7b921c27d0e..01cdbc7b083 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define MAX_ENCOUNTER 4 -struct TRINITY_DLL_DECL instance_trial_of_the_champion : public ScriptedInstance +struct instance_trial_of_the_champion : public ScriptedInstance { instance_trial_of_the_champion(Map* pMap) : ScriptedInstance(pMap) {Initialize();} diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp index 43122c9d6b9..e24fea2cd0c 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp @@ -42,7 +42,7 @@ EndContentData */ const Position SpawnPosition = {746.261,657.401,411.681,4.65}; -struct TRINITY_DLL_DECL npc_announcer_toc5AI : public ScriptedAI +struct npc_announcer_toc5AI : public ScriptedAI { npc_announcer_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/dalaran.cpp b/src/scripts/northrend/dalaran.cpp index 7be06f33ed0..a5cfc6c84d4 100644 --- a/src/scripts/northrend/dalaran.cpp +++ b/src/scripts/northrend/dalaran.cpp @@ -42,7 +42,7 @@ enum NPCs // All outdoor guards are within 35.0f of these NPCs NPC_SWEETBERRY_H = 29715, }; -struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI +struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI { npc_mageguard_dalaranAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { diff --git a/src/scripts/northrend/draktharon_keep/boss_dred.cpp b/src/scripts/northrend/draktharon_keep/boss_dred.cpp index d61c69f6b05..60ab85ea1c2 100644 --- a/src/scripts/northrend/draktharon_keep/boss_dred.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_dred.cpp @@ -51,7 +51,7 @@ enum Creatures NPC_RAPTOR_2 = 26628 }; -struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI +struct boss_dredAI : public ScriptedAI { boss_dredAI(Creature *c) : ScriptedAI(c) { @@ -157,7 +157,7 @@ CreatureAI* GetAI_boss_dred(Creature* pCreature) return new boss_dredAI (pCreature); } -struct TRINITY_DLL_DECL npc_drakkari_gutripperAI : public ScriptedAI +struct npc_drakkari_gutripperAI : public ScriptedAI { npc_drakkari_gutripperAI(Creature *c) : ScriptedAI(c) { @@ -205,7 +205,7 @@ CreatureAI* GetAI_npc_drakkari_gutripper(Creature* pCreature) return new npc_drakkari_gutripperAI (pCreature); } -struct TRINITY_DLL_DECL npc_drakkari_scytheclawAI : public ScriptedAI +struct npc_drakkari_scytheclawAI : public ScriptedAI { npc_drakkari_scytheclawAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/scripts/northrend/draktharon_keep/boss_novos.cpp index 5838f8eefd5..17e1c022abf 100644 --- a/src/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -80,7 +80,7 @@ static Location AddSpawnPoint = { -379.20, -816.76, 59.70}; static Location CrystalHandlerSpawnPoint = { -326.626343, -709.956604, 27.813314 }; static Location AddDestinyPoint = { -379.314545, -772.577637, 28.58837 }; -struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI +struct boss_novosAI : public Scripted_NoMovementAI { boss_novosAI(Creature *c) : Scripted_NoMovementAI(c), lSummons(me) { @@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL mob_crystal_handlerAI : public ScriptedAI +struct mob_crystal_handlerAI : public ScriptedAI { mob_crystal_handlerAI(Creature *c) : ScriptedAI(c) { @@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL mob_crystal_handlerAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_novos_minionAI : public ScriptedAI +struct mob_novos_minionAI : public ScriptedAI { mob_novos_minionAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index cd3d637256f..f374dc761b9 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -85,7 +85,7 @@ enum CombatPhase GOING_SKELETAL }; -struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI +struct boss_tharon_jaAI : public ScriptedAI { boss_tharon_jaAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp index c5ebd62d7ea..00f72318ba1 100644 --- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -63,7 +63,7 @@ enum Creatures Position AddSpawnPoint = { -260.493011, -622.968018, 26.605301, 3.036870 }; -struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI +struct boss_trollgoreAI : public ScriptedAI { boss_trollgoreAI(Creature *c) : ScriptedAI(c), lSummons(me) { diff --git a/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp b/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp index 24f793e3c23..16dc14bd815 100644 --- a/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp +++ b/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp @@ -43,7 +43,7 @@ enum GameObjects GO_NOVOS_CRYSTAL_4 = 189302 }; -struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance +struct instance_drak_tharon : public ScriptedInstance { instance_drak_tharon(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index 6f543148f5f..d81ac963706 100644 --- a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -45,7 +45,7 @@ enum Spells H_SPELL_MOJO_WAVE = 58993 }; -struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI +struct boss_drakkari_colossusAI : public ScriptedAI { boss_drakkari_colossusAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_drakkari_elementalAI : public ScriptedAI +struct boss_drakkari_elementalAI : public ScriptedAI { boss_drakkari_elementalAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL boss_drakkari_elementalAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_living_mojoAI : public ScriptedAI +struct npc_living_mojoAI : public ScriptedAI { npc_living_mojoAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/gundrak/boss_eck.cpp b/src/scripts/northrend/gundrak/boss_eck.cpp index b11c0351cd3..a80ed238e20 100644 --- a/src/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/scripts/northrend/gundrak/boss_eck.cpp @@ -20,7 +20,7 @@ enum Spells SPELL_ECK_SPRING_1 = 55815, //Eck leaps at a distant target. --> Drops aggro and charges a random player. Tank can simply taunt him back. SPELL_ECK_SPRING_2 = 55837 //Eck leaps at a distant target. }; -struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI +struct boss_eckAI : public ScriptedAI { boss_eckAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/scripts/northrend/gundrak/boss_gal_darah.cpp index 53a53a6cc72..eefd3b9c105 100644 --- a/src/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -57,7 +57,7 @@ enum CombatPhase RHINO }; -struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI +struct boss_gal_darahAI : public ScriptedAI { boss_gal_darahAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/gundrak/boss_moorabi.cpp b/src/scripts/northrend/gundrak/boss_moorabi.cpp index 66efcea123b..05a2da0e292 100644 --- a/src/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/scripts/northrend/gundrak/boss_moorabi.cpp @@ -41,7 +41,7 @@ enum eSays EMOTE_TRANSFORM = -1604017 }; -struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI +struct boss_moorabiAI : public ScriptedAI { boss_moorabiAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/scripts/northrend/gundrak/boss_slad_ran.cpp index 663b3fb0805..b97f15706ca 100644 --- a/src/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -65,7 +65,7 @@ static Locations SpawnLoc[]= {1716.76, 635.159, 129.282, 0.191986} }; -struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI +struct boss_slad_ranAI : public ScriptedAI { boss_slad_ranAI(Creature *c) : ScriptedAI(c) { @@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_slad_ran_constrictorAI : public ScriptedAI +struct mob_slad_ran_constrictorAI : public ScriptedAI { mob_slad_ran_constrictorAI(Creature *c) : ScriptedAI(c) {} @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL mob_slad_ran_constrictorAI : public ScriptedAI ScriptedInstance* pInstance; }; -struct TRINITY_DLL_DECL mob_slad_ran_viperAI : public ScriptedAI +struct mob_slad_ran_viperAI : public ScriptedAI { mob_slad_ran_viperAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/gundrak/instance_gundrak.cpp b/src/scripts/northrend/gundrak/instance_gundrak.cpp index dfd2ebcb5a7..8fbed4ccd26 100644 --- a/src/scripts/northrend/gundrak/instance_gundrak.cpp +++ b/src/scripts/northrend/gundrak/instance_gundrak.cpp @@ -11,7 +11,7 @@ 4 - Eck the Ferocious */ -struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance +struct instance_gundrak : public ScriptedInstance { instance_gundrak(Map* pMap) : ScriptedInstance(pMap) { diff --git a/src/scripts/northrend/howling_fjord.cpp b/src/scripts/northrend/howling_fjord.cpp index 1e4f78d4751..cb534aeb6f1 100644 --- a/src/scripts/northrend/howling_fjord.cpp +++ b/src/scripts/northrend/howling_fjord.cpp @@ -61,7 +61,7 @@ bool QuestAccept_npc_apothecary_hanes(Player* pPlayer, Creature* pCreature, Ques return true; } -struct TRINITY_DLL_DECL npc_Apothecary_HanesAI : public npc_escortAI +struct npc_Apothecary_HanesAI : public npc_escortAI { npc_Apothecary_HanesAI(Creature* pCreature) : npc_escortAI(pCreature){} uint32 PotTimer; @@ -154,7 +154,7 @@ enum ePlaguehound QUEST_SNIFF_OUT_ENEMY = 11253 }; -struct TRINITY_DLL_DECL npc_plaguehound_trackerAI : public npc_escortAI +struct npc_plaguehound_trackerAI : public npc_escortAI { npc_plaguehound_trackerAI(Creature* pCreature) : npc_escortAI(pCreature) { } diff --git a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp index 19913ce3036..161ce894b8f 100644 --- a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp +++ b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp @@ -45,7 +45,7 @@ enum Spells SPELL_BERSERK = SPELL_BERSERK_27680, }; -struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI +struct boss_anubrekhanAI : public BossAI { boss_anubrekhanAI(Creature *c) : BossAI(c, BOSS_ANUBREKHAN) {} diff --git a/src/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/scripts/northrend/naxxramas/boss_faerlina.cpp index 1405fd09cc8..2e99c17f2e1 100644 --- a/src/scripts/northrend/naxxramas/boss_faerlina.cpp +++ b/src/scripts/northrend/naxxramas/boss_faerlina.cpp @@ -58,7 +58,7 @@ enum Achievements ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25 = 2140 }; -struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI +struct boss_faerlinaAI : public BossAI { boss_faerlinaAI(Creature *c) : BossAI(c, BOSS_FAERLINA), greet(false) {} @@ -169,7 +169,7 @@ CreatureAI* GetAI_boss_faerlina(Creature* pCreature) return new boss_faerlinaAI (pCreature); } -struct TRINITY_DLL_DECL mob_faerlina_addAI : public ScriptedAI +struct mob_faerlina_addAI : public ScriptedAI { mob_faerlina_addAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp b/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp index b3e2a9fb9bb..78277186571 100644 --- a/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp +++ b/src/scripts/northrend/naxxramas/boss_four_horsemen.cpp @@ -76,7 +76,7 @@ const int32 SAY_DEATH[] = {-1533057, -1533050, -1533074, -1533064}; #define SAY_BARON_AGGRO RAND(-1533065,-1533066,-1533067) #define SAY_BARON_SLAY RAND(-1533068,-1533069) -struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI +struct boss_four_horsemenAI : public BossAI { boss_four_horsemenAI(Creature *c) : BossAI(c, BOSS_HORSEMEN) { diff --git a/src/scripts/northrend/naxxramas/boss_gluth.cpp b/src/scripts/northrend/naxxramas/boss_gluth.cpp index 525d9fd0f65..9bdb2b925e5 100644 --- a/src/scripts/northrend/naxxramas/boss_gluth.cpp +++ b/src/scripts/northrend/naxxramas/boss_gluth.cpp @@ -44,7 +44,7 @@ enum Events #define EMOTE_NEARBY " spots a nearby zombie to devour!" -struct TRINITY_DLL_DECL boss_gluthAI : public BossAI +struct boss_gluthAI : public BossAI { boss_gluthAI(Creature *c) : BossAI(c, BOSS_GLUTH) { diff --git a/src/scripts/northrend/naxxramas/boss_gothik.cpp b/src/scripts/northrend/naxxramas/boss_gothik.cpp index 0109fcaa56a..700ea0eb6b1 100644 --- a/src/scripts/northrend/naxxramas/boss_gothik.cpp +++ b/src/scripts/northrend/naxxramas/boss_gothik.cpp @@ -133,7 +133,7 @@ struct NotOnSameSide : public std::unary_function<Unit *, bool> { } }; -struct TRINITY_DLL_DECL boss_gothikAI : public BossAI +struct boss_gothikAI : public BossAI { boss_gothikAI(Creature *c) : BossAI(c, BOSS_GOTHIK) {} @@ -429,7 +429,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI } }; -struct TRINITY_DLL_DECL mob_gothik_minionAI : public CombatAI +struct mob_gothik_minionAI : public CombatAI { mob_gothik_minionAI(Creature *c) : CombatAI(c) { diff --git a/src/scripts/northrend/naxxramas/boss_grobbulus.cpp b/src/scripts/northrend/naxxramas/boss_grobbulus.cpp index f7b0887be4e..c77131e1f42 100644 --- a/src/scripts/northrend/naxxramas/boss_grobbulus.cpp +++ b/src/scripts/northrend/naxxramas/boss_grobbulus.cpp @@ -32,7 +32,7 @@ #define MOB_FALLOUT_SLIME 16290 -struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI +struct boss_grobbulusAI : public BossAI { boss_grobbulusAI(Creature *c) : BossAI(c, BOSS_GROBBULUS) { @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI } }; -struct TRINITY_DLL_DECL npc_grobbulus_poison_cloudAI : public Scripted_NoMovementAI +struct npc_grobbulus_poison_cloudAI : public Scripted_NoMovementAI { npc_grobbulus_poison_cloudAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) { diff --git a/src/scripts/northrend/naxxramas/boss_heigan.cpp b/src/scripts/northrend/naxxramas/boss_heigan.cpp index 15b45038f63..44c3f3384c3 100644 --- a/src/scripts/northrend/naxxramas/boss_heigan.cpp +++ b/src/scripts/northrend/naxxramas/boss_heigan.cpp @@ -41,7 +41,7 @@ enum Phases PHASE_DANCE, }; -struct TRINITY_DLL_DECL boss_heiganAI : public BossAI +struct boss_heiganAI : public BossAI { boss_heiganAI(Creature *c) : BossAI(c, BOSS_HEIGAN) {} diff --git a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp index 8fef3040ea2..1e1a6073d2b 100644 --- a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp +++ b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp @@ -110,7 +110,7 @@ const Position Pos[12] = {3739.500000, -5141.883989, 142.014113, 2.121412} //RIGHT_NEAR }; -struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI +struct boss_kelthuzadAI : public BossAI { boss_kelthuzadAI(Creature* c) : BossAI(c, BOSS_KELTHUZAD) {} diff --git a/src/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/scripts/northrend/naxxramas/boss_loatheb.cpp index 9bafbeda2a1..191055fb8cd 100644 --- a/src/scripts/northrend/naxxramas/boss_loatheb.cpp +++ b/src/scripts/northrend/naxxramas/boss_loatheb.cpp @@ -37,7 +37,7 @@ enum Events EVENT_DOOM, }; -struct TRINITY_DLL_DECL boss_loathebAI : public BossAI +struct boss_loathebAI : public BossAI { boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB) {} @@ -91,7 +91,7 @@ enum SporeSpells SPELL_FUNGAL_CREEP = 29232 }; -struct TRINITY_DLL_DECL mob_loatheb_sporeAI : public ScriptedAI +struct mob_loatheb_sporeAI : public ScriptedAI { mob_loatheb_sporeAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/scripts/northrend/naxxramas/boss_maexxna.cpp index 7b647b1d439..f4b3145850a 100644 --- a/src/scripts/northrend/naxxramas/boss_maexxna.cpp +++ b/src/scripts/northrend/naxxramas/boss_maexxna.cpp @@ -57,7 +57,7 @@ enum Events EVENT_FRENZY, }; -struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI +struct boss_maexxnaAI : public BossAI { boss_maexxnaAI(Creature *c) : BossAI(c, BOSS_MAEXXNA) {} @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI } }; -struct TRINITY_DLL_DECL mob_webwrapAI : public NullCreatureAI +struct mob_webwrapAI : public NullCreatureAI { mob_webwrapAI(Creature *c) : NullCreatureAI(c), victimGUID(0) {} diff --git a/src/scripts/northrend/naxxramas/boss_noth.cpp b/src/scripts/northrend/naxxramas/boss_noth.cpp index ee08e1ae51c..eb2efa13a3a 100644 --- a/src/scripts/northrend/naxxramas/boss_noth.cpp +++ b/src/scripts/northrend/naxxramas/boss_noth.cpp @@ -62,7 +62,7 @@ enum Events EVENT_GROUND, }; -struct TRINITY_DLL_DECL boss_nothAI : public BossAI +struct boss_nothAI : public BossAI { boss_nothAI(Creature *c) : BossAI(c, BOSS_NOTH) {} diff --git a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp index 8cccbdc21a2..8663df39a53 100644 --- a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -36,7 +36,7 @@ #define ACHIEVEMENT_MAKE_QUICK_WERK_OF_HIM RAID_MODE(1856, 1857) #define MAX_ENCOUNTER_TIME 3 * 60 * 1000 -struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI +struct boss_patchwerkAI : public BossAI { boss_patchwerkAI(Creature *c) : BossAI(c, BOSS_PATCHWERK) {} diff --git a/src/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/scripts/northrend/naxxramas/boss_razuvious.cpp index fa120b27779..a58bb5636db 100644 --- a/src/scripts/northrend/naxxramas/boss_razuvious.cpp +++ b/src/scripts/northrend/naxxramas/boss_razuvious.cpp @@ -53,7 +53,7 @@ enum Events EVENT_COMMAND, }; -struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI +struct boss_razuviousAI : public BossAI { boss_razuviousAI(Creature *c) : BossAI(c, BOSS_RAZUVIOUS) {} diff --git a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp index b9acce8d7f6..b754cc124ef 100644 --- a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp +++ b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp @@ -70,7 +70,7 @@ enum Events typedef std::map<uint64, uint64> IceBlockMap; -struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI +struct boss_sapphironAI : public BossAI { boss_sapphironAI(Creature* c) : BossAI(c, BOSS_SAPPHIRON) , phase(PHASE_NULL) diff --git a/src/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/scripts/northrend/naxxramas/boss_thaddius.cpp index 5e023e19ce2..37f52083815 100644 --- a/src/scripts/northrend/naxxramas/boss_thaddius.cpp +++ b/src/scripts/northrend/naxxramas/boss_thaddius.cpp @@ -95,7 +95,7 @@ enum Events EVENT_BERSERK, }; -struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI +struct boss_thaddiusAI : public BossAI { boss_thaddiusAI(Creature *c) : BossAI(c, BOSS_THADDIUS) { @@ -248,7 +248,7 @@ CreatureAI* GetAI_boss_thaddius(Creature* pCreature) return new boss_thaddiusAI (pCreature); } -struct TRINITY_DLL_DECL mob_stalaggAI : public ScriptedAI +struct mob_stalaggAI : public ScriptedAI { mob_stalaggAI(Creature *c) : ScriptedAI(c) { @@ -327,7 +327,7 @@ CreatureAI* GetAI_mob_stalagg(Creature* pCreature) return new mob_stalaggAI(pCreature); } -struct TRINITY_DLL_DECL mob_feugenAI : public ScriptedAI +struct mob_feugenAI : public ScriptedAI { mob_feugenAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/scripts/northrend/naxxramas/instance_naxxramas.cpp index b9bbd5d13c3..4eb62b6d26e 100644 --- a/src/scripts/northrend/naxxramas/instance_naxxramas.cpp +++ b/src/scripts/northrend/naxxramas/instance_naxxramas.cpp @@ -96,7 +96,7 @@ inline uint32 GetEruptionSection(float x, float y) return 3; } -struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData +struct instance_naxxramas : public InstanceData { instance_naxxramas(Map* pMap) : InstanceData(pMap) , Sapphiron(NULL), pGothikGate(NULL), HorsemenChest(NULL), HorsemenNum(0) diff --git a/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp b/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp index 2f9067bf294..2f77a576650 100644 --- a/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp +++ b/src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp @@ -83,7 +83,7 @@ After all of the NPCs riding on the disks die, the players on the disks need to #define SAY_PHASE3_SLAY_3 -1616027 #define SAY_PHASE3_BIG_ATTACK -1616028 -struct TRINITY_DLL_DECL boss_malygosAI : public ScriptedAI +struct boss_malygosAI : public ScriptedAI { boss_malygosAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp index 79a38899789..d93ec415b42 100644 --- a/src/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp +++ b/src/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp @@ -1,7 +1,7 @@ #include "ScriptedPch.h" #include "eye_of_eternity.h" -struct TRINITY_DLL_DECL instance_eye_of_eternity : public ScriptedInstance +struct instance_eye_of_eternity : public ScriptedInstance { instance_eye_of_eternity(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; }; diff --git a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp index 236dd3d1067..7fe83edab7b 100644 --- a/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -61,7 +61,7 @@ float RiftLocation[6][3]= {651.72, -297.44, -9.37} }; -struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI +struct boss_anomalusAI : public ScriptedAI { boss_anomalusAI(Creature *c) : ScriptedAI(c) { @@ -228,7 +228,7 @@ CreatureAI* GetAI_boss_anomalus(Creature* pCreature) return new boss_anomalusAI (pCreature); } -struct TRINITY_DLL_DECL mob_chaotic_riftAI : public Scripted_NoMovementAI +struct mob_chaotic_riftAI : public Scripted_NoMovementAI { mob_chaotic_riftAI(Creature *c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index c0fd39e89d3..af51b19e553 100644 --- a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -49,7 +49,7 @@ enum eEnums SAY_CRYSTAL_NOVA = -1576044 }; -struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI +struct boss_keristraszaAI : public ScriptedAI { boss_keristraszaAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp index f404ec234c7..051fe209866 100644 --- a/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp @@ -61,7 +61,7 @@ float CenterOfRoom[1][4] = {504.80, 89.07, -16.12, 6.27} }; -struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI +struct boss_magus_telestraAI : public ScriptedAI { boss_magus_telestraAI(Creature* c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 66c9edb1eec..49bbecde614 100644 --- a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -53,7 +53,7 @@ enum eEnums #define SPIKE_DISTANCE 5.0f -struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI +struct boss_ormorokAI : public ScriptedAI { boss_ormorokAI(Creature *c) : ScriptedAI(c) { @@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_crystal_spikeAI : public Scripted_NoMovementAI +struct mob_crystal_spikeAI : public Scripted_NoMovementAI { mob_crystal_spikeAI(Creature *c) : Scripted_NoMovementAI(c) { @@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL mob_crystal_spikeAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL mob_crystalline_tanglerAI : public ScriptedAI +struct mob_crystalline_tanglerAI : public ScriptedAI { mob_crystalline_tanglerAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp b/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp index 198279659ac..5ab6a737615 100644 --- a/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp +++ b/src/scripts/northrend/nexus/nexus/commander_kolurg.cpp @@ -23,7 +23,7 @@ update creature_template set scriptname = 'boss_commander_kolurg' where entry = #define SAY_KILL -1576025 #define SAY_DEATH -1576026 -struct TRINITY_DLL_DECL boss_commander_kolurgAI : public ScriptedAI +struct boss_commander_kolurgAI : public ScriptedAI { boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp b/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp index dc6c3fa9ee4..06267061322 100644 --- a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp +++ b/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp @@ -23,7 +23,7 @@ update creature_template set scriptname = 'boss_commander_stoutbeard' where entr #define SAY_KILL -1576022 #define SAY_DEATH -1576023 -struct TRINITY_DLL_DECL boss_commander_stoutbeardAI : public ScriptedAI +struct boss_commander_stoutbeardAI : public ScriptedAI { boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/nexus/nexus/instance_nexus.cpp b/src/scripts/northrend/nexus/nexus/instance_nexus.cpp index d04a1b595cb..fd05f9c11ed 100644 --- a/src/scripts/northrend/nexus/nexus/instance_nexus.cpp +++ b/src/scripts/northrend/nexus/nexus/instance_nexus.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define NUMBER_OF_ENCOUNTERS 4 -struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance +struct instance_nexus : public ScriptedInstance { instance_nexus(Map *pMap) : ScriptedInstance(pMap) { Initialize(); } diff --git a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp index 64f60b390d1..8254aabbaf4 100644 --- a/src/scripts/northrend/nexus/oculus/boss_drakos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_drakos.cpp @@ -36,7 +36,7 @@ enum Yells SAY_STOMP_3 = -1578011 }; -struct TRINITY_DLL_DECL boss_drakosAI : public ScriptedAI +struct boss_drakosAI : public ScriptedAI { boss_drakosAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/nexus/oculus/boss_eregos.cpp b/src/scripts/northrend/nexus/oculus/boss_eregos.cpp index e96aa70afb3..b987f8f2b63 100644 --- a/src/scripts/northrend/nexus/oculus/boss_eregos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_eregos.cpp @@ -70,7 +70,7 @@ enum EmeraldDrake SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels. }; -struct TRINITY_DLL_DECL boss_eregosAI : public ScriptedAI +struct boss_eregosAI : public ScriptedAI { boss_eregosAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/nexus/oculus/boss_urom.cpp b/src/scripts/northrend/nexus/oculus/boss_urom.cpp index 34044ef4a4f..9d445cff68a 100644 --- a/src/scripts/northrend/nexus/oculus/boss_urom.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_urom.cpp @@ -40,7 +40,7 @@ enum Yells SAY_SUMMON_3 = -1578021 }; -struct TRINITY_DLL_DECL boss_uromAI : public ScriptedAI +struct boss_uromAI : public ScriptedAI { boss_uromAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/nexus/oculus/boss_varos.cpp b/src/scripts/northrend/nexus/oculus/boss_varos.cpp index 05c5cea8472..47df963ae72 100644 --- a/src/scripts/northrend/nexus/oculus/boss_varos.cpp +++ b/src/scripts/northrend/nexus/oculus/boss_varos.cpp @@ -38,7 +38,7 @@ enum Yells SAY_SPAWN = -1578029 }; -struct TRINITY_DLL_DECL boss_varosAI : public ScriptedAI +struct boss_varosAI : public ScriptedAI { boss_varosAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/nexus/oculus/instance_oculus.cpp b/src/scripts/northrend/nexus/oculus/instance_oculus.cpp index d57738b959c..d17e1cd4610 100644 --- a/src/scripts/northrend/nexus/oculus/instance_oculus.cpp +++ b/src/scripts/northrend/nexus/oculus/instance_oculus.cpp @@ -9,7 +9,7 @@ 2 - Mage-Lord Urom 3 - Ley-Guardian Eregos */ -struct TRINITY_DLL_DECL instance_oculus : public ScriptedInstance +struct instance_oculus : public ScriptedInstance { instance_oculus(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp index 01c13b84f83..d63d12a64f0 100644 --- a/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp +++ b/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp @@ -169,7 +169,7 @@ Waypoint m_aDragonCommon[MAX_WAYPOINT]= ## Boss Sartharion ######*/ -struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI +struct boss_sartharionAI : public ScriptedAI { boss_sartharionAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -544,7 +544,7 @@ enum VespText }; //to control each dragons common abilities -struct TRINITY_DLL_DECL dummy_dragonAI : public ScriptedAI +struct dummy_dragonAI : public ScriptedAI { dummy_dragonAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -720,7 +720,7 @@ struct TRINITY_DLL_DECL dummy_dragonAI : public ScriptedAI ## Mob Tenebron ######*/ -struct TRINITY_DLL_DECL mob_tenebronAI : public dummy_dragonAI +struct mob_tenebronAI : public dummy_dragonAI { mob_tenebronAI(Creature* pCreature) : dummy_dragonAI(pCreature) {} @@ -790,7 +790,7 @@ CreatureAI* GetAI_mob_tenebron(Creature* pCreature) ## Mob Shadron ######*/ -struct TRINITY_DLL_DECL mob_shadronAI : public dummy_dragonAI +struct mob_shadronAI : public dummy_dragonAI { mob_shadronAI(Creature* pCreature) : dummy_dragonAI(pCreature) {} @@ -866,7 +866,7 @@ CreatureAI* GetAI_mob_shadron(Creature* pCreature) ## Mob Vesperon ######*/ -struct TRINITY_DLL_DECL mob_vesperonAI : public dummy_dragonAI +struct mob_vesperonAI : public dummy_dragonAI { mob_vesperonAI(Creature* pCreature) : dummy_dragonAI(pCreature) {} @@ -936,7 +936,7 @@ CreatureAI* GetAI_mob_vesperon(Creature* pCreature) ## Mob Acolyte of Shadron ######*/ -struct TRINITY_DLL_DECL mob_acolyte_of_shadronAI : public ScriptedAI +struct mob_acolyte_of_shadronAI : public ScriptedAI { mob_acolyte_of_shadronAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -1000,7 +1000,7 @@ CreatureAI* GetAI_mob_acolyte_of_shadron(Creature* pCreature) ## Mob Acolyte of Vesperon ######*/ -struct TRINITY_DLL_DECL mob_acolyte_of_vesperonAI : public ScriptedAI +struct mob_acolyte_of_vesperonAI : public ScriptedAI { mob_acolyte_of_vesperonAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -1044,7 +1044,7 @@ CreatureAI* GetAI_mob_acolyte_of_vesperon(Creature* pCreature) ## Mob Twilight Eggs ######*/ -struct TRINITY_DLL_DECL mob_twilight_eggsAI : public ScriptedAI +struct mob_twilight_eggsAI : public ScriptedAI { mob_twilight_eggsAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -1068,7 +1068,7 @@ CreatureAI* GetAI_mob_twilight_eggs(Creature* pCreature) ## Mob Twilight Whelps ######*/ -struct TRINITY_DLL_DECL mob_twilight_whelpAI : public ScriptedAI +struct mob_twilight_whelpAI : public ScriptedAI { mob_twilight_whelpAI(Creature* pCreature) : ScriptedAI(pCreature) {} diff --git a/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp index 1d4b38270d9..d80985dc300 100644 --- a/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp +++ b/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp @@ -7,7 +7,7 @@ 0 - Sartharion */ -struct TRINITY_DLL_DECL instance_obsidian_sanctum : public ScriptedInstance +struct instance_obsidian_sanctum : public ScriptedInstance { instance_obsidian_sanctum(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/sholazar_basin.cpp b/src/scripts/northrend/sholazar_basin.cpp index 06519ee6306..fb820b4667e 100644 --- a/src/scripts/northrend/sholazar_basin.cpp +++ b/src/scripts/northrend/sholazar_basin.cpp @@ -48,7 +48,7 @@ enum eRainspeaker FACTION_ESCORTEE_H = 775 }; -struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI +struct npc_injured_rainspeaker_oracleAI : public npc_escortAI { npc_injured_rainspeaker_oracleAI(Creature* c) : npc_escortAI(c) { c_guid = c->GetGUID(); } @@ -269,7 +269,7 @@ bool GossipSelect_npc_avatar_of_freya(Player* pPlayer, Creature* pCreature, uint ## npc_geezle ######*/ -struct TRINITY_DLL_DECL npc_bushwhackerAI : public ScriptedAI +struct npc_bushwhackerAI : public ScriptedAI { npc_bushwhackerAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/storm_peaks.cpp b/src/scripts/northrend/storm_peaks.cpp index c27c3aaede6..134a6a6c3b3 100644 --- a/src/scripts/northrend/storm_peaks.cpp +++ b/src/scripts/northrend/storm_peaks.cpp @@ -30,7 +30,7 @@ enum eAgnetta FACTION_HOSTILE_AT1 = 45 }; -struct TRINITY_DLL_DECL npc_agnetta_tyrsdottarAI : public ScriptedAI +struct npc_agnetta_tyrsdottarAI : public ScriptedAI { npc_agnetta_tyrsdottarAI(Creature* pCreature) : ScriptedAI(pCreature) { } @@ -178,7 +178,7 @@ enum eGoblinPrisoner GO_RUSTY_CAGE = 191544 }; -struct TRINITY_DLL_DECL npc_goblin_prisonerAI : public ScriptedAI +struct npc_goblin_prisonerAI : public ScriptedAI { npc_goblin_prisonerAI(Creature* pCreature) : ScriptedAI (pCreature){} @@ -215,7 +215,7 @@ enum eVictoriousChallenger SPELL_REND_VC = 11977 }; -struct TRINITY_DLL_DECL npc_victorious_challengerAI : public ScriptedAI +struct npc_victorious_challengerAI : public ScriptedAI { npc_victorious_challengerAI(Creature* pCreature) : ScriptedAI(pCreature) {} 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(); }; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index f9f503177b2..cb24b0d0c1f 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -68,7 +68,7 @@ enum eEnums SPELL_SHADOW_AXE_SUMMON = 42749 }; -struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI +struct boss_ingvar_the_plundererAI : public ScriptedAI { boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) { @@ -286,7 +286,7 @@ enum eSpells SPELL_INGVAR_TRANSFORM = 42796 }; -struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI +struct mob_annhylde_the_callerAI : public ScriptedAI { mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) { @@ -392,7 +392,7 @@ enum eShadowAxe H_SPELL_SHADOW_AXE_DAMAGE = 59719 }; -struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI +struct mob_ingvar_throw_dummyAI : public ScriptedAI { mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index 4af56fdbad8..2f4bfbc5225 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -61,7 +61,7 @@ float AttackLoc[3]={197.636, 194.046, 40.8164}; bool ShatterFrostTomb; // needed for achievement: On The Rocks(1919) -struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI +struct mob_frost_tombAI : public ScriptedAI { mob_frost_tombAI(Creature *c) : ScriptedAI(c) { @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI +struct boss_kelesethAI : public ScriptedAI { boss_kelesethAI(Creature *c) : ScriptedAI(c) { @@ -229,7 +229,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI +struct mob_vrykul_skeletonAI : public ScriptedAI { mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index 2b6c9c9a855..61698614ccb 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -58,7 +58,7 @@ enum eEnums MOB_DALRONN_GHOST = 27389 }; -struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI +struct boss_skarvald_the_constructorAI : public ScriptedAI { boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) { @@ -201,7 +201,7 @@ CreatureAI* GetAI_boss_skarvald_the_constructor(Creature* pCreature) return new boss_skarvald_the_constructorAI (pCreature); } -struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI +struct boss_dalronn_the_controllerAI : public ScriptedAI { boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index 2a3bafc811a..2a471fb07de 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -49,7 +49,7 @@ EndScriptData */ 2 - Ingvar the Plunderer */ -struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance +struct instance_utgarde_keep : public ScriptedInstance { instance_utgarde_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp index a7d1d91ac1f..65e644f00ec 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp @@ -26,7 +26,7 @@ uint32 entry_search[3] = 186611 }; -struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI +struct npc_dragonflayer_forge_masterAI : public ScriptedAI { npc_dragonflayer_forge_masterAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index 5637e157fc3..cb37b9fe50c 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -68,7 +68,7 @@ enum Phase PHASE_NONE }; -struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI +struct boss_palehoofAI : public ScriptedAI { boss_palehoofAI(Creature *c) : ScriptedAI(c) { @@ -252,7 +252,7 @@ enum RavenousSpells SPELL_TERRIFYING_ROAR = 48144 }; -struct TRINITY_DLL_DECL mob_ravenous_furbolgAI : public ScriptedAI +struct mob_ravenous_furbolgAI : public ScriptedAI { mob_ravenous_furbolgAI(Creature *c) : ScriptedAI(c) { @@ -358,7 +358,7 @@ enum FrenziedSpells SPELL_ENRAGE_2 = 48142 }; -struct TRINITY_DLL_DECL mob_frenzied_worgenAI : public ScriptedAI +struct mob_frenzied_worgenAI : public ScriptedAI { mob_frenzied_worgenAI(Creature *c) : ScriptedAI(c) { @@ -467,7 +467,7 @@ enum FerociousSpells SPELL_STOMP = 48131 }; -struct TRINITY_DLL_DECL mob_ferocious_rhinoAI : public ScriptedAI +struct mob_ferocious_rhinoAI : public ScriptedAI { mob_ferocious_rhinoAI(Creature *c) : ScriptedAI(c) { @@ -580,7 +580,7 @@ enum MassiveAdds CREATURE_JORMUNGAR_WORM = 27228 }; -struct TRINITY_DLL_DECL mob_massive_jormungarAI : public ScriptedAI +struct mob_massive_jormungarAI : public ScriptedAI { mob_massive_jormungarAI(Creature *c) : ScriptedAI(c) { @@ -680,7 +680,7 @@ CreatureAI* GetAI_mob_massive_jormungar(Creature* pCreature) } -struct TRINITY_DLL_DECL mob_palehoof_orbAI : public ScriptedAI +struct mob_palehoof_orbAI : public ScriptedAI { mob_palehoof_orbAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index efb943aa6f9..cf965bdb331 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -67,7 +67,7 @@ enum CombatPhase SKADI }; -struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI +struct boss_skadiAI : public ScriptedAI { boss_skadiAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 4fb5d273312..5cb20923fd2 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -79,7 +79,7 @@ static Locations RitualChannelerLocations[]= {291.39, -350.89, 90.54} }; -struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI +struct boss_svalaAI : public ScriptedAI { boss_svalaAI(Creature *c) : ScriptedAI(c) { @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_ritual_channelerAI : public Scripted_NoMovementAI +struct mob_ritual_channelerAI : public Scripted_NoMovementAI { mob_ritual_channelerAI(Creature *c) :Scripted_NoMovementAI(c) { @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL mob_ritual_channelerAI : public Scripted_NoMovementAI } }; -struct TRINITY_DLL_DECL boss_svala_sorrowgraveAI : public ScriptedAI +struct boss_svala_sorrowgraveAI : public ScriptedAI { boss_svala_sorrowgraveAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index 6f1d8d7196f..f301c98e2c5 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -80,7 +80,7 @@ static ActiveBoatStruct ActiveBot[4] = {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310, -314.761, 104.756, 413.992, -314.703, 107.995, 3.157} }; -struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI +struct boss_ymironAI : public ScriptedAI { boss_ymironAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp index 5c4a53156d2..d00d27c7203 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp @@ -14,7 +14,7 @@ #define ENTRY_KING_YMIRON_DOOR 192174 #define ENTRY_GORK_PALEHOOF_SPHERE 188593 -struct TRINITY_DLL_DECL instance_pinnacle : public ScriptedInstance +struct instance_pinnacle : public ScriptedInstance { instance_pinnacle(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp b/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp index 08817affdfb..a4f54055b3a 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp @@ -35,7 +35,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_archavon_warder' WHERE `entry`= #define EVENT_SHIELD_CRUSH 6 //set = 30s cd #define EVENT_WHIRL 8 //set= 10s cd -struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI +struct boss_archavonAI : public ScriptedAI { boss_archavonAI(Creature *c) : ScriptedAI(c) { @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI /*###### ## Mob Archavon Warder ######*/ -struct TRINITY_DLL_DECL mob_warderAI : public ScriptedAI //npc 32353 +struct mob_warderAI : public ScriptedAI //npc 32353 { mob_warderAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp index 95240f92d1f..327895461ed 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp @@ -40,7 +40,7 @@ struct Position TempestMinions[MAX_TEMPEST_MINIONS] = /*###### ## Emalon the Storm Watcher ######*/ -struct TRINITY_DLL_DECL boss_emalonAI : public BossAI +struct boss_emalonAI : public BossAI { boss_emalonAI(Creature *c) : BossAI(c, DATA_EMALON_EVENT) { @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public BossAI /*###### ## Tempest Minion ######*/ -struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI +struct mob_tempest_minionAI : public ScriptedAI { mob_tempest_minionAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp b/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp index d1f0f280edb..67d946c341c 100644 --- a/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp +++ b/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp @@ -8,7 +8,7 @@ 2 - Emalon the Storm Watcher event */ -struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance +struct instance_archavon : public ScriptedInstance { instance_archavon(Map *Map) : ScriptedInstance(Map) {Initialize();}; diff --git a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp index 770c38ddaca..f139b10b4bd 100644 --- a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -39,7 +39,7 @@ enum Yells SAY_SPECIAL_ATTACK_2 = -1608009 }; -struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI +struct boss_cyanigosaAI : public ScriptedAI { boss_cyanigosaAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp index 302425966ed..576e6195729 100644 --- a/src/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp @@ -38,7 +38,7 @@ enum Yells SAY_BOTH_ADDS_KILLED = -1608017 }; -struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI +struct boss_erekemAI : public ScriptedAI { boss_erekemAI(Creature *c) : ScriptedAI(c) { @@ -233,7 +233,7 @@ enum GuardSpells SPELL_STRIKE = 14516 }; -struct TRINITY_DLL_DECL mob_erekem_guardAI : public ScriptedAI +struct mob_erekem_guardAI : public ScriptedAI { mob_erekem_guardAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index fb916fd02e9..aa856c5723a 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -79,7 +79,7 @@ static Position SpawnLoc[MAX_SPAWN_LOC]= {1935.50, 796.224, 52.492, 4.224}, }; -struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI +struct boss_ichoronAI : public ScriptedAI { boss_ichoronAI(Creature* pCreature) : ScriptedAI(pCreature), m_waterElements(pCreature) { @@ -312,7 +312,7 @@ CreatureAI* GetAI_boss_ichoron(Creature* pCreature) return new boss_ichoronAI (pCreature); } -struct TRINITY_DLL_DECL mob_ichor_globuleAI : public ScriptedAI +struct mob_ichor_globuleAI : public ScriptedAI { mob_ichor_globuleAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp b/src/scripts/northrend/violet_hold/boss_lavanthor.cpp index 8743614675f..f97b651334a 100644 --- a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp +++ b/src/scripts/northrend/violet_hold/boss_lavanthor.cpp @@ -23,7 +23,7 @@ enum Spells H_SPELL_LAVA_BURN = 59594 }; -struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI +struct boss_lavanthorAI : public ScriptedAI { boss_lavanthorAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/violet_hold/boss_moragg.cpp b/src/scripts/northrend/violet_hold/boss_moragg.cpp index f76a31403c1..df0c5d6c310 100644 --- a/src/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/scripts/northrend/violet_hold/boss_moragg.cpp @@ -19,7 +19,7 @@ enum Spells SPELL_OPTIC_LINK = 54396 }; -struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI +struct boss_moraggAI : public ScriptedAI { boss_moraggAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/scripts/northrend/violet_hold/boss_xevozz.cpp index d02adee1280..b933932f2f2 100644 --- a/src/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -64,7 +64,7 @@ enum Yells SAY_SUMMON_ENERGY = -1608036 }; -struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI +struct boss_xevozzAI : public ScriptedAI { boss_xevozzAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -216,7 +216,7 @@ CreatureAI* GetAI_boss_xevozz(Creature* pCreature) return new boss_xevozzAI (pCreature); } -struct TRINITY_DLL_DECL mob_ethereal_sphereAI : public ScriptedAI +struct mob_ethereal_sphereAI : public ScriptedAI { mob_ethereal_sphereAI(Creature* pCreature) : ScriptedAI(pCreature) { diff --git a/src/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/scripts/northrend/violet_hold/boss_zuramat.cpp index 4a6ef848575..26e718672a9 100644 --- a/src/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -38,7 +38,7 @@ enum Yells SAY_WHISPER = -1608044 }; -struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI +struct boss_zuramatAI : public ScriptedAI { boss_zuramatAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/scripts/northrend/violet_hold/instance_violet_hold.cpp index 8abe9cee5d4..fb0a96942a6 100644 --- a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/instance_violet_hold.cpp @@ -39,7 +39,7 @@ const Position PortalLocation[] = {1890.64, 753.471, 48.7224, 1.71042} }; -struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance +struct instance_violet_hold : public ScriptedInstance { instance_violet_hold(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/northrend/violet_hold/violet_hold.cpp b/src/scripts/northrend/violet_hold/violet_hold.cpp index e402c8f3f21..642d65a13f1 100644 --- a/src/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/violet_hold.cpp @@ -32,7 +32,7 @@ enum eSinclari const Position DoorPosition = { 1828.300049, 797.309021, 46.135502, 1.48353}; const Position MovePosition = { 1806.955566, 803.851807, 44.363323}; -struct TRINITY_DLL_DECL npc_sinclariAI : public ScriptedAI +struct npc_sinclariAI : public ScriptedAI { npc_sinclariAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -178,7 +178,7 @@ bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 uiSe return true; } -struct TRINITY_DLL_DECL npc_teleportation_portalAI : public ScriptedAI +struct npc_teleportation_portalAI : public ScriptedAI { npc_teleportation_portalAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/northrend/zuldrak.cpp b/src/scripts/northrend/zuldrak.cpp index 641479d66a7..b7d6ff63e8f 100644 --- a/src/scripts/northrend/zuldrak.cpp +++ b/src/scripts/northrend/zuldrak.cpp @@ -33,7 +33,7 @@ enum eDrakuruShackles NPC_RAGECLAW = 29686 }; -struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI +struct npc_drakuru_shacklesAI : public ScriptedAI { npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -108,7 +108,7 @@ const char * SAY_RAGECLAW_3 = "No more mister nice wolvar!"; #define SAY_RAGECLAW RAND(SAY_RAGECLAW_1,SAY_RAGECLAW_2,SAY_RAGECLAW_3) -struct TRINITY_DLL_DECL npc_captured_rageclawAI : public ScriptedAI +struct npc_captured_rageclawAI : public ScriptedAI { npc_captured_rageclawAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -236,7 +236,7 @@ const Position SpawnPosition[] = {5762.054199, -2954.385010, 273.826955, 5.108289} //yggdras }; -struct TRINITY_DLL_DECL npc_gurgthockAI : public ScriptedAI +struct npc_gurgthockAI : public ScriptedAI { npc_gurgthockAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -439,7 +439,7 @@ enum eOrinokoTuskbreaker SAY_CALL_FOR_HELP = -1571032 }; -struct TRINITY_DLL_DECL npc_orinoko_tuskbreakerAI : public ScriptedAI +struct npc_orinoko_tuskbreakerAI : public ScriptedAI { npc_orinoko_tuskbreakerAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -574,7 +574,7 @@ enum eKorrakBloodrager SPELL_ENRAGE = 42745 }; -struct TRINITY_DLL_DECL npc_korrak_bloodragerAI : public npc_escortAI +struct npc_korrak_bloodragerAI : public npc_escortAI { npc_korrak_bloodragerAI(Creature* pCreature) : npc_escortAI(pCreature) { @@ -678,7 +678,7 @@ enum eYggdras SPELL_JORMUNGAR_SPAWN = 55859 }; -struct TRINITY_DLL_DECL npc_yggdrasAI : public ScriptedAI +struct npc_yggdrasAI : public ScriptedAI { npc_yggdrasAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -760,7 +760,7 @@ enum eStinkbeard ## npc_stinkbeard ####*/ -struct TRINITY_DLL_DECL npc_stinkbeardAI : public npc_escortAI +struct npc_stinkbeardAI : public npc_escortAI { npc_stinkbeardAI(Creature* pCreature) : npc_escortAI(pCreature) { @@ -867,7 +867,7 @@ CreatureAI* GetAI_npc_stinkbeard(Creature* pCreature) ## npc_released_offspring_harkoa ####*/ -struct TRINITY_DLL_DECL npc_released_offspring_harkoaAI : public ScriptedAI +struct npc_released_offspring_harkoaAI : public ScriptedAI { npc_released_offspring_harkoaAI(Creature* pCreature) : ScriptedAI(pCreature) {} diff --git a/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index a16f838d85d..aaeb92d3ba9 100644 --- a/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -39,7 +39,7 @@ EndContentData */ #define SPELL_FREEZING_TRAP 37368 #define SPELL_HAMMER_OF_JUSTICE 37369 -struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI +struct mob_stolen_soulAI : public ScriptedAI { mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {} @@ -141,7 +141,7 @@ CreatureAI* GetAI_mob_stolen_soul(Creature* pCreature) #define ENTRY_STOLEN_SOUL 18441 -struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI +struct boss_exarch_maladaarAI : public ScriptedAI { boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) { @@ -291,7 +291,7 @@ CreatureAI* GetAI_boss_exarch_maladaar(Creature* pCreature) #define SPELL_AV_MORTAL_STRIKE 16856 #define SPELL_AV_SUNDER_ARMOR 16145 -struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI +struct mob_avatar_of_martyredAI : public ScriptedAI { mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index c5670b72d07..fe8e00cea87 100644 --- a/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define EMOTE_FOCUSES_ON "focuses on " -struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI +struct boss_shirrak_the_dead_watcherAI : public ScriptedAI { boss_shirrak_the_dead_watcherAI(Creature *c) : ScriptedAI(c) { @@ -151,7 +151,7 @@ CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature* pCreature) return new boss_shirrak_the_dead_watcherAI (pCreature); } -struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI +struct mob_focus_fireAI : public ScriptedAI { mob_focus_fireAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index be2aff204a2..56826ce0a5f 100644 --- a/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -53,7 +53,7 @@ enum ePrince NR_INITIAL_BEACONS = 3 }; -struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI +struct boss_nexusprince_shaffarAI : public ScriptedAI { boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c), summons(me) { HasTaunted = false; } @@ -212,7 +212,7 @@ enum eEnums SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 }; -struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI +struct mob_ethereal_beaconAI : public ScriptedAI { mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c) { @@ -297,7 +297,7 @@ enum eEthereal SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 }; -struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI +struct mob_ethereal_apprenticeAI : public ScriptedAI { mob_ethereal_apprenticeAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp index e991f7fc2b7..fe41f2fa404 100644 --- a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp @@ -39,7 +39,7 @@ EndScriptData */ #define SPELL_DARK_SHELL 32358 #define H_SPELL_DARK_SHELL 38759 -struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI +struct boss_pandemoniusAI : public ScriptedAI { boss_pandemoniusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp index 8af5f2d8b9c..badcd649635 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -51,7 +51,7 @@ EndScriptData */ #define SPELL_FROST_BUFFET DUNGEON_MODE(33528, 38142) #define SPELL_SHADOW_BUFFET DUNGEON_MODE(33529, 38143) -struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI +struct boss_darkweaver_sythAI : public ScriptedAI { boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) { @@ -191,7 +191,7 @@ CreatureAI* GetAI_boss_darkweaver_syth(Creature* pCreature) /* ELEMENTALS */ -struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI +struct mob_syth_fireAI : public ScriptedAI { mob_syth_fireAI(Creature *c) : ScriptedAI(c) { @@ -239,7 +239,7 @@ CreatureAI* GetAI_mob_syth_fire(Creature* pCreature) return new mob_syth_fireAI (pCreature); } -struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI +struct mob_syth_arcaneAI : public ScriptedAI { mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) { @@ -287,7 +287,7 @@ CreatureAI* GetAI_mob_syth_arcane(Creature* pCreature) return new mob_syth_arcaneAI (pCreature); } -struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI +struct mob_syth_frostAI : public ScriptedAI { mob_syth_frostAI(Creature *c) : ScriptedAI(c) { @@ -335,7 +335,7 @@ CreatureAI* GetAI_mob_syth_frost(Creature* pCreature) return new mob_syth_frostAI (pCreature); } -struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI +struct mob_syth_shadowAI : public ScriptedAI { mob_syth_shadowAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index b2274c2aa87..a1f6e9816a5 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -50,7 +50,7 @@ EndScriptData */ #define SPELL_ARCANE_EXPLOSION 38197 #define H_SPELL_ARCANE_EXPLOSION 40425 -struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI +struct boss_talon_king_ikissAI : public ScriptedAI { boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp index b69e9a53ea1..ef9ae137298 100644 --- a/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp +++ b/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp @@ -30,7 +30,7 @@ enum eEnums IKISS_DOOR = 177203, }; -struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance +struct instance_sethekk_halls : public ScriptedInstance { instance_sethekk_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 9b2865330bf..5227a2c4d49 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -42,7 +42,7 @@ enum eEnums SPELL_ENRAGE = 34970 }; -struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI +struct boss_ambassador_hellmawAI : public npc_escortAI { boss_ambassador_hellmawAI(Creature* pCreature) : npc_escortAI(pCreature) { diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index b2ddb601738..02e74e06445 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -52,7 +52,7 @@ EndScriptData */ #define SAY2_HELP -1555026 #define SAY2_DEATH -1555027 -struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI +struct boss_blackheart_the_inciterAI : public ScriptedAI { boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index bb18319b9ad..f8f015634b6 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -60,7 +60,7 @@ float VoidPortalCoords[5][3] = {-261.4533, -297.3298, 17.1} }; -struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI +struct mob_voidtravelerAI : public ScriptedAI { mob_voidtravelerAI(Creature *c) : ScriptedAI(c) { @@ -118,7 +118,7 @@ CreatureAI* GetAI_mob_voidtraveler(Creature* pCreature) return new mob_voidtravelerAI (pCreature); } -struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI +struct boss_grandmaster_vorpilAI : public ScriptedAI { boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp index 0b8c0f6999b..60d8f5e63d2 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp @@ -34,7 +34,7 @@ EndScriptData */ #define SPELL_SONIC_SHOCK 38797 #define SPELL_THUNDERING_STORM 39365 -struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI +struct boss_murmurAI : public ScriptedAI { boss_murmurAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index 72a69915865..3cf11d776e7 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -36,7 +36,7 @@ EndScriptData */ 4 - Murmur event */ -struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance +struct instance_shadow_labyrinth : public ScriptedInstance { instance_shadow_labyrinth(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/black_temple/boss_bloodboil.cpp b/src/scripts/outland/black_temple/boss_bloodboil.cpp index 7c23c749ba0..a0fa5ef8311 100644 --- a/src/scripts/outland/black_temple/boss_bloodboil.cpp +++ b/src/scripts/outland/black_temple/boss_bloodboil.cpp @@ -53,7 +53,7 @@ EndScriptData */ //This is used to sort the players by distance in preparation for the Bloodboil cast. -struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI +struct boss_gurtogg_bloodboilAI : public ScriptedAI { boss_gurtogg_bloodboilAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/black_temple/boss_illidan.cpp b/src/scripts/outland/black_temple/boss_illidan.cpp index 3613f288635..6f1e4cc0e59 100644 --- a/src/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/scripts/outland/black_temple/boss_illidan.cpp @@ -363,7 +363,7 @@ static Animation DemonTransformation[]= #define EMOTE_UNABLE_TO_SUMMON "is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter." /************************************** Illidan's AI ***************************************/ -struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI +struct boss_illidan_stormrageAI : public ScriptedAI { boss_illidan_stormrageAI(Creature* c) : ScriptedAI(c), Summons(m_creature) { @@ -886,7 +886,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI /********************************** End of Illidan AI ******************************************/ -struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI +struct flame_of_azzinothAI : public ScriptedAI { flame_of_azzinothAI(Creature *c) : ScriptedAI(c) {} @@ -966,7 +966,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI }; /******* Functions and vars for Akama's AI ******/ -struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI +struct npc_akama_illidanAI : public ScriptedAI { npc_akama_illidanAI(Creature* c) : ScriptedAI(c) { @@ -1396,7 +1396,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI +struct boss_maievAI : public ScriptedAI { boss_maievAI(Creature *c) : ScriptedAI(c) {}; @@ -1622,7 +1622,7 @@ bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature) return true; } -struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI +struct cage_trap_triggerAI : public ScriptedAI { cage_trap_triggerAI(Creature *c) : ScriptedAI(c) {} @@ -1698,7 +1698,7 @@ bool GOHello_cage_trap(Player* pPlayer, GameObject* pGo) return true; } -struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI +struct shadow_demonAI : public ScriptedAI { shadow_demonAI(Creature *c) : ScriptedAI(c) {} @@ -1738,7 +1738,7 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI }; // Shadowfiends interact with Illidan, setting more targets in Illidan's hashmap -struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI +struct mob_parasitic_shadowfiendAI : public ScriptedAI { mob_parasitic_shadowfiendAI(Creature* c) : ScriptedAI(c) { @@ -1807,7 +1807,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL blade_of_azzinothAI : public NullCreatureAI +struct blade_of_azzinothAI : public NullCreatureAI { blade_of_azzinothAI(Creature* c) : NullCreatureAI(c) {} diff --git a/src/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/scripts/outland/black_temple/boss_mother_shahraz.cpp index 4503a449ce3..1a18d5fc36c 100644 --- a/src/scripts/outland/black_temple/boss_mother_shahraz.cpp +++ b/src/scripts/outland/black_temple/boss_mother_shahraz.cpp @@ -76,7 +76,7 @@ static Locations TeleportPoint[]= {965.997, 278.398, 195.777} }; -struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI +struct boss_shahrazAI : public ScriptedAI { boss_shahrazAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp index 96bd840be0f..43bf9471104 100644 --- a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp +++ b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp @@ -99,7 +99,7 @@ static Position2d Coords[]= {450.4, 168.3} }; -struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI +struct npc_enslaved_soulAI : public ScriptedAI { npc_enslaved_soulAI(Creature *c) : ScriptedAI(c) {} @@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI void JustDied(Unit *killer); }; -struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI +struct boss_reliquary_of_soulsAI : public ScriptedAI { boss_reliquary_of_soulsAI(Creature *c) : ScriptedAI(c) { @@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI +struct boss_essence_of_sufferingAI : public ScriptedAI { boss_essence_of_sufferingAI(Creature *c) : ScriptedAI(c) {} @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI +struct boss_essence_of_desireAI : public ScriptedAI { boss_essence_of_desireAI(Creature *c) : ScriptedAI(c) {} @@ -536,7 +536,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI +struct boss_essence_of_angerAI : public ScriptedAI { boss_essence_of_angerAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/scripts/outland/black_temple/boss_shade_of_akama.cpp index 2cc8dc69549..23d298ff05c 100644 --- a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp +++ b/src/scripts/outland/black_temple/boss_shade_of_akama.cpp @@ -105,7 +105,7 @@ static Location BrokenWP[]= const uint32 spawnEntries[4]= { 23523, 23318, 23524 }; -struct TRINITY_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI +struct mob_ashtongue_channelerAI : public ScriptedAI { mob_ashtongue_channelerAI(Creature* c) : ScriptedAI(c) {ShadeGUID = 0;} @@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_channelerAI : public ScriptedAI void UpdateAI(const uint32 diff) {} }; -struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI +struct mob_ashtongue_sorcererAI : public ScriptedAI { mob_ashtongue_sorcererAI(Creature* c) : ScriptedAI(c) {ShadeGUID = 0;} @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI +struct boss_shade_of_akamaAI : public ScriptedAI { boss_shade_of_akamaAI(Creature* c) : ScriptedAI(c), summons(m_creature) { @@ -496,7 +496,7 @@ void mob_ashtongue_sorcererAI::JustDied(Unit* killer) else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama."); } -struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI +struct npc_akamaAI : public ScriptedAI { npc_akamaAI(Creature* c) : ScriptedAI(c), summons(m_creature) { diff --git a/src/scripts/outland/black_temple/boss_supremus.cpp b/src/scripts/outland/black_temple/boss_supremus.cpp index b17ad349bab..8290fa6399b 100644 --- a/src/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/scripts/outland/black_temple/boss_supremus.cpp @@ -51,7 +51,7 @@ EndScriptData */ #define GCD_CAST 1 -struct TRINITY_DLL_DECL molten_flameAI : public NullCreatureAI +struct molten_flameAI : public NullCreatureAI { molten_flameAI(Creature *c) : NullCreatureAI(c) {} @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL molten_flameAI : public NullCreatureAI } }; -struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI +struct boss_supremusAI : public ScriptedAI { boss_supremusAI(Creature *c) : ScriptedAI(c), summons(m_creature) { @@ -225,7 +225,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL npc_volcanoAI : public Scripted_NoMovementAI +struct npc_volcanoAI : public Scripted_NoMovementAI { npc_volcanoAI(Creature *c) : Scripted_NoMovementAI(c) {} diff --git a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp index 8002b7ffc37..f143f2e7323 100644 --- a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp +++ b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp @@ -46,10 +46,10 @@ EndScriptData */ #define SPELL_ATROPHY 40327 // Shadowy Constructs use this when they get within melee range of a player -#define CREATURE_DOOM_BLOSSOM 23123 -#define CREATURE_SHADOWY_CONSTRUCT 23111 +#define CREATURE_DOOM_BLOSSOM 23123 +#define CREATURE_SHADOWY_CONSTRUCT 23111 -struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI +struct mob_doom_blossomAI : public ScriptedAI { mob_doom_blossomAI(Creature *c) : ScriptedAI(c) {} @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI void SetTeronGUID(uint64 guid){ TeronGUID = guid; } }; -struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI +struct mob_shadowy_constructAI : public ScriptedAI { mob_shadowy_constructAI(Creature* c) : ScriptedAI(c) {} @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI +struct boss_teron_gorefiendAI : public ScriptedAI { boss_teron_gorefiendAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/scripts/outland/black_temple/boss_warlord_najentus.cpp index 58223e98d08..230660214a8 100644 --- a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp +++ b/src/scripts/outland/black_temple/boss_warlord_najentus.cpp @@ -58,7 +58,7 @@ enum eEnums GCD_YELL = 2 }; -struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI +struct boss_najentusAI : public ScriptedAI { boss_najentusAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/black_temple/illidari_council.cpp b/src/scripts/outland/black_temple/illidari_council.cpp index d8d709631ad..078f065cb31 100644 --- a/src/scripts/outland/black_temple/illidari_council.cpp +++ b/src/scripts/outland/black_temple/illidari_council.cpp @@ -107,7 +107,7 @@ static CouncilYells CouncilEnrage[]= #define SPELL_BERSERK 45078 -struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedAI +struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI { mob_blood_elf_council_voice_triggerAI(Creature* c) : ScriptedAI(c) { @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA } }; -struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI +struct mob_illidari_councilAI : public ScriptedAI { mob_illidari_councilAI(Creature *c) : ScriptedAI(c) { @@ -348,7 +348,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI +struct boss_illidari_councilAI : public ScriptedAI { boss_illidari_councilAI(Creature* c) : ScriptedAI(c) { @@ -435,7 +435,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_councilAI +struct boss_gathios_the_shattererAI : public boss_illidari_councilAI { boss_gathios_the_shattererAI(Creature *c) : boss_illidari_councilAI(c) {} @@ -550,7 +550,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun } }; -struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI +struct boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI { boss_high_nethermancer_zerevorAI(Creature *c) : boss_illidari_councilAI(c) {} @@ -642,7 +642,7 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_ } }; -struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI +struct boss_lady_malandeAI : public boss_illidari_councilAI { boss_lady_malandeAI(Creature *c) : boss_illidari_councilAI(c) {} @@ -708,7 +708,7 @@ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI } }; -struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI +struct boss_veras_darkshadowAI : public boss_illidari_councilAI { boss_veras_darkshadowAI(Creature *c) : boss_illidari_councilAI(c) {} diff --git a/src/scripts/outland/black_temple/instance_black_temple.cpp b/src/scripts/outland/black_temple/instance_black_temple.cpp index 8d361bbf3d0..60179c99f6a 100644 --- a/src/scripts/outland/black_temple/instance_black_temple.cpp +++ b/src/scripts/outland/black_temple/instance_black_temple.cpp @@ -38,7 +38,7 @@ EndScriptData */ 8 - Illidan Stormrage Event */ -struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance +struct instance_black_temple : public ScriptedInstance { instance_black_temple(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/blades_edge_mountains.cpp b/src/scripts/outland/blades_edge_mountains.cpp index 2dcac52d29d..2725d7b66d5 100644 --- a/src/scripts/outland/blades_edge_mountains.cpp +++ b/src/scripts/outland/blades_edge_mountains.cpp @@ -46,7 +46,7 @@ bool obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five; ######*/ //TODO: add support for quest 10512 + Creature abilities -struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI +struct mobs_bladespire_ogreAI : public ScriptedAI { mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {} @@ -90,7 +90,7 @@ enum eNetherdrake SPELL_INTANGIBLE_PRESENCE = 36513 }; -struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI +struct mobs_nether_drakeAI : public ScriptedAI { mobs_nether_drakeAI(Creature *c) : ScriptedAI(c) {} @@ -248,7 +248,7 @@ enum eDaranelle SPELL_LASHHAN_CHANNEL = 36904 }; -struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI +struct npc_daranelleAI : public ScriptedAI { npc_daranelleAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/boss_doomlord_kazzak.cpp b/src/scripts/outland/boss_doomlord_kazzak.cpp index 11a889ee8b4..7b7d22a395a 100644 --- a/src/scripts/outland/boss_doomlord_kazzak.cpp +++ b/src/scripts/outland/boss_doomlord_kazzak.cpp @@ -45,7 +45,7 @@ EndScriptData */ #define SPELL_CAPTURESOUL 32966 #define SPELL_TWISTEDREFLECTION 21063 -struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI +struct boss_doomlordkazzakAI : public ScriptedAI { boss_doomlordkazzakAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/boss_doomwalker.cpp b/src/scripts/outland/boss_doomwalker.cpp index 87ef9a680d2..e0db99ec196 100644 --- a/src/scripts/outland/boss_doomwalker.cpp +++ b/src/scripts/outland/boss_doomwalker.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_MARK_DEATH 37128 #define SPELL_AURA_DEATH 37131 -struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI +struct boss_doomwalkerAI : public ScriptedAI { boss_doomwalkerAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index 6caa0ffac9c..54b8666dd97 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -92,7 +92,7 @@ EndScriptData */ #define OLUM_O 0.401581f //Fathom-Lord Karathress AI -struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI +struct boss_fathomlord_karathressAI : public ScriptedAI { boss_fathomlord_karathressAI(Creature *c) : ScriptedAI(c) { @@ -294,7 +294,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI }; //Fathom-Guard Sharkkis AI -struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI +struct boss_fathomguard_sharkkisAI : public ScriptedAI { boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c) { @@ -437,7 +437,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI }; //Fathom-Guard Tidalvess AI -struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI +struct boss_fathomguard_tidalvessAI : public ScriptedAI { boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c) { @@ -552,7 +552,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI }; //Fathom-Guard Caribdis AI -struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI +struct boss_fathomguard_caribdisAI : public ScriptedAI { boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index 7c5b828c210..3190eaf7b51 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -74,7 +74,7 @@ EndScriptData */ #define SPAWN_X_DIFF4 12.577011 #define SPAWN_Y_DIFF4 4.72702 -struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI +struct boss_hydross_the_unstableAI : public ScriptedAI { boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index a4a300a44d6..96d8c837877 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -131,7 +131,7 @@ float ShieldGeneratorChannelPos[4][4] = }; //Lady Vashj AI -struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI +struct boss_lady_vashjAI : public ScriptedAI { boss_lady_vashjAI (Creature *c) : ScriptedAI(c) { @@ -563,7 +563,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI //Enchanted Elemental //If one of them reaches Vashj he will increase her damage done by 5%. -struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI +struct mob_enchanted_elementalAI : public ScriptedAI { mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c) { @@ -650,7 +650,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI //Tainted Elemental //This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental -struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI +struct mob_tainted_elementalAI : public ScriptedAI { mob_tainted_elementalAI(Creature *c) : ScriptedAI(c) { @@ -713,7 +713,7 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI //Toxic Sporebat //Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it. -struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI +struct mob_toxic_sporebatAI : public ScriptedAI { mob_toxic_sporebatAI(Creature *c) : ScriptedAI(c) { @@ -845,7 +845,7 @@ CreatureAI* GetAI_mob_coilfang_strider(Creature* pCreature) return ai; } -struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI +struct mob_shield_generator_channelAI : public ScriptedAI { mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 55b0f7d834f..b701d2d5c33 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -65,7 +65,7 @@ EndScriptData */ #define SAY_FREE -1548019 #define SAY_DEATH -1548020 -struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI +struct mob_inner_demonAI : public ScriptedAI { mob_inner_demonAI(Creature *c) : ScriptedAI(c) { @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI } }; //Original Leotheras the Blind AI -struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI +struct boss_leotheras_the_blindAI : public ScriptedAI { boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) { @@ -557,7 +557,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI }; //Leotheras the Blind Demon Form AI -struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI +struct boss_leotheras_the_blind_demonformAI : public ScriptedAI { boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) {} @@ -618,7 +618,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI //Do NOT deal any melee damage to the target. } }; -struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI +struct mob_greyheart_spellbinderAI : public ScriptedAI { mob_greyheart_spellbinderAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index d257135bf8a..658c9316a67 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -64,7 +64,7 @@ float AddPos[9][3] = {42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z }; -struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI +struct boss_the_lurker_belowAI : public Scripted_NoMovementAI { boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c), Summons(m_creature) { @@ -368,7 +368,7 @@ CreatureAI* GetAI_mob_coilfang_guardian(Creature* pCreature) return ai; } -struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI +struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI { mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index c2bbb146cd7..ca4dfebb477 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -96,7 +96,7 @@ float MurlocCords[10][5] = #define TIDEWALKER_LURKER 21920 //Morogrim Tidewalker AI -struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI +struct boss_morogrim_tidewalkerAI : public ScriptedAI { boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c) { @@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI //Water Globule AI #define SPELL_GLOBULE_EXPLOSION 37871 -struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI +struct mob_water_globuleAI : public ScriptedAI { mob_water_globuleAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index f328ff51e8c..7f4d7e84739 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -58,7 +58,7 @@ bool GOHello_go_bridge_console(Player* pPlayer, GameObject* pGo) return true; } -struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance +struct instance_serpentshrine_cavern : public ScriptedInstance { instance_serpentshrine_cavern(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 0c484a50db6..1aedfbe1e5b 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -41,7 +41,7 @@ EndContentData */ #define SPELL_LUNG_BURST 31481 #define SPELL_ENVELOPING_WINDS 31718 -struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI +struct boss_thespiaAI : public ScriptedAI { boss_thespiaAI(Creature *c) : ScriptedAI(c) { @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI #define SPELL_WATER_BOLT_VOLLEY 34449 #define H_SPELL_WATER_BOLT_VOLLEY 37924 -struct TRINITY_DLL_DECL mob_coilfang_waterelementalAI : public ScriptedAI +struct mob_coilfang_waterelementalAI : public ScriptedAI { mob_coilfang_waterelementalAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 69e60cba5e4..62965fc0a35 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -46,7 +46,7 @@ EndContentData */ #define ENTRY_STREAMRIGGER_MECHANIC 17951 -struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI +struct boss_mekgineer_steamriggerAI : public ScriptedAI { boss_mekgineer_steamriggerAI(Creature *c) : ScriptedAI(c) { @@ -183,7 +183,7 @@ CreatureAI* GetAI_boss_mekgineer_steamrigger(Creature* pCreature) #define MAX_REPAIR_RANGE (13.0f) //we should be at least at this range for repair #define MIN_REPAIR_RANGE (7.0f) //we can stop movement at this range to repair but not required -struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI +struct mob_steamrigger_mechanicAI : public ScriptedAI { mob_steamrigger_mechanicAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index d23c2991ece..f46b8b335c0 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_WARLORDS_RAGE_PROC 36453 -struct TRINITY_DLL_DECL mob_naga_distillerAI : public ScriptedAI +struct mob_naga_distillerAI : public ScriptedAI { mob_naga_distillerAI(Creature *c) : ScriptedAI(c) { @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL mob_naga_distillerAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI +struct boss_warlord_kalithreshAI : public ScriptedAI { boss_warlord_kalithreshAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index bec05cfff0a..7dbdb925a9e 100644 --- a/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -52,7 +52,7 @@ bool GOHello_go_main_chambers_access_panel(Player* pPlayer, GameObject* pGo) return true; } -struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance +struct instance_steam_vault : public ScriptedInstance { instance_steam_vault(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp index ab6f90dde10..3736e4a230d 100644 --- a/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define SPELL_FOUL_SPORES 31673 #define SPELL_ACID_GEYSER 38739 -struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI +struct boss_hungarfenAI : public ScriptedAI { boss_hungarfenAI(Creature *c) : ScriptedAI(c) { @@ -90,7 +90,7 @@ CreatureAI* GetAI_boss_hungarfen(Creature* pCreature) #define SPELL_PUTRID_MUSHROOM 31690 #define SPELL_GROW 31698 -struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI +struct mob_underbog_mushroomAI : public ScriptedAI { mob_underbog_mushroomAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 83c9862403c..528e294b156 100644 --- a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -33,7 +33,7 @@ EndScriptData */ #define ENTRY_SPORE_STRIDER 22299 -struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI +struct boss_the_black_stalkerAI : public ScriptedAI { boss_the_black_stalkerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/scripts/outland/gruuls_lair/boss_gruul.cpp index b91a0303d0d..25b6c73f472 100644 --- a/src/scripts/outland/gruuls_lair/boss_gruul.cpp +++ b/src/scripts/outland/gruuls_lair/boss_gruul.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Gruul SD%Complete: 60 -SDComment: Ground Slam need further development (knock back effect and shatter effect must be added to mangos) +SDComment: Ground Slam need further development (knock back effect and shatter effect must be added to the core) SDCategory: Gruul's Lair EndScriptData */ @@ -52,7 +52,7 @@ enum eEnums SPELL_KNOCK_BACK = 24199, //Knockback spell until correct implementation is made }; -struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI +struct boss_gruulAI : public ScriptedAI { boss_gruulAI(Creature *c) : ScriptedAI(c) { @@ -124,10 +124,10 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI } } - //this part should be in mangos + //this part should be in the core if (pSpell->Id == SPELL_SHATTER) { - //this spell must have custom handling in mangos, dealing damage based on distance + //this spell must have custom handling in the core, dealing damage based on distance pTarget->CastSpell(pTarget, SPELL_SHATTER_EFFECT, true); if (pTarget->HasAura(SPELL_STONED)) diff --git a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp index f6987fa9d41..c55bf2b8b70 100644 --- a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp @@ -104,7 +104,7 @@ bool CheckAllBossDied(ScriptedInstance* pInstance, Creature* m_creature) } //High King Maulgar AI -struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI +struct boss_high_king_maulgarAI : public ScriptedAI { boss_high_king_maulgarAI(Creature *c) : ScriptedAI(c) { @@ -291,7 +291,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI }; //Olm The Summoner AI -struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI +struct boss_olm_the_summonerAI : public ScriptedAI { boss_olm_the_summonerAI(Creature *c) : ScriptedAI(c) { @@ -407,7 +407,7 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI }; //Kiggler The Crazed AI -struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI +struct boss_kiggler_the_crazedAI : public ScriptedAI { boss_kiggler_the_crazedAI(Creature *c) : ScriptedAI(c) { @@ -517,7 +517,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI }; //Blindeye The Seer AI -struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI +struct boss_blindeye_the_seerAI : public ScriptedAI { boss_blindeye_the_seerAI(Creature *c) : ScriptedAI(c) { @@ -615,7 +615,7 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI }; //Krosh Firehand AI -struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI +struct boss_krosh_firehandAI : public ScriptedAI { boss_krosh_firehandAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp b/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp index a7bdb314d5e..a8cad92feb5 100644 --- a/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp +++ b/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp @@ -31,7 +31,7 @@ EndScriptData */ 2 - Gruul event */ -struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance +struct instance_gruuls_lair : public ScriptedInstance { instance_gruuls_lair(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp index 1a1b393b146..b7198f26510 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -35,7 +35,7 @@ enum eEnums SPELL_POISON = 30914 }; -struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI +struct boss_broggokAI : public ScriptedAI { boss_broggokAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index c33f37d101a..78e409849c3 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -65,7 +65,7 @@ const float ShadowmoonChannelers[5][4]= {316,-109,-24.6,1.257} }; -struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI +struct boss_kelidan_the_breakerAI : public ScriptedAI { boss_kelidan_the_breakerAI(Creature *c) : ScriptedAI(c) { @@ -265,7 +265,7 @@ enum eShadowmoon SPELL_CHANNELING = 39123 }; -struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI +struct mob_shadowmoon_channelerAI : public ScriptedAI { mob_shadowmoon_channelerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 50f8101a57d..9f204d63e9d 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -39,7 +39,7 @@ enum eEnums SPELL_DOMINATION = 25772 // ??? }; -struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI +struct boss_the_makerAI : public ScriptedAI { boss_the_makerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index 2af18388752..d4f051d31f2 100644 --- a/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define ENTRY_SEWER2 181766 #define MAX_ENCOUNTER 3 -struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance +struct instance_blood_furnace : public ScriptedInstance { instance_blood_furnace(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index 8747da867e3..4d46c402afc 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define H_SPELL_SHADOW_BOLT 39297 #define SPELL_SUMMON_FIENDISH_HOUND 30707 -struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI +struct boss_omor_the_unscarredAI : public ScriptedAI { boss_omor_the_unscarredAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 75aad768087..48d7a207c71 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -57,7 +57,7 @@ const float VazrudenRing[2][3] = {-1377, 1760, 112} }; -struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI +struct boss_nazanAI : public ScriptedAI { boss_nazanAI(Creature *c) : ScriptedAI(c) { @@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI +struct boss_vazrudenAI : public ScriptedAI { boss_vazrudenAI(Creature *c) : ScriptedAI(c) { @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI +struct boss_vazruden_the_heraldAI : public ScriptedAI { boss_vazruden_the_heraldAI(Creature *c) : ScriptedAI(c) { @@ -381,7 +381,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI +struct mob_hellfire_sentryAI : public ScriptedAI { mob_hellfire_sentryAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index ef747b74708..9ef707d011d 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -38,7 +38,7 @@ EndScriptData */ #define SPELL_SURGE 34645 #define SPELL_RETALIATION 22857 -struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI +struct boss_watchkeeper_gargolmarAI : public ScriptedAI { boss_watchkeeper_gargolmarAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp index 5fdc27ce62a..f260987cb9d 100644 --- a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp +++ b/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "ScriptedPch.h" #include "hellfire_ramparts.h" -struct TRINITY_DLL_DECL instance_ramparts : public ScriptedInstance +struct instance_ramparts : public ScriptedInstance { instance_ramparts(Map* pMap) : ScriptedInstance(pMap) {Initialize();} diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index f2871d89d89..1cc620d9926 100644 --- a/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -88,7 +88,7 @@ static Yell RandomTaunt[]= typedef std::map<uint64, uint64> CubeMap; -struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI +struct mob_abyssalAI : public ScriptedAI { mob_abyssalAI(Creature *c) : ScriptedAI(c) { @@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI +struct boss_magtheridonAI : public ScriptedAI { boss_magtheridonAI(Creature *c) : ScriptedAI(c) { @@ -411,7 +411,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI +struct mob_hellfire_channelerAI : public ScriptedAI { mob_hellfire_channelerAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 3f05d371b05..aabb4e86a3a 100644 --- a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -35,7 +35,7 @@ EndScriptData */ #define EMOTE_BONDS_WEAKEN "'s bonds begin to weaken!" -struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance +struct instance_magtheridons_lair : public ScriptedInstance { instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap) { diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index cdc33f4ec21..52be2999952 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -73,7 +73,7 @@ static Say PeonDies[]= #define SPELL_CONSUMPTION 30497 #define SPELL_TEMPORARY_VISUAL 39312 // this is wrong, a temporary solution. spell consumption already has the purple visual, but doesn't display as it should -struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI +struct boss_grand_warlock_nethekurseAI : public ScriptedAI { boss_grand_warlock_nethekurseAI(Creature *c) : ScriptedAI(c) { @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI +struct mob_fel_orc_convertAI : public ScriptedAI { mob_fel_orc_convertAI(Creature *c) : ScriptedAI(c) { @@ -349,7 +349,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI }; //NOTE: this Creature are also summoned by other spells, for different creatures -struct TRINITY_DLL_DECL mob_lesser_shadow_fissureAI : public ScriptedAI +struct mob_lesser_shadow_fissureAI : public ScriptedAI { mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index 189ace7cd8a..bed95b69d12 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -98,7 +98,7 @@ static Yell KillingDelay[]= {-1000000, NPC_LEFT_HEAD}, }; -struct TRINITY_DLL_DECL mob_omrogg_headsAI : public ScriptedAI +struct mob_omrogg_headsAI : public ScriptedAI { mob_omrogg_headsAI(Creature *c) : ScriptedAI(c) {} @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL mob_omrogg_headsAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI +struct boss_warbringer_omroggAI : public ScriptedAI { boss_warbringer_omroggAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 6ba91566aba..5c7ce1d1aef 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -48,7 +48,7 @@ float AssassEntrance[3] = {275.136,-84.29,2.3}; // y -8 float AssassExit[3] = {184.233,-84.29,2.3}; // y -8 float AddsEntrance[3] = {306.036,-84.29,1.93}; -struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI +struct boss_warchief_kargath_bladefistAI : public ScriptedAI { boss_warchief_kargath_bladefistAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp index c73af338d3a..8dbc56877ca 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp @@ -28,7 +28,7 @@ EndScriptData */ #define DOOR_NETHEKURSE 1 -struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance +struct instance_shattered_halls : public ScriptedInstance { instance_shattered_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/hellfire_peninsula.cpp b/src/scripts/outland/hellfire_peninsula.cpp index cc75b76a63a..cc7e0f675f7 100644 --- a/src/scripts/outland/hellfire_peninsula.cpp +++ b/src/scripts/outland/hellfire_peninsula.cpp @@ -52,7 +52,7 @@ enum eAeranas C_AERANAS = 17085 }; -struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI +struct npc_aeranasAI : public ScriptedAI { npc_aeranasAI(Creature* c) : ScriptedAI(c) {} @@ -133,7 +133,7 @@ enum eAncestralWolf NPC_RYGA = 17123 }; -struct TRINITY_DLL_DECL npc_ancestral_wolfAI : public npc_escortAI +struct npc_ancestral_wolfAI : public npc_escortAI { npc_ancestral_wolfAI(Creature* pCreature) : npc_escortAI(pCreature) { @@ -333,7 +333,7 @@ enum eWoundedBloodElf QUEST_ROAD_TO_FALCON_WATCH = 9375 }; -struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI +struct npc_wounded_blood_elfAI : public npc_escortAI { npc_wounded_blood_elfAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/outland/nagrand.cpp b/src/scripts/outland/nagrand.cpp index ea174736458..d680f672495 100644 --- a/src/scripts/outland/nagrand.cpp +++ b/src/scripts/outland/nagrand.cpp @@ -40,7 +40,7 @@ EndContentData */ ## mob_shattered_rumbler - this should be done with ACID ######*/ -struct TRINITY_DLL_DECL mob_shattered_rumblerAI : public ScriptedAI +struct mob_shattered_rumblerAI : public ScriptedAI { bool Spawn; @@ -92,7 +92,7 @@ CreatureAI* GetAI_mob_shattered_rumbler(Creature* pCreature) #define GOSSIP_SL2 "And you think you can just eat anything you want? You're obviously trying to eat the Broken of Telaar." #define GOSSIP_SL3 "This means war, Lump! War I say!" -struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI +struct mob_lumpAI : public ScriptedAI { mob_lumpAI(Creature *c) : ScriptedAI(c) { @@ -229,7 +229,7 @@ bool GossipSelect_mob_lump(Player* pPlayer, Creature* pCreature, uint32 uiSender # mob_sunspring_villager - should be done with ACID ####*/ -struct TRINITY_DLL_DECL mob_sunspring_villagerAI : public ScriptedAI +struct mob_sunspring_villagerAI : public ScriptedAI { mob_sunspring_villagerAI(Creature *c) : ScriptedAI(c) {} @@ -549,7 +549,7 @@ enum eMagharCaptive static float m_afAmbushA[]= {-1568.805786, 8533.873047, 1.958}; static float m_afAmbushB[]= {-1491.554321, 8506.483398, 1.248}; -struct TRINITY_DLL_DECL npc_maghar_captiveAI : public npc_escortAI +struct npc_maghar_captiveAI : public npc_escortAI { npc_maghar_captiveAI(Creature* pCreature) : npc_escortAI(pCreature) { Reset(); } @@ -686,7 +686,7 @@ CreatureAI* GetAI_npc_maghar_captive(Creature* pCreature) ## npc_creditmarker_visist_with_ancestors ######*/ -struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI +struct npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI { npc_creditmarker_visit_with_ancestorsAI(Creature* c) : ScriptedAI(c) {} @@ -727,7 +727,7 @@ CreatureAI* GetAI_npc_creditmarker_visit_with_ancestors(Creature* pCreature) #define SPELL_SPARROWHAWK_NET 39810 #define SPELL_ITEM_CAPTIVE_SPARROWHAWK 39812 -struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI +struct mob_sparrowhawkAI : public ScriptedAI { mob_sparrowhawkAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/netherstorm.cpp b/src/scripts/outland/netherstorm.cpp index d9f91dae49e..16c4abea69e 100644 --- a/src/scripts/outland/netherstorm.cpp +++ b/src/scripts/outland/netherstorm.cpp @@ -59,7 +59,7 @@ EndContentData */ #define SPELL_INTERRUPT_1 35016 //ACID mobs should cast this #define SPELL_INTERRUPT_2 35176 //ACID mobs should cast this (Manaforge Ara-version) -struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI +struct npc_manaforge_control_consoleAI : public ScriptedAI { npc_manaforge_control_consoleAI(Creature *c) : ScriptedAI(c) {} @@ -360,7 +360,7 @@ const uint32 CreatureEntry[3] = 21504 // Pathaleon }; -struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI +struct npc_commander_dawnforgeAI : public ScriptedAI { npc_commander_dawnforgeAI(Creature *c) : ScriptedAI(c) { Reset (); } @@ -685,7 +685,7 @@ bool QuestAccept_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, Ques #define SPELL_MATERIALIZE 34804 #define SPELL_DE_MATERIALIZE 34814 -struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI +struct mob_phase_hunterAI : public ScriptedAI { mob_phase_hunterAI(Creature *c) : ScriptedAI(c) {} @@ -806,7 +806,7 @@ CreatureAI* GetAI_mob_phase_hunter(Creature* pCreature) #define SAY_THADELL_1 -1000304 #define SAY_THADELL_2 -1000305 -struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI +struct npc_bessyAI : public npc_escortAI { npc_bessyAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/outland/shadowmoon_valley.cpp b/src/scripts/outland/shadowmoon_valley.cpp index 0942f897cc6..2a9386606d5 100644 --- a/src/scripts/outland/shadowmoon_valley.cpp +++ b/src/scripts/outland/shadowmoon_valley.cpp @@ -61,7 +61,7 @@ enum eMatureNetherwing NPC_EVENT_PINGER = 22131 }; -struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI +struct mob_mature_netherwing_drakeAI : public ScriptedAI { mob_mature_netherwing_drakeAI(Creature* c) : ScriptedAI(c) { } @@ -186,7 +186,7 @@ CreatureAI* GetAI_mob_mature_netherwing_drake(Creature* pCreature) #define CREATURE_DRAGONMAW_SUBJUGATOR 21718 #define CREATURE_ESCAPE_DUMMY 22317 -struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI +struct mob_enslaved_netherwing_drakeAI : public ScriptedAI { mob_enslaved_netherwing_drakeAI(Creature* c) : ScriptedAI(c) { @@ -310,7 +310,7 @@ CreatureAI* GetAI_mob_enslaved_netherwing_drake(Creature* pCreature) # mob_dragonmaw_peon #####*/ -struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI +struct mob_dragonmaw_peonAI : public ScriptedAI { mob_dragonmaw_peonAI(Creature* c) : ScriptedAI(c) {} @@ -671,7 +671,7 @@ bool QuestAccept_npc_karynaku(Player* pPlayer, Creature* pCreature, Quest const* #define YARZILL_THE_MERC_SAY -1000221 -struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI +struct npc_overlord_morghorAI : public ScriptedAI { npc_overlord_morghorAI(Creature *c) : ScriptedAI(c) {} @@ -879,7 +879,7 @@ enum eEarthmender FACTION_EARTHEN = 1726 //guessed }; -struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI +struct npc_earthmender_wildaAI : public npc_escortAI { npc_earthmender_wildaAI(Creature* pCreature) : npc_escortAI(pCreature) { } @@ -1123,7 +1123,7 @@ static SpawnSpells SpawnCast[]= # mob_illidari_spawn ######*/ -struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI +struct mob_illidari_spawnAI : public ScriptedAI { mob_illidari_spawnAI(Creature* c) : ScriptedAI(c) {} @@ -1224,7 +1224,7 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI # mob_torloth_the_magnificent #####*/ -struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI +struct mob_torloth_the_magnificentAI : public ScriptedAI { mob_torloth_the_magnificentAI(Creature* c) : ScriptedAI(c) {} @@ -1374,7 +1374,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI # npc_lord_illidan_stormrage #####*/ -struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI +struct npc_lord_illidan_stormrageAI : public ScriptedAI { npc_lord_illidan_stormrageAI(Creature* c) : ScriptedAI(c) {} @@ -1659,7 +1659,7 @@ CreatureAI* GetAI_mob_torloth_the_magnificent(Creature* c) #define ENRAGED_SOUL_FRIENDLY 35 #define ENRAGED_SOUL_HOSTILE 14 -struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI +struct npc_enraged_spiritAI : public ScriptedAI { npc_enraged_spiritAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/shattrath_city.cpp b/src/scripts/outland/shattrath_city.cpp index 0ea66f4421f..13fa4905574 100644 --- a/src/scripts/outland/shattrath_city.cpp +++ b/src/scripts/outland/shattrath_city.cpp @@ -48,7 +48,7 @@ enum eRaliq FACTION_HOSTILE_RD = 45 }; -struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI +struct npc_raliq_the_drunkAI : public ScriptedAI { npc_raliq_the_drunkAI(Creature* c) : ScriptedAI(c) { @@ -114,7 +114,7 @@ bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature, uint #define SPELL_MAGNETIC_PULL 31705 -struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI +struct npc_salsalabimAI : public ScriptedAI { npc_salsalabimAI(Creature* c) : ScriptedAI(c) {} @@ -275,7 +275,7 @@ bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* pCreature, uint32 uiSend #define WHISP20 -1000326 #define WHISP21 -1000327 -struct TRINITY_DLL_DECL npc_kservantAI : public npc_escortAI +struct npc_kservantAI : public npc_escortAI { public: npc_kservantAI(Creature *c) : npc_escortAI(c) {} @@ -359,7 +359,7 @@ CreatureAI* GetAI_npc_kservantAI(Creature* pCreature) #define NPC_CREEPJACK 19726 #define NPC_MALONE 19725 -struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI +struct npc_dirty_larryAI : public ScriptedAI { npc_dirty_larryAI(Creature* c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp index ec7a500dabf..d089abcfe01 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp @@ -59,7 +59,7 @@ EndContentData */ #define SPELL_FROSTBOLT 15497 #define SPELL_PYROBLAST 33975 -struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI +struct npc_millhouse_manastormAI : public ScriptedAI { npc_millhouse_manastormAI(Creature *c) : ScriptedAI(c) { @@ -246,7 +246,7 @@ CreatureAI* GetAI_npc_millhouse_manastorm(Creature* pCreature) #define SPELL_TARGET_OMEGA 36852 #define SPELL_BUBBLE_VISUAL 36849 -struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI +struct npc_warden_mellicharAI : public ScriptedAI { npc_warden_mellicharAI(Creature *c) : ScriptedAI(c) { @@ -478,7 +478,7 @@ CreatureAI* GetAI_npc_warden_mellichar(Creature* pCreature) #define SPELL_VOID_ZONE_DAMAGE 36120 -struct TRINITY_DLL_DECL mob_zerekethvoidzoneAI : public ScriptedAI +struct mob_zerekethvoidzoneAI : public ScriptedAI { mob_zerekethvoidzoneAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index af8c949febe..60e8c7c4430 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -53,7 +53,7 @@ EndContentData */ #define SPELL_66_ILLUSION 36931 //entry 21466 #define SPELL_33_ILLUSION 36932 //entry 21467 -struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI +struct boss_harbinger_skyrissAI : public ScriptedAI { boss_harbinger_skyrissAI(Creature *c) : ScriptedAI(c) { @@ -260,7 +260,7 @@ CreatureAI* GetAI_boss_harbinger_skyriss(Creature* pCreature) #define SPELL_MIND_REND_IMAGE 36929 #define H_SPELL_MIND_REND_IMAGE 39021 -struct TRINITY_DLL_DECL boss_harbinger_skyriss_illusionAI : public ScriptedAI +struct boss_harbinger_skyriss_illusionAI : public ScriptedAI { boss_harbinger_skyriss_illusionAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp index 387fdea6bda..039ee4a913d 100644 --- a/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -45,7 +45,7 @@ EndScriptData */ 4 - Harbinger Skyriss event, 5 sub-events */ -struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance +struct instance_arcatraz : public ScriptedInstance { instance_arcatraz(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index b00704b5c0e..67b80e0f5d4 100644 --- a/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_PLANT_BLUE 34762 #define SPELL_PLANT_RED 34763 -struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI +struct boss_high_botanist_freywinnAI : public ScriptedAI { boss_high_botanist_freywinnAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp b/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp index c8c80e98a18..a3f86d77c23 100644 --- a/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp +++ b/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp @@ -43,7 +43,7 @@ EndScriptData */ #define MODEL_FROST 14112 #define MODEL_NATURE 14214 -struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI +struct boss_lajAI : public ScriptedAI { boss_lajAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp index 4ecf654e2bc..8bc0408b046 100644 --- a/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp @@ -29,7 +29,7 @@ EndScriptData */ #define SPELL_HEAL_FATHER 6262 -struct TRINITY_DLL_DECL mob_treantAI : public ScriptedAI +struct mob_treantAI : public ScriptedAI { mob_treantAI (Creature *c) : ScriptedAI(c) { @@ -104,7 +104,7 @@ float treant_pos[6][3] = {106.780159, 355.582581, -27.593357} }; -struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI +struct boss_warp_splinterAI : public ScriptedAI { boss_warp_splinterAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp index b9a8887184a..a9c579eadf0 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp @@ -65,7 +65,7 @@ enum WaitEventType WE_SUMMON = 10 }; -struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI +struct boss_alarAI : public ScriptedAI { boss_alarAI(Creature *c) : ScriptedAI(c) { @@ -426,7 +426,7 @@ CreatureAI* GetAI_boss_alar(Creature* pCreature) return new boss_alarAI(pCreature); } -struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI +struct mob_ember_of_alarAI : public ScriptedAI { mob_ember_of_alarAI(Creature *c) : ScriptedAI(c) { @@ -486,7 +486,7 @@ CreatureAI* GetAI_mob_ember_of_alar(Creature* pCreature) return new mob_ember_of_alarAI(pCreature); } -struct TRINITY_DLL_DECL mob_flame_patch_alarAI : public ScriptedAI +struct mob_flame_patch_alarAI : public ScriptedAI { mob_flame_patch_alarAI(Creature *c) : ScriptedAI(c) {} void Reset() {} diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp index 20c39baee26..148e174bed2 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp @@ -69,7 +69,7 @@ const float PORTAL_Z = 17.005f; // x, y, z, o static float SolarianPos[4] = {432.909, -373.424, 17.9608, 1.06421}; -struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI +struct boss_high_astromancer_solarianAI : public ScriptedAI { boss_high_astromancer_solarianAI(Creature *c) : ScriptedAI(c), Summons(m_creature) { @@ -373,7 +373,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI } }; -struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI +struct mob_solarium_priestAI : public ScriptedAI { mob_solarium_priestAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index 68ed80f30ae..2962ede14df 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -141,7 +141,7 @@ const float afGravityPos[3] = {795.0f, 0.0f, 70.0f}; #define TIME_PHASE_3_4 180000 //Base AI for Advisors -struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI +struct advisorbase_ai : public ScriptedAI { advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature) { @@ -267,7 +267,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI }; //Kael'thas AI -struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI +struct boss_kaelthasAI : public ScriptedAI { boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(m_creature) { @@ -966,7 +966,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI }; //Thaladred the Darkener AI -struct TRINITY_DLL_DECL boss_thaladred_the_darkenerAI : public advisorbase_ai +struct boss_thaladred_the_darkenerAI : public advisorbase_ai { boss_thaladred_the_darkenerAI(Creature* pCreature) : advisorbase_ai(pCreature) {} @@ -1044,7 +1044,7 @@ struct TRINITY_DLL_DECL boss_thaladred_the_darkenerAI : public advisorbase_ai }; //Lord Sanguinar AI -struct TRINITY_DLL_DECL boss_lord_sanguinarAI : public advisorbase_ai +struct boss_lord_sanguinarAI : public advisorbase_ai { boss_lord_sanguinarAI(Creature* pCreature) : advisorbase_ai(pCreature) {} @@ -1097,7 +1097,7 @@ struct TRINITY_DLL_DECL boss_lord_sanguinarAI : public advisorbase_ai }; //Grand Astromancer Capernian AI -struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ai +struct boss_grand_astromancer_capernianAI : public advisorbase_ai { boss_grand_astromancer_capernianAI(Creature* pCreature) : advisorbase_ai(pCreature) {} @@ -1220,7 +1220,7 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ }; //Master Engineer Telonicus AI -struct TRINITY_DLL_DECL boss_master_engineer_telonicusAI : public advisorbase_ai +struct boss_master_engineer_telonicusAI : public advisorbase_ai { boss_master_engineer_telonicusAI(Creature* pCreature) : advisorbase_ai(pCreature) {} @@ -1285,7 +1285,7 @@ struct TRINITY_DLL_DECL boss_master_engineer_telonicusAI : public advisorbase_ai }; //Flame Strike AI -struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public Scripted_NoMovementAI +struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI { mob_kael_flamestrikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {} @@ -1331,7 +1331,7 @@ struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public Scripted_NoMovementAI }; //Phoenix AI -struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI +struct mob_phoenix_tkAI : public ScriptedAI { mob_phoenix_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -1369,7 +1369,7 @@ struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI }; //Phoenix Egg AI -struct TRINITY_DLL_DECL mob_phoenix_egg_tkAI : public ScriptedAI +struct mob_phoenix_egg_tkAI : public ScriptedAI { mob_phoenix_egg_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp index ad0e12672f3..ca0f42ed5af 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp @@ -40,7 +40,7 @@ enum eEnums SPELL_BERSERK = 27680 }; -struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI +struct boss_void_reaverAI : public ScriptedAI { boss_void_reaverAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp b/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp index bff5de8b21d..31e6411f77d 100644 --- a/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp @@ -33,7 +33,7 @@ EndScriptData */ 3 - Void Reaver event */ -struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance +struct instance_the_eye : public ScriptedInstance { instance_the_eye(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp b/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp index 35adff1d7fa..b28acec8f9d 100644 --- a/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp @@ -31,7 +31,7 @@ EndContentData */ #define SPELL_COUNTERCHARGE 35035 #define SPELL_KNOCKAWAY 22893 -struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI +struct mob_crystalcore_devastatorAI : public ScriptedAI { mob_crystalcore_devastatorAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index dd2fb4b4fc9..0710c4ca1c3 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_STREAM_OF_MACHINE_FLUID 35311 // Gatewatcher Iron-Hand AI -struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI +struct boss_gatewatcher_iron_handAI : public ScriptedAI { boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index 1e779383dbc..9b201ef4348 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define SPELL_KNOCKBACK 37317 #define SPELL_SOLARBURN 35267 -struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI +struct boss_nethermancer_sepethreaAI : public ScriptedAI { boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) { @@ -151,7 +151,7 @@ CreatureAI* GetAI_boss_nethermancer_sepethrea(Creature* pCreature) #define H_SPELL_INFERNO 39346 #define SPELL_FIRE_TAIL 35278 -struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI +struct mob_ragin_flamesAI : public ScriptedAI { mob_ragin_flamesAI(Creature *c) : ScriptedAI(c) { diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index c049b3cfe28..008a3c2dc61 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -48,7 +48,7 @@ EndScriptData */ #define SPELL_DETONATION 35058 #define SPELL_ARCANE_MISSILES 35034 -struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI +struct boss_pathaleon_the_calculatorAI : public ScriptedAI { boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c), summons(m_creature) { @@ -166,7 +166,7 @@ CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature* pCreature) return new boss_pathaleon_the_calculatorAI (pCreature); } -struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI +struct mob_nether_wraithAI : public ScriptedAI { mob_nether_wraithAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp index 794b66e1cec..608778371a9 100644 --- a/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp +++ b/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define MAX_ENCOUNTER 1 -struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance +struct instance_mechanar : public ScriptedInstance { instance_mechanar(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; diff --git a/src/scripts/outland/terokkar_forest.cpp b/src/scripts/outland/terokkar_forest.cpp index 5d77899efb5..fa1d85b590a 100644 --- a/src/scripts/outland/terokkar_forest.cpp +++ b/src/scripts/outland/terokkar_forest.cpp @@ -47,7 +47,7 @@ EndContentData */ #define SPELL_PULVERIZE 2676 //#define SPELL_QUID9889 32174 -struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI +struct mob_unkor_the_ruthlessAI : public ScriptedAI { mob_unkor_the_ruthlessAI(Creature* c) : ScriptedAI(c) {} @@ -147,7 +147,7 @@ CreatureAI* GetAI_mob_unkor_the_ruthless(Creature* pCreature) ## mob_infested_root_walker ######*/ -struct TRINITY_DLL_DECL mob_infested_root_walkerAI : public ScriptedAI +struct mob_infested_root_walkerAI : public ScriptedAI { mob_infested_root_walkerAI(Creature *c) : ScriptedAI(c) {} @@ -171,7 +171,7 @@ CreatureAI* GetAI_mob_infested_root_walker(Creature* pCreature) /*###### ## mob_skywing ######*/ -struct TRINITY_DLL_DECL npc_skywingAI : public npc_escortAI +struct npc_skywingAI : public npc_escortAI { public: npc_skywingAI(Creature *c) : npc_escortAI(c) {} @@ -227,7 +227,7 @@ CreatureAI* GetAI_npc_skywingAI(Creature* pCreature) ## mob_rotting_forest_rager ######*/ -struct TRINITY_DLL_DECL mob_rotting_forest_ragerAI : public ScriptedAI +struct mob_rotting_forest_ragerAI : public ScriptedAI { mob_rotting_forest_ragerAI(Creature *c) : ScriptedAI(c) {} @@ -259,7 +259,7 @@ const uint32 netherwebVictims[6] = { 18470, 16805, 21242, 18452, 22482, 21285 }; -struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI +struct mob_netherweb_victimAI : public ScriptedAI { mob_netherweb_victimAI(Creature *c) : ScriptedAI(c) {} @@ -312,7 +312,7 @@ enum eFloon QUEST_CRACK_SKULLS = 10009 }; -struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI +struct npc_floonAI : public ScriptedAI { npc_floonAI(Creature* c) : ScriptedAI(c) { @@ -407,7 +407,7 @@ bool GossipSelect_npc_floon(Player* pPlayer, Creature* pCreature, uint32 uiSende #define GO_CAGE 182794 #define SPELL_CAT 32447 -struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI +struct npc_isla_starmaneAI : public npc_escortAI { npc_isla_starmaneAI(Creature* c) : npc_escortAI(c) {} @@ -567,7 +567,7 @@ enum eAkuno NPC_CABAL_SKRIMISHER = 21661 }; -struct TRINITY_DLL_DECL npc_akunoAI : public npc_escortAI +struct npc_akunoAI : public npc_escortAI { npc_akunoAI(Creature *c) : npc_escortAI(c) {} diff --git a/src/scripts/outland/zangarmarsh.cpp b/src/scripts/outland/zangarmarsh.cpp index 6832ed98dc5..7cd54e303b4 100644 --- a/src/scripts/outland/zangarmarsh.cpp +++ b/src/scripts/outland/zangarmarsh.cpp @@ -129,7 +129,7 @@ enum eCooshhooosh FACTION_HOSTILE_CO = 45 }; -struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI +struct npc_cooshcooshAI : public ScriptedAI { npc_cooshcooshAI(Creature* c) : ScriptedAI(c) { @@ -278,7 +278,7 @@ enum eKayra NPC_SLAVEBINDER = 18042 }; -struct TRINITY_DLL_DECL npc_kayra_longmaneAI : public npc_escortAI +struct npc_kayra_longmaneAI : public npc_escortAI { npc_kayra_longmaneAI(Creature* c) : npc_escortAI(c) {} diff --git a/src/scripts/world/boss_emeriss.cpp b/src/scripts/world/boss_emeriss.cpp index 9a6357c73cc..fd930f6838f 100644 --- a/src/scripts/world/boss_emeriss.cpp +++ b/src/scripts/world/boss_emeriss.cpp @@ -36,7 +36,7 @@ enum eEnums SPELL_CORRUPTIONOFEARTH = 24910 }; -struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI +struct boss_emerissAI : public ScriptedAI { boss_emerissAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/world/boss_taerar.cpp b/src/scripts/world/boss_taerar.cpp index 51fb1cdd557..82c02ec8e3e 100644 --- a/src/scripts/world/boss_taerar.cpp +++ b/src/scripts/world/boss_taerar.cpp @@ -50,7 +50,7 @@ uint32 m_auiSpellSummonShade[]= SPELL_SUMMONSHADE_1, SPELL_SUMMONSHADE_2, SPELL_SUMMONSHADE_3 }; -struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI +struct boss_taerarAI : public ScriptedAI { boss_taerarAI(Creature *c) : ScriptedAI(c) {} @@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI }; // Shades of Taerar Script -struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI +struct boss_shadeoftaerarAI : public ScriptedAI { boss_shadeoftaerarAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/world/boss_ysondre.cpp b/src/scripts/world/boss_ysondre.cpp index b808841ce27..bac9fe81010 100644 --- a/src/scripts/world/boss_ysondre.cpp +++ b/src/scripts/world/boss_ysondre.cpp @@ -42,7 +42,7 @@ enum eEnums }; // Ysondre script -struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI +struct boss_ysondreAI : public ScriptedAI { boss_ysondreAI(Creature* pCreature) : ScriptedAI(pCreature) {} @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI }; // Summoned druid script -struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI +struct mob_dementeddruidsAI : public ScriptedAI { mob_dementeddruidsAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/scripts/world/guards.cpp b/src/scripts/world/guards.cpp index 34a537ee627..3d6edd9c1c3 100644 --- a/src/scripts/world/guards.cpp +++ b/src/scripts/world/guards.cpp @@ -2524,7 +2524,7 @@ CreatureAI* GetAI_guard_shattrath(Creature* pCreature) #define SPELL_BANISH_TELEPORT 36643 #define SPELL_EXILE 39533 -struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI +struct guard_shattrath_aldorAI : public guardAI { guard_shattrath_aldorAI(Creature *c) : guardAI(c) {} @@ -2720,7 +2720,7 @@ CreatureAI* GetAI_guard_shattrath_aldor(Creature* pCreature) * guard_shattrath_scryer *******************************************************/ -struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI +struct guard_shattrath_scryerAI : public guardAI { guard_shattrath_scryerAI(Creature *c) : guardAI(c) {} diff --git a/src/scripts/world/mob_generic_creature.cpp b/src/scripts/world/mob_generic_creature.cpp index 8316d5e48ba..f3b0b864f78 100644 --- a/src/scripts/world/mob_generic_creature.cpp +++ b/src/scripts/world/mob_generic_creature.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define GENERIC_CREATURE_COOLDOWN 5000 -struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI +struct generic_creatureAI : public ScriptedAI { generic_creatureAI(Creature *c) : ScriptedAI(c) {} @@ -162,7 +162,7 @@ CreatureAI* GetAI_generic_creature(Creature* pCreature) return new generic_creatureAI (pCreature); } -struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI +struct trigger_periodicAI : public NullCreatureAI { trigger_periodicAI(Creature* c) : NullCreatureAI(c) { @@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI } }; -struct TRINITY_DLL_DECL trigger_deathAI : public NullCreatureAI +struct trigger_deathAI : public NullCreatureAI { trigger_deathAI(Creature* c) : NullCreatureAI(c) {} void JustDied(Unit *killer) diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index c72ae20ae89..417490e2d6d 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -101,7 +101,7 @@ SpawnAssociation m_aSpawnAssociations[] = {22126, 22122, SPAWNTYPE_ALARMBOT} //Air Force Trip Wire - Rooftop (Cenarion Expedition) }; -struct TRINITY_DLL_DECL npc_air_force_botsAI : public ScriptedAI +struct npc_air_force_botsAI : public ScriptedAI { npc_air_force_botsAI(Creature* pCreature) : ScriptedAI(pCreature) { @@ -295,7 +295,7 @@ bool GossipSelect_npc_lunaclaw_spirit(Player* pPlayer, Creature* pCreature, uint #define FACTION_FRIENDLY 35 #define FACTION_CHICKEN 31 -struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI +struct npc_chicken_cluckAI : public ScriptedAI { npc_chicken_cluckAI(Creature *c) : ScriptedAI(c) {} @@ -379,7 +379,7 @@ bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature* pCreature, const #define SPELL_SEDUCTION 47057 #define SPELL_FIERY_AURA 45427 -struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI +struct npc_dancing_flamesAI : public ScriptedAI { npc_dancing_flamesAI(Creature *c) : ScriptedAI(c) {} @@ -516,7 +516,7 @@ const uint32 HordeSoldierId[3] = ## npc_doctor (handles both Gustaf Vanhowzen and Gregory Victor) ######*/ -struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI +struct npc_doctorAI : public ScriptedAI { npc_doctorAI(Creature *c) : ScriptedAI(c) {} @@ -561,7 +561,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI ## npc_injured_patient (handles all the patients, no matter Horde or Alliance) #####*/ -struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI +struct npc_injured_patientAI : public ScriptedAI { npc_injured_patientAI(Creature *c) : ScriptedAI(c) {} @@ -862,7 +862,7 @@ enum eGarments SAY_SHAYA_GOODBYE = -1000174, //signed for 21469 }; -struct TRINITY_DLL_DECL npc_garments_of_questsAI : public npc_escortAI +struct npc_garments_of_questsAI : public npc_escortAI { npc_garments_of_questsAI(Creature *c) : npc_escortAI(c) {Reset();} @@ -1044,7 +1044,7 @@ CreatureAI* GetAI_npc_garments_of_quests(Creature* pCreature) #define SPELL_DEATHTOUCH 5 -struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI +struct npc_guardianAI : public ScriptedAI { npc_guardianAI(Creature *c) : ScriptedAI(c) {} @@ -1428,7 +1428,7 @@ bool GossipSelect_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 uiSende return true; } -struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI +struct npc_steam_tonkAI : public ScriptedAI { npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} @@ -1458,7 +1458,7 @@ CreatureAI* GetAI_npc_steam_tonk(Creature* pCreature) #define SPELL_TONK_MINE_DETONATE 25099 -struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI +struct npc_tonk_mineAI : public ScriptedAI { npc_tonk_mineAI(Creature *c) : ScriptedAI(c) { @@ -1496,7 +1496,7 @@ CreatureAI* GetAI_npc_tonk_mine(Creature* pCreature) ## npc_brewfest_reveler ####*/ -struct TRINITY_DLL_DECL npc_brewfest_revelerAI : public ScriptedAI +struct npc_brewfest_revelerAI : public ScriptedAI { npc_brewfest_revelerAI(Creature* c) : ScriptedAI(c) {} void ReceiveEmote(Player* pPlayer, uint32 emote) @@ -1518,7 +1518,7 @@ CreatureAI* GetAI_npc_brewfest_reveler(Creature* pCreature) ## npc_winter_reveler ####*/ -struct TRINITY_DLL_DECL npc_winter_revelerAI : public ScriptedAI +struct npc_winter_revelerAI : public ScriptedAI { npc_winter_revelerAI(Creature* c) : ScriptedAI(c) {} void ReceiveEmote(Player* pPlayer, uint32 emote) @@ -1564,7 +1564,7 @@ CreatureAI* GetAI_npc_winter_reveler(Creature* pCreature) #define RAND 5 -struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI +struct npc_snake_trap_serpentsAI : public ScriptedAI { npc_snake_trap_serpentsAI(Creature *c) : ScriptedAI(c) {} @@ -1675,7 +1675,7 @@ CreatureAI* GetAI_npc_snake_trap_serpents(Creature* pCreature) #define SAY_RANDOM_MOJO6b ", I know of a little swamp not too far from here...." #define SAY_RANDOM_MOJO7 "There's just never enough Mojo to go around..." -struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI +struct mob_mojoAI : public ScriptedAI { mob_mojoAI(Creature *c) : ScriptedAI(c) {Reset();} uint32 hearts; @@ -1744,7 +1744,7 @@ CreatureAI* GetAI_mob_mojo(Creature* pCreature) return new mob_mojoAI (pCreature); } -struct TRINITY_DLL_DECL npc_mirror_image : CasterAI +struct npc_mirror_image : CasterAI { npc_mirror_image(Creature *c) : CasterAI(c) {} @@ -1784,7 +1784,7 @@ CreatureAI* GetAI_npc_mirror_image(Creature* pCreature) return new npc_mirror_image (pCreature); } -struct TRINITY_DLL_DECL npc_ebon_gargoyleAI : CasterAI +struct npc_ebon_gargoyleAI : CasterAI { npc_ebon_gargoyleAI(Creature *c) : CasterAI(c) {} @@ -1870,7 +1870,7 @@ CreatureAI* GetAI_npc_ebon_gargoyle(Creature* pCreature) return new npc_ebon_gargoyleAI (pCreature); } -struct TRINITY_DLL_DECL npc_lightwellAI : public PassiveAI +struct npc_lightwellAI : public PassiveAI { npc_lightwellAI(Creature *c) : PassiveAI(c) {} @@ -1885,7 +1885,7 @@ CreatureAI* GetAI_npc_lightwellAI(Creature* pCreature) return new npc_lightwellAI (pCreature); } -struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI +struct npc_training_dummy : Scripted_NoMovementAI { npc_training_dummy(Creature *c) : Scripted_NoMovementAI(c) { @@ -1956,7 +1956,7 @@ CreatureAI* GetAI_npc_training_dummy(Creature* pCreature) #define GLYPH_OF_SHADOWFIEND_MANA 58227 #define GLYPH_OF_SHADOWFIEND 58228 -struct TRINITY_DLL_DECL npc_shadowfiendAI : public ScriptedAI +struct npc_shadowfiendAI : public ScriptedAI { npc_shadowfiendAI(Creature* pCreature) : ScriptedAI(pCreature) {} |