A great purge of obsolete macros.

--HG-- branch : trunk
2010-02-05 00:31:28 +01:00
parent b0b261585f
commit a5d1bc77ab
552 changed files with 1147 additions and 1223 deletions
@@ -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) {}

@@ -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) {}

@@ -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){}

@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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();};

@@ -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) {}

@@ -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) {}

@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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) 
    {
@@ -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)
    {
@@ -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();};
    
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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();};

@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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);

@@ -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)
    {
@@ -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);

@@ -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();};

@@ -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)
    {
@@ -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)
    {
@@ -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) {}

@@ -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();};

@@ -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)
    {
@@ -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) { }

@@ -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(); }

@@ -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)
    {
@@ -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) { }

@@ -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) {}

@@ -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) {}

@@ -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) {}

@@ -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) {}

@@ -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) {}
@@ -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) {}

@@ -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) {}

@@ -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) {}

@@ -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) {}

@@ -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();};

@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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)
    {
@@ -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(); }
    
@@ -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) {}

@@ -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) {}

@@ -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) { }

@@ -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) { }

@@ -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)
    {
@@ -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)
    {
@@ -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) {}

@@ -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) {}

@@ -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) {}

@@ -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) {}

@@ -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)
    {
@@ -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) {}
@@ -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();};

@@ -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;
@@ -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)
    {
@@ -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) {}

@@ -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) {}

@@ -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) { }

@@ -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();};

@@ -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)
    {
@@ -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)
    {