aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-16 19:21:47 +0800
committerGyx <2359980687@qq.com>2012-03-16 19:21:47 +0800
commitfcbb222acaeaeec8ae282709e8f552cc1e256a07 (patch)
tree6879e600263f4f1499046364852163d2de8c1532 /src/server/scripts/EasternKingdoms
parentef53bde176e213017c2346d9fcac0ab121b28974 (diff)
Core/Script: Clean-Up in Scripts.
Creature* c -> Creature* creature Creature* _Creature -> Creature* creature Creature* Creature -> Creature* creature Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp12
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp19
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp12
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp16
7 files changed, 34 insertions, 31 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index 8edf6260f58..566e8c977dc 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -1089,7 +1089,7 @@ public:
struct npc_tobias_seecherAI : public npc_escortAI
{
- npc_tobias_seecherAI(Creature* c) :npc_escortAI(c) {}
+ npc_tobias_seecherAI(Creature* creature) : npc_escortAI(creature) {}
void EnterCombat(Unit* who) {}
void Reset() {}
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
index ec80ae02ca9..447703aa5a7 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
@@ -416,7 +416,7 @@ public:
struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI
{
//Shadow Priest
- boss_baroness_dorothea_millstipeAI(Creature* c) : boss_moroes_guestAI(c) {}
+ boss_baroness_dorothea_millstipeAI(Creature* creature) : boss_moroes_guestAI(creature) {}
uint32 ManaBurn_Timer;
uint32 MindFlay_Timer;
@@ -480,7 +480,7 @@ public:
struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
{
//Retr Pally
- boss_baron_rafe_dreugerAI(Creature* c) : boss_moroes_guestAI(c){}
+ boss_baron_rafe_dreugerAI(Creature* creature) : boss_moroes_guestAI(creature){}
uint32 HammerOfJustice_Timer;
uint32 SealOfCommand_Timer;
@@ -538,7 +538,7 @@ public:
struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI
{
//Holy Priest
- boss_lady_catriona_von_indiAI(Creature* c) : boss_moroes_guestAI(c) {}
+ boss_lady_catriona_von_indiAI(Creature* creature) : boss_moroes_guestAI(creature) {}
uint32 DispelMagic_Timer;
uint32 GreaterHeal_Timer;
@@ -609,7 +609,7 @@ public:
struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
{
//Holy Pally
- boss_lady_keira_berrybuckAI(Creature* c) : boss_moroes_guestAI(c) {}
+ boss_lady_keira_berrybuckAI(Creature* creature) : boss_moroes_guestAI(creature) {}
uint32 Cleanse_Timer;
uint32 GreaterBless_Timer;
@@ -684,7 +684,7 @@ public:
struct boss_lord_robin_darisAI : public boss_moroes_guestAI
{
//Arms Warr
- boss_lord_robin_darisAI(Creature* c) : boss_moroes_guestAI(c) {}
+ boss_lord_robin_darisAI(Creature* creature) : boss_moroes_guestAI(creature) {}
uint32 Hamstring_Timer;
uint32 MortalStrike_Timer;
@@ -741,7 +741,7 @@ public:
struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
{
//Arms Warr
- boss_lord_crispin_ferenceAI(Creature* c) : boss_moroes_guestAI(c) {}
+ boss_lord_crispin_ferenceAI(Creature* creature) : boss_moroes_guestAI(creature) {}
uint32 Disarm_Timer;
uint32 HeroicStrike_Timer;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index d0716a0b565..a192a1de267 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -178,7 +178,7 @@ public:
struct mob_fiendish_portalAI : public PassiveAI
{
- mob_fiendish_portalAI(Creature* c) : PassiveAI(c), summons(me){}
+ mob_fiendish_portalAI(Creature* creature) : PassiveAI(creature), summons(me){}
SummonList summons;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 9984554208f..883932fdb9b 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -495,7 +495,7 @@ public:
struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
{
//Rogue
- boss_kagani_nightstrikeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
uint32 Gouge_Timer;
uint32 Kick_Timer;
@@ -600,7 +600,7 @@ public:
struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
{
//Warlock
- boss_ellris_duskhallowAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
uint32 Immolate_Timer;
uint32 Shadow_Bolt_Timer;
@@ -692,7 +692,7 @@ public:
struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
{
//Monk
- boss_eramas_brightblazeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
uint32 Knockdown_Timer;
uint32 Snap_Kick_Timer;
@@ -754,7 +754,7 @@ public:
struct boss_yazzaiAI : public boss_priestess_lackey_commonAI
{
//Mage
- boss_yazzaiAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
bool HasIceBlocked;
@@ -885,7 +885,7 @@ public:
struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
{
//Warrior
- boss_warlord_salarisAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
uint32 Intercept_Stun_Timer;
uint32 Disarm_Timer;
@@ -1006,7 +1006,10 @@ public:
struct boss_garaxxasAI : public boss_priestess_lackey_commonAI
{
//Hunter
- boss_garaxxasAI(Creature* c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; }
+ boss_garaxxasAI(Creature* creature) : boss_priestess_lackey_commonAI(creature)
+ {
+ m_uiPetGUID = 0;
+ }
uint64 m_uiPetGUID;
@@ -1126,7 +1129,7 @@ public:
struct boss_apokoAI : public boss_priestess_lackey_commonAI
{
//Shaman
- boss_apokoAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_apokoAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
uint32 Totem_Timer;
uint8 Totem_Amount;
@@ -1225,7 +1228,7 @@ public:
struct boss_zelfanAI : public boss_priestess_lackey_commonAI
{
//Engineer
- boss_zelfanAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
+ boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature) {}
uint32 Goblin_Dragon_Gun_Timer;
uint32 Rocket_Launch_Timer;
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 0b45144f51b..5f8c243f5d5 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -293,7 +293,7 @@ public:
struct npc_unworthy_initiate_anchorAI : public PassiveAI
{
- npc_unworthy_initiate_anchorAI(Creature* c) : PassiveAI(c), prisonerGUID(0) {}
+ npc_unworthy_initiate_anchorAI(Creature* creature) : PassiveAI(creature), prisonerGUID(0) {}
uint64 prisonerGUID;
@@ -868,14 +868,14 @@ class npc_scarlet_miner_cart : public CreatureScript
public:
npc_scarlet_miner_cart() : CreatureScript("npc_scarlet_miner_cart") { }
- CreatureAI* GetAI(Creature* _Creature) const
+ CreatureAI* GetAI(Creature* creature) const
{
- return new npc_scarlet_miner_cartAI(_Creature);
+ return new npc_scarlet_miner_cartAI(creature);
}
struct npc_scarlet_miner_cartAI : public PassiveAI
{
- npc_scarlet_miner_cartAI(Creature* c) : PassiveAI(c), minerGUID(0)
+ npc_scarlet_miner_cartAI(Creature* creature) : PassiveAI(creature), minerGUID(0)
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->SetDisplayId(me->GetCreatureTemplate()->Modelid1); // Modelid2 is a horse.
@@ -924,9 +924,9 @@ class npc_scarlet_miner : public CreatureScript
public:
npc_scarlet_miner() : CreatureScript("npc_scarlet_miner") { }
- CreatureAI* GetAI(Creature* _Creature) const
+ CreatureAI* GetAI(Creature* creature) const
{
- return new npc_scarlet_minerAI(_Creature);
+ return new npc_scarlet_minerAI(creature);
}
struct npc_scarlet_minerAI : public npc_escortAI
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
index bf09e008dff..0ef2dddda8d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
@@ -35,7 +35,7 @@ public:
struct npc_valkyr_battle_maidenAI : public PassiveAI
{
- npc_valkyr_battle_maidenAI(Creature* c) : PassiveAI(c) {}
+ npc_valkyr_battle_maidenAI(Creature* creature) : PassiveAI(creature) {}
uint32 FlyBackTimer;
float x, y, z;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 944d13cc1be..683bed46bb0 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -488,7 +488,7 @@ class boss_thurg : public CreatureScript
struct boss_thurgAI : public boss_hexlord_addAI
{
- boss_thurgAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_thurgAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 bloodlust_timer;
uint32 cleave_timer;
@@ -548,7 +548,7 @@ class boss_alyson_antille : public CreatureScript
struct boss_alyson_antilleAI : public boss_hexlord_addAI
{
//Holy Priest
- boss_alyson_antilleAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_alyson_antilleAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 flashheal_timer;
uint32 dispelmagic_timer;
@@ -637,7 +637,7 @@ class boss_alyson_antille : public CreatureScript
struct boss_gazakrothAI : public boss_hexlord_addAI
{
- boss_gazakrothAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_gazakrothAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 firebolt_timer;
@@ -691,7 +691,7 @@ class boss_lord_raadan : public CreatureScript
struct boss_lord_raadanAI : public boss_hexlord_addAI
{
- boss_lord_raadanAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_lord_raadanAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 flamebreath_timer;
uint32 thunderclap_timer;
@@ -744,7 +744,7 @@ class boss_darkheart : public CreatureScript
struct boss_darkheartAI : public boss_hexlord_addAI
{
- boss_darkheartAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_darkheartAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 psychicwail_timer;
@@ -787,7 +787,7 @@ class boss_slither : public CreatureScript
struct boss_slitherAI : public boss_hexlord_addAI
{
- boss_slitherAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_slitherAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 venomspit_timer;
@@ -847,7 +847,7 @@ class boss_fenstalker : public CreatureScript
struct boss_fenstalkerAI : public boss_hexlord_addAI
{
- boss_fenstalkerAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_fenstalkerAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 volatileinf_timer;
@@ -894,7 +894,7 @@ class boss_koragg : public CreatureScript
struct boss_koraggAI : public boss_hexlord_addAI
{
- boss_koraggAI(Creature* c) : boss_hexlord_addAI(c) {}
+ boss_koraggAI(Creature* creature) : boss_hexlord_addAI(creature) {}
uint32 coldstare_timer;
uint32 mightyblow_timer;