Skip to content

Commit

Permalink
Merge pull request #5702 from Gyx/master
Browse files Browse the repository at this point in the history 
Core/Script: Clean-Up in Scripts.
  • Loading branch information
Discover- committed Mar 14, 2012
2 parents 1dde223 + 117fbb9 commit 69c3612
Show file tree
Hide file tree
Showing 217 changed files with 724 additions and 725 deletions.
10 changes: 5 additions & 5 deletions src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ class mob_phalanx : public CreatureScript

struct mob_phalanxAI : public ScriptedAI
{
mob_phalanxAI(Creature* c) : ScriptedAI(c) {}
mob_phalanxAI(Creature* creature) : ScriptedAI(creature) {}

uint32 ThunderClap_Timer;
uint32 FireballVolley_Timer;
Expand Down Expand Up @@ -609,7 +609,7 @@ class npc_dughal_stormwing : public CreatureScript
struct npc_dughal_stormwingAI : public npc_escortAI
{
npc_dughal_stormwingAI(Creature* c) : npc_escortAI(c) {}
npc_dughal_stormwingAI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
Expand Down Expand Up @@ -725,9 +725,9 @@ class npc_marshal_windsor : public CreatureScript
struct npc_marshal_windsorAI : public npc_escortAI
{
npc_marshal_windsorAI(Creature* c) : npc_escortAI(c)
npc_marshal_windsorAI(Creature* creature) : npc_escortAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
void WaypointReached(uint32 i)
Expand Down Expand Up @@ -896,7 +896,7 @@ class npc_marshal_reginald_windsor : public CreatureScript
struct npc_marshal_reginald_windsorAI : public npc_escortAI
{
npc_marshal_reginald_windsorAI(Creature* c) : npc_escortAI(c)
npc_marshal_reginald_windsorAI(Creature* creature) : npc_escortAI(creature)
{
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class boss_curator : public CreatureScript

struct boss_curatorAI : public ScriptedAI
{
boss_curatorAI(Creature* c) : ScriptedAI(c) {}
boss_curatorAI(Creature* creature) : ScriptedAI(creature) {}

uint32 AddTimer;
uint32 HatefulBoltTimer;
Expand Down
2 changes: 1 addition & 1 deletion src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class boss_maiden_of_virtue : public CreatureScript

struct boss_maiden_of_virtueAI : public ScriptedAI
{
boss_maiden_of_virtueAI(Creature* c) : ScriptedAI(c) {}
boss_maiden_of_virtueAI(Creature* creature) : ScriptedAI(creature) {}

uint32 Repentance_Timer;
uint32 Holyfire_Timer;
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class boss_attumen : public CreatureScript

struct boss_attumenAI : public ScriptedAI
{
boss_attumenAI(Creature* c) : ScriptedAI(c)
boss_attumenAI(Creature* creature) : ScriptedAI(creature)
{
Phase = 1;

Expand Down Expand Up @@ -119,7 +119,7 @@ class boss_midnight : public CreatureScript

struct boss_midnightAI : public ScriptedAI
{
boss_midnightAI(Creature* c) : ScriptedAI(c) {}
boss_midnightAI(Creature* creature) : ScriptedAI(creature) {}

uint64 Attumen;
uint8 Phase;
Expand Down
11 changes: 5 additions & 6 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,12 @@ class boss_moroes : public CreatureScript

struct boss_moroesAI : public ScriptedAI
{
boss_moroesAI(Creature* c) : ScriptedAI(c)
boss_moroesAI(Creature* creature) : ScriptedAI(creature)
{
for (uint8 i = 0; i < 4; ++i)
{
AddId[i] = 0;
}
instance = c->GetInstanceScript();

instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -322,12 +321,12 @@ struct boss_moroes_guestAI : public ScriptedAI

uint64 GuestGUID[4];

boss_moroes_guestAI(Creature* c) : ScriptedAI(c)
boss_moroes_guestAI(Creature* creature) : ScriptedAI(creature)
{
for (uint8 i = 0; i < 4; ++i)
GuestGUID[i] = 0;

instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

void Reset()
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ class boss_netherspite : public CreatureScript

struct boss_netherspiteAI : public ScriptedAI
{
boss_netherspiteAI(Creature* c) : ScriptedAI(c)
boss_netherspiteAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();

for (int i=0; i<3; ++i)
{
Expand Down
4 changes: 2 additions & 2 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ class boss_nightbane : public CreatureScript

struct boss_nightbaneAI : public ScriptedAI
{
boss_nightbaneAI(Creature* c) : ScriptedAI(c)
boss_nightbaneAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
Intro = true;
}

Expand Down
6 changes: 3 additions & 3 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class netherspite_infernal : public CreatureScript

struct netherspite_infernalAI : public ScriptedAI
{
netherspite_infernalAI(Creature* c) : ScriptedAI(c),
netherspite_infernalAI(Creature* creature) : ScriptedAI(creature),
HellfireTimer(0), CleanupTimer(0), malchezaar(0), point(NULL) {}

uint32 HellfireTimer;
Expand Down Expand Up @@ -183,9 +183,9 @@ class boss_malchezaar : public CreatureScript

struct boss_malchezaarAI : public ScriptedAI
{
boss_malchezaarAI(Creature* c) : ScriptedAI(c)
boss_malchezaarAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down
6 changes: 3 additions & 3 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ class boss_shade_of_aran : public CreatureScript

struct boss_aranAI : public ScriptedAI
{
boss_aranAI(Creature* c) : ScriptedAI(c)
boss_aranAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -522,7 +522,7 @@ class mob_aran_elemental : public CreatureScript

struct water_elementalAI : public ScriptedAI
{
water_elementalAI(Creature* c) : ScriptedAI(c) {}
water_elementalAI(Creature* creature) : ScriptedAI(creature) {}

uint32 CastTimer;

Expand Down
12 changes: 6 additions & 6 deletions src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ class mob_kilrek : public CreatureScript

struct mob_kilrekAI : public ScriptedAI
{
mob_kilrekAI(Creature* c) : ScriptedAI(c)
mob_kilrekAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -140,7 +140,7 @@ class mob_demon_chain : public CreatureScript

struct mob_demon_chainAI : public ScriptedAI
{
mob_demon_chainAI(Creature* c) : ScriptedAI(c) {}
mob_demon_chainAI(Creature* creature) : ScriptedAI(creature) {}

uint64 SacrificeGUID;

Expand Down Expand Up @@ -215,7 +215,7 @@ class mob_fiendish_imp : public CreatureScript

struct mob_fiendish_impAI : public ScriptedAI
{
mob_fiendish_impAI(Creature* c) : ScriptedAI(c) {}
mob_fiendish_impAI(Creature* creature) : ScriptedAI(creature) {}

uint32 FireboltTimer;

Expand Down Expand Up @@ -258,11 +258,11 @@ class boss_terestian_illhoof : public CreatureScript

struct boss_terestianAI : public ScriptedAI
{
boss_terestianAI(Creature* c) : ScriptedAI(c)
boss_terestianAI(Creature* creature) : ScriptedAI(creature)
{
for (uint8 i = 0; i < 2; ++i)
PortalGUID[i] = 0;
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down
36 changes: 18 additions & 18 deletions src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ class boss_dorothee : public CreatureScript

struct boss_dorotheeAI : public ScriptedAI
{
boss_dorotheeAI(Creature* c) : ScriptedAI(c)
boss_dorotheeAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -229,7 +229,7 @@ class mob_tito : public CreatureScript

struct mob_titoAI : public ScriptedAI
{
mob_titoAI(Creature* c) : ScriptedAI(c) {}
mob_titoAI(Creature* creature) : ScriptedAI(creature) {}

uint64 DorotheeGUID;
uint32 YipTimer;
Expand Down Expand Up @@ -296,9 +296,9 @@ class boss_strawman : public CreatureScript

struct boss_strawmanAI : public ScriptedAI
{
boss_strawmanAI(Creature* c) : ScriptedAI(c)
boss_strawmanAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -411,9 +411,9 @@ class boss_tinhead : public CreatureScript

struct boss_tinheadAI : public ScriptedAI
{
boss_tinheadAI(Creature* c) : ScriptedAI(c)
boss_tinheadAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -521,9 +521,9 @@ class boss_roar : public CreatureScript

struct boss_roarAI : public ScriptedAI
{
boss_roarAI(Creature* c) : ScriptedAI(c)
boss_roarAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -630,9 +630,9 @@ class boss_crone : public CreatureScript

struct boss_croneAI : public ScriptedAI
{
boss_croneAI(Creature* c) : ScriptedAI(c)
boss_croneAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -712,7 +712,7 @@ class mob_cyclone : public CreatureScript

struct mob_cycloneAI : public ScriptedAI
{
mob_cycloneAI(Creature* c) : ScriptedAI(c) {}
mob_cycloneAI(Creature* creature) : ScriptedAI(creature) {}

uint32 MoveTimer;

Expand Down Expand Up @@ -805,9 +805,9 @@ class boss_bigbadwolf : public CreatureScript

struct boss_bigbadwolfAI : public ScriptedAI
{
boss_bigbadwolfAI(Creature* c) : ScriptedAI(c)
boss_bigbadwolfAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -1004,9 +1004,9 @@ class boss_julianne : public CreatureScript

struct boss_julianneAI : public ScriptedAI
{
boss_julianneAI(Creature* c) : ScriptedAI(c)
boss_julianneAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
EntryYellTimer = 1000;
AggroYellTimer = 10000;
IsFakingDeath = false;
Expand Down Expand Up @@ -1127,9 +1127,9 @@ class boss_romulo : public CreatureScript

struct boss_romuloAI : public ScriptedAI
{
boss_romuloAI(Creature* c) : ScriptedAI(c)
boss_romuloAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
EntryYellTimer = 8000;
AggroYellTimer = 15000;
}
Expand Down
8 changes: 4 additions & 4 deletions src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ class npc_barnes : public CreatureScript

struct npc_barnesAI : public npc_escortAI
{
npc_barnesAI(Creature* c) : npc_escortAI(c)
npc_barnesAI(Creature* creature) : npc_escortAI(creature)
{
RaidWiped = false;
m_uiEventId = 0;
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down Expand Up @@ -474,9 +474,9 @@ class npc_image_of_medivh : public CreatureScript

struct npc_image_of_medivhAI : public ScriptedAI
{
npc_image_of_medivhAI(Creature* c) : ScriptedAI(c)
npc_image_of_medivhAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}

InstanceScript* instance;
Expand Down
Loading

2 comments on commit 69c3612

@JasperAppec
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice commit Gyx. :)

@oMadMano
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=)))

Please sign in to comment.