aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/World
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/World
parent1dde22394c880a0839ced6bb70f778340800ec1c (diff)
parent117fbb9010743a0e688b837dd00a35c28fb16f25 (diff)
Merge pull request #5702 from Gyx/master
Core/Script: Clean-Up in Scripts.
Diffstat (limited to 'src/server/scripts/World')
-rw-r--r--src/server/scripts/World/mob_generic_creature.cpp2
-rw-r--r--src/server/scripts/World/npcs_special.cpp26
2 files changed, 14 insertions, 14 deletions
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index ce8b0a2de14..6970d5ae367 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -34,7 +34,7 @@ public:
struct generic_creatureAI : public ScriptedAI
{
- generic_creatureAI(Creature* c) : ScriptedAI(c) {}
+ generic_creatureAI(Creature* creature) : ScriptedAI(creature) {}
uint32 GlobalCooldown; //This variable acts like the global cooldown that players have (1.5 seconds)
uint32 BuffTimer; //This variable keeps track of buffs
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 67b04dab29d..046890b498d 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -315,7 +315,7 @@ public:
struct npc_chicken_cluckAI : public ScriptedAI
{
- npc_chicken_cluckAI(Creature* c) : ScriptedAI(c) {}
+ npc_chicken_cluckAI(Creature* creature) : ScriptedAI(creature) {}
uint32 ResetFlagTimer;
@@ -407,7 +407,7 @@ public:
struct npc_dancing_flamesAI : public ScriptedAI
{
- npc_dancing_flamesAI(Creature* c) : ScriptedAI(c) {}
+ npc_dancing_flamesAI(Creature* creature) : ScriptedAI(creature) {}
bool Active;
uint32 CanIteract;
@@ -558,7 +558,7 @@ public:
struct npc_doctorAI : public ScriptedAI
{
- npc_doctorAI(Creature* c) : ScriptedAI(c) {}
+ npc_doctorAI(Creature* creature) : ScriptedAI(creature) {}
uint64 PlayerGUID;
@@ -703,7 +703,7 @@ public:
struct npc_injured_patientAI : public ScriptedAI
{
- npc_injured_patientAI(Creature* c) : ScriptedAI(c) {}
+ npc_injured_patientAI(Creature* creature) : ScriptedAI(creature) {}
uint64 DoctorGUID;
Location* Coord;
@@ -905,7 +905,7 @@ public:
struct npc_garments_of_questsAI : public npc_escortAI
{
- npc_garments_of_questsAI(Creature* c) : npc_escortAI(c) {Reset();}
+ npc_garments_of_questsAI(Creature* creature) : npc_escortAI(creature) {Reset();}
uint64 CasterGUID;
@@ -1105,7 +1105,7 @@ public:
struct npc_guardianAI : public ScriptedAI
{
- npc_guardianAI(Creature* c) : ScriptedAI(c) {}
+ npc_guardianAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
{
@@ -1477,7 +1477,7 @@ public:
struct npc_steam_tonkAI : public ScriptedAI
{
- npc_steam_tonkAI(Creature* c) : ScriptedAI(c) {}
+ npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() {}
void EnterCombat(Unit* /*who*/) {}
@@ -1512,7 +1512,7 @@ public:
struct npc_tonk_mineAI : public ScriptedAI
{
- npc_tonk_mineAI(Creature* c) : ScriptedAI(c)
+ npc_tonk_mineAI(Creature* creature) : ScriptedAI(creature)
{
me->SetReactState(REACT_PASSIVE);
}
@@ -1557,7 +1557,7 @@ public:
struct npc_brewfest_revelerAI : public ScriptedAI
{
- npc_brewfest_revelerAI(Creature* c) : ScriptedAI(c) {}
+ npc_brewfest_revelerAI(Creature* creature) : ScriptedAI(creature) {}
void ReceiveEmote(Player* player, uint32 emote)
{
if (!IsHolidayActive(HOLIDAY_BREWFEST))
@@ -1593,7 +1593,7 @@ class npc_winter_reveler : public CreatureScript
struct npc_winter_revelerAI : public ScriptedAI
{
- npc_winter_revelerAI(Creature* c) : ScriptedAI(c) {}
+ npc_winter_revelerAI(Creature* creature) : ScriptedAI(creature) {}
void ReceiveEmote(Player* player, uint32 emote)
{
@@ -1638,7 +1638,7 @@ public:
struct npc_snake_trap_serpentsAI : public ScriptedAI
{
- npc_snake_trap_serpentsAI(Creature* c) : ScriptedAI(c) {}
+ npc_snake_trap_serpentsAI(Creature* creature) : ScriptedAI(creature) {}
uint32 SpellTimer;
bool IsViper;
@@ -1752,7 +1752,7 @@ public:
struct mob_mojoAI : public ScriptedAI
{
- mob_mojoAI(Creature* c) : ScriptedAI(c) {Reset();}
+ mob_mojoAI(Creature* creature) : ScriptedAI(creature) {Reset();}
uint32 hearts;
uint64 victimGUID;
void Reset()
@@ -3028,7 +3028,7 @@ public:
struct npc_spring_rabbitAI : public ScriptedAI
{
- npc_spring_rabbitAI(Creature* c) : ScriptedAI(c) { }
+ npc_spring_rabbitAI(Creature* creature) : ScriptedAI(creature) { }
bool inLove;
uint32 jumpTimer;