aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorDiscover- <amort11@hotmail.com>2012-03-13 23:21:32 -0700
committerDiscover- <amort11@hotmail.com>2012-03-13 23:21:32 -0700
commit69c3612cfe50777e6895ec8a8f57e370a5c99c3e (patch)
treec718d7a9de684ef4593a86e79d09db7cea3d5494 /src/server/scripts/Northrend
parent1dde22394c880a0839ced6bb70f778340800ec1c (diff)
parent117fbb9010743a0e688b837dd00a35c28fb16f25 (diff)
Merge pull request #5702 from Gyx/master
Core/Script: Clean-Up in Scripts.
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp6
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp6
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp12
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp8
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp4
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp18
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp12
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp4
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp4
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp10
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_eck.cpp8
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp4
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp8
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp10
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp8
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp4
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp4
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp8
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp4
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp10
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp8
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp4
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp6
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp8
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp4
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp24
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp4
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp4
-rw-r--r--src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp4
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_erekem.cpp8
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp4
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_moragg.cpp4
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp4
-rw-r--r--src/server/scripts/Northrend/VioletHold/violet_hold.cpp44
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp20
-rw-r--r--src/server/scripts/Northrend/grizzly_hills.cpp4
-rw-r--r--src/server/scripts/Northrend/sholazar_basin.cpp2
41 files changed, 158 insertions, 158 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
index b16ad9934d8..516d3b21622 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
@@ -48,9 +48,9 @@ public:
struct boss_amanitarAI : public ScriptedAI
{
- boss_amanitarAI(Creature* c) : ScriptedAI(c)
+ boss_amanitarAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bFirstTime = true;
}
@@ -167,7 +167,7 @@ public:
struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI
{
- mob_amanitar_mushroomsAI(Creature* c) : Scripted_NoMovementAI(c) {}
+ mob_amanitar_mushroomsAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
uint32 uiAuraTimer;
uint32 uiDeathTimer;
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index 85abaa46a5d..7b8157486e8 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -278,10 +278,10 @@ public:
struct mob_nadox_eggsAI : public Scripted_NoMovementAI
{
- mob_nadox_eggsAI(Creature* c) : Scripted_NoMovementAI(c)
+ mob_nadox_eggsAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
- c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
- c->UpdateAllStats();
+ creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
+ creature->UpdateAllStats();
}
void Reset() {}
void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
index 2789bc48a4c..ceefcece71e 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -73,9 +73,9 @@ public:
struct boss_jedoga_shadowseekerAI : public ScriptedAI
{
- boss_jedoga_shadowseekerAI(Creature* c) : ScriptedAI(c)
+ boss_jedoga_shadowseekerAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bFirstTime = true;
bPreDone = false;
}
@@ -355,9 +355,9 @@ public:
struct mob_jedoga_initiandAI : public ScriptedAI
{
- mob_jedoga_initiandAI(Creature* c) : ScriptedAI(c)
+ mob_jedoga_initiandAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -531,9 +531,9 @@ public:
struct npc_jedogas_aufseher_triggerAI : public Scripted_NoMovementAI
{
- npc_jedogas_aufseher_triggerAI(Creature* c) : Scripted_NoMovementAI(c)
+ npc_jedogas_aufseher_triggerAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bRemoved = false;
bRemoved2 = false;
bCasted = false;
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index c756aa4f232..5ec693c58b2 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -79,9 +79,9 @@ public:
struct boss_taldaramAI : public ScriptedAI
{
- boss_taldaramAI(Creature* c) : ScriptedAI(c)
+ boss_taldaramAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
@@ -338,9 +338,9 @@ public:
struct mob_taldaram_flamesphereAI : public ScriptedAI
{
- mob_taldaram_flamesphereAI(Creature* c) : ScriptedAI(c)
+ mob_taldaram_flamesphereAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiDespawnTimer;
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index da629fd45e9..699043b3269 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -51,9 +51,9 @@ public:
struct boss_hadronoxAI : public ScriptedAI
{
- boss_hadronoxAI(Creature* c) : ScriptedAI(c)
+ boss_hadronoxAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
fMaxDistance = 50.0f;
bFirstTime = true;
}
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 878e1f7555f..4d83be53c93 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -94,9 +94,9 @@ public:
struct boss_krik_thirAI : public ScriptedAI
{
- boss_krik_thirAI(Creature* c) : ScriptedAI(c)
+ boss_krik_thirAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -212,7 +212,7 @@ public:
struct npc_skittering_infectorAI : public ScriptedAI
{
- npc_skittering_infectorAI(Creature* c) : ScriptedAI(c) {}
+ npc_skittering_infectorAI(Creature* creature) : ScriptedAI(creature) {}
void JustDied(Unit* /*killer*/)
{
@@ -234,7 +234,7 @@ public:
struct npc_anub_ar_skirmisherAI : public ScriptedAI
{
- npc_anub_ar_skirmisherAI(Creature* c) : ScriptedAI(c) {}
+ npc_anub_ar_skirmisherAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiChargeTimer;
uint32 uiBackstabTimer;
@@ -285,7 +285,7 @@ public:
struct npc_anub_ar_shadowcasterAI : public ScriptedAI
{
- npc_anub_ar_shadowcasterAI(Creature* c) : ScriptedAI(c) {}
+ npc_anub_ar_shadowcasterAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiShadowBoltTimer;
uint32 uiShadowNovaTimer;
@@ -331,7 +331,7 @@ public:
struct npc_anub_ar_warriorAI : public ScriptedAI
{
- npc_anub_ar_warriorAI(Creature* c) : ScriptedAI(c){}
+ npc_anub_ar_warriorAI(Creature* creature) : ScriptedAI(creature){}
uint32 uiCleaveTimer;
uint32 uiStrikeTimer;
@@ -376,7 +376,7 @@ public:
struct npc_watcher_gashraAI : public ScriptedAI
{
- npc_watcher_gashraAI(Creature* c) : ScriptedAI(c) {}
+ npc_watcher_gashraAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiWebWrapTimer;
uint32 uiInfectedBiteTimer;
@@ -427,7 +427,7 @@ public:
struct npc_watcher_narjilAI : public ScriptedAI
{
- npc_watcher_narjilAI(Creature* c) : ScriptedAI(c) {}
+ npc_watcher_narjilAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiWebWrapTimer;
uint32 uiInfectedBiteTimer;
@@ -481,7 +481,7 @@ public:
struct npc_watcher_silthikAI : public ScriptedAI
{
- npc_watcher_silthikAI(Creature* c) : ScriptedAI(c) {}
+ npc_watcher_silthikAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiWebWrapTimer;
uint32 uiInfectedBiteTimer;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 5418cf8c4d0..9ff8ee9c9ed 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -72,9 +72,9 @@ public:
struct boss_novosAI : public Scripted_NoMovementAI
{
- boss_novosAI(Creature* c) : Scripted_NoMovementAI(c), lSummons(me)
+ boss_novosAI(Creature* creature) : Scripted_NoMovementAI(creature), lSummons(me)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiTimer;
@@ -260,9 +260,9 @@ public:
struct mob_crystal_handlerAI : public ScriptedAI
{
- mob_crystal_handlerAI(Creature* c) : ScriptedAI(c)
+ mob_crystal_handlerAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiFlashOfDarknessTimer;
@@ -317,9 +317,9 @@ public:
struct mob_novos_minionAI : public ScriptedAI
{
- mob_novos_minionAI(Creature* c) : ScriptedAI(c)
+ mob_novos_minionAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 97f2ee4e9a1..b1d588a0d0d 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -71,9 +71,9 @@ public:
struct boss_tharon_jaAI : public ScriptedAI
{
- boss_tharon_jaAI(Creature* c) : ScriptedAI(c)
+ boss_tharon_jaAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiPhaseTimer;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 9fc964000e3..26e4e9db99e 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -61,9 +61,9 @@ public:
struct boss_trollgoreAI : public ScriptedAI
{
- boss_trollgoreAI(Creature* c) : ScriptedAI(c), lSummons(me)
+ boss_trollgoreAI(Creature* creature) : ScriptedAI(creature), lSummons(me)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiConsumeTimer;
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 9b627281775..8f9d5584c4c 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -633,7 +633,7 @@ public:
struct npc_ghostly_priestAI: public ScriptedAI
{
- npc_ghostly_priestAI(Creature* c) : ScriptedAI(c)
+ npc_ghostly_priestAI(Creature* creature) : ScriptedAI(creature)
{
}
@@ -715,7 +715,7 @@ public:
struct npc_phantom_mageAI: public ScriptedAI
{
- npc_phantom_mageAI(Creature* c) : ScriptedAI(c)
+ npc_phantom_mageAI(Creature* creature) : ScriptedAI(creature)
{
}
@@ -816,7 +816,7 @@ public:
struct npc_shadowy_mercenaryAI: public ScriptedAI
{
- npc_shadowy_mercenaryAI(Creature* c) : ScriptedAI(c)
+ npc_shadowy_mercenaryAI(Creature* creature) : ScriptedAI(creature)
{
}
@@ -887,7 +887,7 @@ public:
struct npc_spectral_footmanAI: public ScriptedAI
{
- npc_spectral_footmanAI(Creature* c) : ScriptedAI(c)
+ npc_spectral_footmanAI(Creature* creature) : ScriptedAI(creature)
{
}
@@ -952,7 +952,7 @@ public:
struct npc_tortured_riflemanAI : public ScriptedAI
{
- npc_tortured_riflemanAI(Creature* c) : ScriptedAI(c)
+ npc_tortured_riflemanAI(Creature* creature) : ScriptedAI(creature)
{
}
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index c665d3cdf5a..b79e4d1edfd 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -41,9 +41,9 @@ public:
struct boss_eckAI : public ScriptedAI
{
- boss_eckAI(Creature* c) : ScriptedAI(c)
+ boss_eckAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiBerserkTimer;
@@ -145,9 +145,9 @@ public:
struct npc_ruins_dwellerAI : public ScriptedAI
{
- npc_ruins_dwellerAI(Creature* c) : ScriptedAI(c)
+ npc_ruins_dwellerAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index daa5ee86483..be9b09a1263 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -75,9 +75,9 @@ public:
struct boss_gal_darahAI : public ScriptedAI
{
- boss_gal_darahAI(Creature* c) : ScriptedAI(c)
+ boss_gal_darahAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiStampedeTimer;
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 5071802f897..b827f43dc99 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -80,9 +80,9 @@ public:
struct boss_slad_ranAI : public ScriptedAI
{
- boss_slad_ranAI(Creature* c) : ScriptedAI(c), lSummons(me)
+ boss_slad_ranAI(Creature* creature) : ScriptedAI(creature), lSummons(me)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiPoisonNovaTimer;
@@ -219,7 +219,7 @@ public:
struct mob_slad_ran_constrictorAI : public ScriptedAI
{
- mob_slad_ran_constrictorAI(Creature* c) : ScriptedAI(c) {}
+ mob_slad_ran_constrictorAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiGripOfSladRanTimer;
@@ -272,7 +272,7 @@ public:
struct mob_slad_ran_viperAI : public ScriptedAI
{
- mob_slad_ran_viperAI(Creature* c) : ScriptedAI(c) {}
+ mob_slad_ran_viperAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiVenomousBiteTimer;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index ef222963dfb..5720ce0e423 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1204,7 +1204,7 @@ class npc_crok_scourgebane : public CreatureScript
struct npc_argent_captainAI : public ScriptedAI
{
public:
- npc_argent_captainAI(Creature* creature) : ScriptedAI(creature), Instance(creature->GetInstanceScript()), _firstDeath(true)
+ npc_argent_captainAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()), _firstDeath(true)
{
FollowAngle = PET_FOLLOW_ANGLE;
FollowDist = PET_FOLLOW_DIST;
@@ -1232,7 +1232,7 @@ struct npc_argent_captainAI : public ScriptedAI
{
if (action == ACTION_START_GAUNTLET)
{
- if (Creature* crok = ObjectAccessor::GetCreature(*me, Instance->GetData64(DATA_CROK_SCOURGEBANE)))
+ if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_CROK_SCOURGEBANE)))
{
me->SetReactState(REACT_DEFENSIVE);
FollowAngle = me->GetAngle(crok) + me->GetOrientation();
@@ -1276,7 +1276,7 @@ struct npc_argent_captainAI : public ScriptedAI
if (!me->GetVehicle())
{
me->GetMotionMaster()->Clear(false);
- if (Creature* crok = ObjectAccessor::GetCreature(*me, Instance->GetData64(DATA_CROK_SCOURGEBANE)))
+ if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_CROK_SCOURGEBANE)))
me->GetMotionMaster()->MoveFollow(crok, FollowDist, FollowAngle, MOTION_SLOT_IDLE);
}
@@ -1309,14 +1309,14 @@ struct npc_argent_captainAI : public ScriptedAI
}
Talk(SAY_CAPTAIN_RESURRECTED);
- me->UpdateEntry(newEntry, Instance->GetData(DATA_TEAM_IN_INSTANCE), me->GetCreatureData());
+ me->UpdateEntry(newEntry, instance->GetData(DATA_TEAM_IN_INSTANCE), me->GetCreatureData());
DoCast(me, SPELL_UNDEATH, true);
}
}
protected:
EventMap Events;
- InstanceScript* Instance;
+ InstanceScript* instance;
float FollowAngle;
float FollowDist;
bool IsUndead;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index e64099da3ac..04360d25be3 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -295,9 +295,9 @@ public:
struct mob_stalaggAI : public ScriptedAI
{
- mob_stalaggAI(Creature* c) : ScriptedAI(c)
+ mob_stalaggAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -381,9 +381,9 @@ public:
struct mob_feugenAI : public ScriptedAI
{
- mob_feugenAI(Creature* c) : ScriptedAI(c)
+ mob_feugenAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 44c6c25fa3e..91333098560 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -61,9 +61,9 @@ public:
struct boss_keristraszaAI : public ScriptedAI
{
- boss_keristraszaAI(Creature* c) : ScriptedAI(c)
+ boss_keristraszaAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 03f467ce180..ad188738c12 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -67,9 +67,9 @@ public:
struct boss_magus_telestraAI : public ScriptedAI
{
- boss_magus_telestraAI(Creature* c) : ScriptedAI(c)
+ boss_magus_telestraAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 4453ec94494..577bc3cc822 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -61,9 +61,9 @@ public:
struct boss_ormorokAI : public ScriptedAI
{
- boss_ormorokAI(Creature* c) : ScriptedAI(c)
+ boss_ormorokAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -234,7 +234,7 @@ public:
struct mob_crystal_spikeAI : public Scripted_NoMovementAI
{
- mob_crystal_spikeAI(Creature* c) : Scripted_NoMovementAI(c)
+ mob_crystal_spikeAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
}
@@ -277,7 +277,7 @@ public:
struct mob_crystalline_tanglerAI : public ScriptedAI
{
- mob_crystalline_tanglerAI(Creature* c) : ScriptedAI(c) {}
+ mob_crystalline_tanglerAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiRootsTimer;
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
index 6d07ac960b5..5ea3eb32c1d 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
@@ -49,7 +49,7 @@ public:
struct boss_commander_kolurgAI : public ScriptedAI
{
- boss_commander_kolurgAI(Creature* c) : ScriptedAI(c) {}
+ boss_commander_kolurgAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() {}
void EnterCombat(Unit* /*who*/) {}
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
index 71a153c802a..da4b49740c1 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
@@ -49,7 +49,7 @@ public:
struct boss_commander_stoutbeardAI : public ScriptedAI
{
- boss_commander_stoutbeardAI(Creature* c) : ScriptedAI(c) {}
+ boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() {}
void EnterCombat(Unit* /*who*/)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index d1aba800094..bc57ce21a4d 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -61,9 +61,9 @@ public:
struct boss_krystallusAI : public ScriptedAI
{
- boss_krystallusAI(Creature* c) : ScriptedAI(c)
+ boss_krystallusAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiBoulderTossTimer;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index cd4d7ae94a1..65711643827 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -65,7 +65,7 @@ public:
struct boss_maiden_of_griefAI : public ScriptedAI
{
- boss_maiden_of_griefAI(Creature* c) : ScriptedAI(c)
+ boss_maiden_of_griefAI(Creature* creature) : ScriptedAI(creature)
{
instance = me->GetInstanceScript();
}
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index 2c7026207e5..c2a8e905950 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -90,9 +90,9 @@ public:
struct boss_sjonnirAI : public ScriptedAI
{
- boss_sjonnirAI(Creature* c) : ScriptedAI(c), lSummons(me)
+ boss_sjonnirAI(Creature* creature) : ScriptedAI(creature), lSummons(me)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
bool bIsFrenzy;
@@ -258,7 +258,7 @@ public:
struct mob_malformed_oozeAI : public ScriptedAI
{
- mob_malformed_oozeAI(Creature* c) : ScriptedAI(c) {}
+ mob_malformed_oozeAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiMergeTimer;
@@ -301,9 +301,9 @@ public:
struct mob_iron_sludgeAI : public ScriptedAI
{
- mob_iron_sludgeAI(Creature* c) : ScriptedAI(c)
+ mob_iron_sludgeAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index 1a09db675c6..cba123e6efc 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -142,9 +142,9 @@ public:
struct mob_tribuna_controllerAI : public ScriptedAI
{
- mob_tribuna_controllerAI(Creature* c) : ScriptedAI(c)
+ mob_tribuna_controllerAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
SetCombatMovement(false);
}
@@ -298,9 +298,9 @@ public:
struct npc_brann_hosAI : public npc_escortAI
{
- npc_brann_hosAI(Creature* c) : npc_escortAI(c)
+ npc_brann_hosAI(Creature* creature) : npc_escortAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiStep;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp
index e54d8a898de..2dd13e7ce07 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon.cpp
@@ -81,9 +81,9 @@ public:
struct boss_algalonAI : public ScriptedAI
{
- boss_algalonAI(Creature* c) : ScriptedAI(c)
+ boss_algalonAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
Summon = false; // not in reset. intro speech done only once.
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 7d37621e787..e1f025f01c0 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -309,9 +309,9 @@ public:
struct mob_annhylde_the_callerAI : public ScriptedAI
{
- mob_annhylde_the_callerAI(Creature* c) : ScriptedAI(c)
+ mob_annhylde_the_callerAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
float x, y, z;
@@ -424,7 +424,7 @@ public:
struct mob_ingvar_throw_dummyAI : public ScriptedAI
{
- mob_ingvar_throw_dummyAI(Creature* c) : ScriptedAI(c)
+ mob_ingvar_throw_dummyAI(Creature* creature) : ScriptedAI(creature)
{
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index 333278daa10..17ad7b36439 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -69,9 +69,9 @@ public:
struct boss_skarvald_the_constructorAI : public ScriptedAI
{
- boss_skarvald_the_constructorAI(Creature* c) : ScriptedAI(c)
+ boss_skarvald_the_constructorAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -221,9 +221,9 @@ public:
struct boss_dalronn_the_controllerAI : public ScriptedAI
{
- boss_dalronn_the_controllerAI(Creature* c) : ScriptedAI(c)
+ boss_dalronn_the_controllerAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index d660b1516b3..50417b0ac07 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -37,9 +37,9 @@ public:
struct npc_dragonflayer_forge_masterAI : public ScriptedAI
{
- npc_dragonflayer_forge_masterAI(Creature* c) : ScriptedAI(c)
+ npc_dragonflayer_forge_masterAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
fm_Type = 0;
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index d40dba22fcd..474f7f2ba06 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -94,9 +94,9 @@ public:
struct boss_palehoofAI : public ScriptedAI
{
- boss_palehoofAI(Creature* c) : ScriptedAI(c)
+ boss_palehoofAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiArcingSmashTimer;
@@ -297,9 +297,9 @@ public:
struct mob_ravenous_furbolgAI : public ScriptedAI
{
- mob_ravenous_furbolgAI(Creature* c) : ScriptedAI(c)
+ mob_ravenous_furbolgAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiChainLightingTimer;
@@ -410,9 +410,9 @@ public:
struct mob_frenzied_worgenAI : public ScriptedAI
{
- mob_frenzied_worgenAI(Creature* c) : ScriptedAI(c)
+ mob_frenzied_worgenAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiMortalWoundTimer;
@@ -526,9 +526,9 @@ public:
struct mob_ferocious_rhinoAI : public ScriptedAI
{
- mob_ferocious_rhinoAI(Creature* c) : ScriptedAI(c)
+ mob_ferocious_rhinoAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiStompTimer;
@@ -646,9 +646,9 @@ public:
struct mob_massive_jormungarAI : public ScriptedAI
{
- mob_massive_jormungarAI(Creature* c) : ScriptedAI(c)
+ mob_massive_jormungarAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiAcidSpitTimer;
@@ -752,9 +752,9 @@ public:
struct mob_palehoof_orbAI : public ScriptedAI
{
- mob_palehoof_orbAI(Creature* c) : ScriptedAI(c)
+ mob_palehoof_orbAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 5ce26ab1467..093fa0be1a6 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -168,9 +168,9 @@ public:
struct boss_skadiAI : public ScriptedAI
{
- boss_skadiAI(Creature* c) : ScriptedAI(c), Summons(me)
+ boss_skadiAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
- m_instance = c->GetInstanceScript();
+ m_instance = creature->GetInstanceScript();
}
InstanceScript* m_instance;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 0d8e22ff630..f9251c637ba 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -108,9 +108,9 @@ public:
struct boss_ymironAI : public ScriptedAI
{
- boss_ymironAI(Creature* c) : ScriptedAI(c)
+ boss_ymironAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
for (int i = 0; i < 4; ++i)
m_uiActiveOrder[i] = i;
for (int i = 0; i < 3; ++i)
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
index 162f59fa5b7..100f1fccac8 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
@@ -125,7 +125,7 @@ class mob_frost_warder : public CreatureScript
struct mob_frost_warderAI : public ScriptedAI
{
- mob_frost_warderAI(Creature* c) : ScriptedAI(c) {}
+ mob_frost_warderAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
{
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 74fc2505969..df33ffff01a 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -57,9 +57,9 @@ public:
struct boss_cyanigosaAI : public ScriptedAI
{
- boss_cyanigosaAI(Creature* c) : ScriptedAI(c)
+ boss_cyanigosaAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiArcaneVacuumTimer;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index 63f0cd39893..31902acfc46 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -55,9 +55,9 @@ public:
struct boss_erekemAI : public ScriptedAI
{
- boss_erekemAI(Creature* c) : ScriptedAI(c)
+ boss_erekemAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiBloodlustTimer;
@@ -270,9 +270,9 @@ public:
struct mob_erekem_guardAI : public ScriptedAI
{
- mob_erekem_guardAI(Creature* c) : ScriptedAI(c)
+ mob_erekem_guardAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiGushingWoundTimer;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
index c5b2cb3c327..7a8254ad2b6 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
@@ -41,9 +41,9 @@ public:
struct boss_lavanthorAI : public ScriptedAI
{
- boss_lavanthorAI(Creature* c) : ScriptedAI(c)
+ boss_lavanthorAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiFireboltTimer;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index 84b04579681..1a70846e1b6 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -37,9 +37,9 @@ public:
struct boss_moraggAI : public ScriptedAI
{
- boss_moraggAI(Creature* c) : ScriptedAI(c)
+ boss_moraggAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiOpticLinkTimer;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index ff2009c2a17..4569741e459 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -61,9 +61,9 @@ public:
struct boss_zuramatAI : public ScriptedAI
{
- boss_zuramatAI(Creature* c) : ScriptedAI(c)
+ boss_zuramatAI(Creature* creature) : ScriptedAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
InstanceScript* instance;
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index a0fe468a91b..0ca9ca84b57 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -426,9 +426,9 @@ public:
struct mob_azure_saboteurAI : public npc_escortAI
{
- mob_azure_saboteurAI(Creature* c):npc_escortAI(c)
+ mob_azure_saboteurAI(Creature* creature):npc_escortAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bHasGotMovingPoints = false;
uiBoss = 0;
Reset();
@@ -550,9 +550,9 @@ public:
struct npc_teleportation_portalAI : public ScriptedAI
{
- npc_teleportation_portalAI(Creature* c) : ScriptedAI(c), listOfMobs(me)
+ npc_teleportation_portalAI(Creature* creature) : ScriptedAI(creature), listOfMobs(me)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs
bPortalGuardianOrKeeperOrEliteSpawn = false;
}
@@ -675,9 +675,9 @@ public:
struct violet_hold_trashAI : public npc_escortAI
{
- violet_hold_trashAI(Creature* c):npc_escortAI(c)
+ violet_hold_trashAI(Creature* creature):npc_escortAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
bHasGotMovingPoints = false;
if (instance)
portalLocationID = instance->GetData(DATA_PORTAL_LOCATION);
@@ -808,9 +808,9 @@ public:
struct mob_azure_invaderAI : public violet_hold_trashAI
{
- mob_azure_invaderAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_invaderAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiCleaveTimer;
@@ -886,9 +886,9 @@ public:
struct mob_azure_binderAI : public violet_hold_trashAI
{
- mob_azure_binderAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_binderAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiArcaneExplosionTimer;
@@ -964,9 +964,9 @@ public:
struct mob_azure_mage_slayerAI : public violet_hold_trashAI
{
- mob_azure_mage_slayerAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_mage_slayerAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiArcaneEmpowermentTimer;
@@ -1024,9 +1024,9 @@ public:
struct mob_azure_raiderAI : public violet_hold_trashAI
{
- mob_azure_raiderAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_raiderAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiConcussionBlowTimer;
@@ -1076,9 +1076,9 @@ public:
struct mob_azure_stalkerAI : public violet_hold_trashAI
{
- mob_azure_stalkerAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_stalkerAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiBackstabTimer;
uint32 uiTacticalBlinkTimer;
@@ -1135,9 +1135,9 @@ public:
struct mob_azure_spellbreakerAI : public violet_hold_trashAI
{
- mob_azure_spellbreakerAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_spellbreakerAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiArcaneBlastTimer;
@@ -1219,9 +1219,9 @@ public:
struct mob_azure_captainAI : public violet_hold_trashAI
{
- mob_azure_captainAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_captainAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiMortalStrikeTimer;
@@ -1271,9 +1271,9 @@ public:
struct mob_azure_sorcerorAI : public violet_hold_trashAI
{
- mob_azure_sorcerorAI(Creature* c) : violet_hold_trashAI(c)
+ mob_azure_sorcerorAI(Creature* creature) : violet_hold_trashAI(creature)
{
- instance = c->GetInstanceScript();
+ instance = creature->GetInstanceScript();
}
uint32 uiArcaneStreamTimer;
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 3f0a85ce561..97155d8cd67 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -60,7 +60,7 @@ public:
struct npc_sinkhole_kill_creditAI : public ScriptedAI
{
- npc_sinkhole_kill_creditAI(Creature* c) : ScriptedAI(c){}
+ npc_sinkhole_kill_creditAI(Creature* creature) : ScriptedAI(creature){}
uint32 uiPhaseTimer;
uint8 Phase;
@@ -170,7 +170,7 @@ public:
struct npc_khunok_the_behemothAI : public ScriptedAI
{
- npc_khunok_the_behemothAI(Creature* c) : ScriptedAI(c) {}
+ npc_khunok_the_behemothAI(Creature* creature) : ScriptedAI(creature) {}
void MoveInLineOfSight(Unit* who)
{
@@ -350,7 +350,7 @@ public:
struct mob_nerubar_victimAI : public ScriptedAI
{
- mob_nerubar_victimAI(Creature* c) : ScriptedAI(c) {}
+ mob_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() {}
void EnterCombat(Unit* /*who*/) {}
@@ -575,7 +575,7 @@ public:
struct npc_nesingwary_trapperAI : public ScriptedAI
{
- npc_nesingwary_trapperAI(Creature* c) : ScriptedAI(c) { c->SetVisible(false); }
+ npc_nesingwary_trapperAI(Creature* creature) : ScriptedAI(creature) { creature->SetVisible(false); }
uint64 go_caribouGUID;
uint8 Phase;
@@ -1841,7 +1841,7 @@ public:
struct npc_mootoo_the_youngerAI : public npc_escortAI
{
- npc_mootoo_the_youngerAI(Creature* c) : npc_escortAI(c) {}
+ npc_mootoo_the_youngerAI(Creature* creature) : npc_escortAI(creature) {}
void Reset()
{
@@ -1926,7 +1926,7 @@ public:
struct npc_bonker_togglevoltAI : public npc_escortAI
{
- npc_bonker_togglevoltAI(Creature* c) : npc_escortAI(c) {}
+ npc_bonker_togglevoltAI(Creature* creature) : npc_escortAI(creature) {}
uint32 Bonker_agro;
void Reset()
@@ -2026,7 +2026,7 @@ public:
struct npc_trapped_mammoth_calfAI : public ScriptedAI
{
- npc_trapped_mammoth_calfAI(Creature* c) : ScriptedAI(c) {}
+ npc_trapped_mammoth_calfAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiTimer;
bool bStarted;
@@ -2114,7 +2114,7 @@ public:
struct npc_magmoth_crusherAI : public ScriptedAI
{
- npc_magmoth_crusherAI(Creature* c) : ScriptedAI(c) {}
+ npc_magmoth_crusherAI(Creature* creature) : ScriptedAI(creature) {}
void JustDied(Unit* killer)
{
@@ -2150,7 +2150,7 @@ public:
struct npc_seaforium_depth_chargeAI : public ScriptedAI
{
- npc_seaforium_depth_chargeAI(Creature* c) : ScriptedAI(c) {}
+ npc_seaforium_depth_chargeAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiExplosionTimer;
void Reset()
@@ -2203,7 +2203,7 @@ public:
struct npc_valiance_keep_cannoneerAI : public ScriptedAI
{
- npc_valiance_keep_cannoneerAI(Creature* c) : ScriptedAI(c) {}
+ npc_valiance_keep_cannoneerAI(Creature* creature) : ScriptedAI(creature) {}
uint32 uiTimer;
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index fdebe3b7ab1..7894d87df7c 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -233,7 +233,7 @@ public:
struct npc_mrfloppyAI : public ScriptedAI
{
- npc_mrfloppyAI(Creature* c) : ScriptedAI(c) {}
+ npc_mrfloppyAI(Creature* creature) : ScriptedAI(creature) {}
uint64 EmilyGUID;
uint64 RWORGGUID;
@@ -471,7 +471,7 @@ public:
struct npc_wounded_skirmisherAI : public ScriptedAI
{
- npc_wounded_skirmisherAI(Creature* c) : ScriptedAI(c) {}
+ npc_wounded_skirmisherAI(Creature* creature) : ScriptedAI(creature) {}
uint64 uiPlayerGUID;
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index d43cf6fb98f..5260ea33eb6 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -55,7 +55,7 @@ public:
struct npc_injured_rainspeaker_oracleAI : public npc_escortAI
{
- npc_injured_rainspeaker_oracleAI(Creature* c) : npc_escortAI(c) { c_guid = c->GetGUID(); }
+ npc_injured_rainspeaker_oracleAI(Creature* creature) : npc_escortAI(creature) { c_guid = creature->GetGUID(); }
uint64 c_guid;