aboutsummaryrefslogtreecommitdiff
path: root/src/scripts/kalimdor
diff options
context:
space:
mode:
authorXanadu <none@none>2010-02-05 00:31:28 +0100
committerXanadu <none@none>2010-02-05 00:31:28 +0100
commita5d1bc77abc275402240bec1380fa87f04461ba8 (patch)
treef33b3e3f10a4f0723d85b5bec4764f4518501c06 /src/scripts/kalimdor
parentb0b261585f4c410736548cd536642cb104cb7023 (diff)
A great purge of obsolete macros.
--HG-- branch : trunk
Diffstat (limited to 'src/scripts/kalimdor')
-rw-r--r--src/scripts/kalimdor/ashenvale.cpp6
-rw-r--r--src/scripts/kalimdor/azshara.cpp6
-rw-r--r--src/scripts/kalimdor/azuremyst_isle.cpp14
-rw-r--r--src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp4
-rw-r--r--src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp2
-rw-r--r--src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp2
-rw-r--r--src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp2
-rw-r--r--src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp2
-rw-r--r--src/scripts/kalimdor/bloodmyst_isle.cpp2
-rw-r--r--src/scripts/kalimdor/boss_azuregos.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp4
-rw-r--r--src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp4
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp6
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp4
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp2
-rw-r--r--src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp4
-rw-r--r--src/scripts/kalimdor/darkshore.cpp6
-rw-r--r--src/scripts/kalimdor/desolace.cpp2
-rw-r--r--src/scripts/kalimdor/dustwallow_marsh.cpp10
-rw-r--r--src/scripts/kalimdor/feralas.cpp2
-rw-r--r--src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp2
-rw-r--r--src/scripts/kalimdor/maraudon/boss_landslide.cpp2
-rw-r--r--src/scripts/kalimdor/maraudon/boss_noxxion.cpp2
-rw-r--r--src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp2
-rw-r--r--src/scripts/kalimdor/moonglade.cpp2
-rw-r--r--src/scripts/kalimdor/mulgore.cpp4
-rw-r--r--src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp2
-rw-r--r--src/scripts/kalimdor/orgrimmar.cpp4
-rw-r--r--src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp2
-rw-r--r--src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp2
-rw-r--r--src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp4
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp2
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp2
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp2
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp2
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp2
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp2
-rw-r--r--src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp2
-rw-r--r--src/scripts/kalimdor/silithus.cpp6
-rw-r--r--src/scripts/kalimdor/stonetalon_mountains.cpp2
-rw-r--r--src/scripts/kalimdor/tanaris.cpp8
-rw-r--r--src/scripts/kalimdor/teldrassil.cpp2
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp6
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp14
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp2
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp2
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp2
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp4
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp2
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp6
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp2
-rw-r--r--src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp2
-rw-r--r--src/scripts/kalimdor/the_barrens.cpp8
-rw-r--r--src/scripts/kalimdor/thousand_needles.cpp10
-rw-r--r--src/scripts/kalimdor/thunder_bluff.cpp2
-rw-r--r--src/scripts/kalimdor/ungoro_crater.cpp4
-rw-r--r--src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp2
-rw-r--r--src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp2
-rw-r--r--src/scripts/kalimdor/zulfarrak/zulfarrak.cpp4
78 files changed, 129 insertions, 129 deletions
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)
{