Core/Script: Clean-Up in Scripts.

Creature* c -> Creature* creature

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-14 09:20:36 +08:00
parent 1dde22394c
commit e8f414e143
216 changed files with 687 additions and 688 deletions
@@ -64,9 +64,9 @@ public:
struct boss_anetheronAI : public hyjal_trashAI
{
boss_anetheronAI(Creature* c) : hyjal_trashAI(c)
boss_anetheronAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
@@ -248,9 +248,9 @@ public:
struct mob_towering_infernalAI : public ScriptedAI
{
mob_towering_infernalAI(Creature* c) : ScriptedAI(c)
mob_towering_infernalAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
if (instance)
AnetheronGUID = instance->GetData64(DATA_ANETHERON);
}
@@ -86,9 +86,9 @@ public:
struct mob_ancient_wispAI : public ScriptedAI
{
mob_ancient_wispAI(Creature* c) : ScriptedAI(c)
mob_ancient_wispAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
ArchimondeGUID = 0;
}
@@ -142,7 +142,7 @@ public:
struct mob_doomfireAI : public ScriptedAI
{
mob_doomfireAI(Creature* c) : ScriptedAI(c) {}
mob_doomfireAI(Creature* creature) : ScriptedAI(creature) {}
void Reset() { }
@@ -167,7 +167,7 @@ public:
struct mob_doomfire_targettingAI : public ScriptedAI
{
mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) {}
mob_doomfire_targettingAI(Creature* creature) : ScriptedAI(creature) {}
uint64 TargetGUID;
uint32 ChangeTargetTimer;
@@ -233,9 +233,9 @@ public:
struct boss_archimondeAI : public hyjal_trashAI
{
boss_archimondeAI(Creature* c) : hyjal_trashAI(c)
boss_archimondeAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -55,9 +55,9 @@ public:
struct boss_azgalorAI : public hyjal_trashAI
{
boss_azgalorAI(Creature* c) : hyjal_trashAI(c)
boss_azgalorAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
@@ -215,9 +215,9 @@ public:
struct mob_lesser_doomguardAI : public hyjal_trashAI
{
mob_lesser_doomguardAI(Creature* c) : hyjal_trashAI(c)
mob_lesser_doomguardAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
if (instance)
AzgalorGUID = instance->GetData64(DATA_AZGALOR);
}
@@ -52,9 +52,9 @@ public:
struct boss_kazrogalAI : public hyjal_trashAI
{
boss_kazrogalAI(Creature* c) : hyjal_trashAI(c)
boss_kazrogalAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
@@ -58,9 +58,9 @@ public:
struct boss_rage_winterchillAI : public hyjal_trashAI
{
boss_rage_winterchillAI(Creature* c) : hyjal_trashAI(c)
boss_rage_winterchillAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
}
@@ -310,9 +310,9 @@ float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde
{5545.43f, -2647.82f, 1483.05f, 5.38848f, 0, 0, 0.432578f, -0.901596f}
};
hyjalAI::hyjalAI(Creature* c) : npc_escortAI(c), Summons(me)
hyjalAI::hyjalAI(Creature* creature) : npc_escortAI(creature), Summons(me)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
VeinsSpawned[0] = false;
VeinsSpawned[1] = false;
for (uint8 i=0; i<14; ++i)
@@ -171,7 +171,7 @@ const Yells ThrallQuotes[]=
struct hyjalAI : public npc_escortAI
{
hyjalAI(Creature* c);
hyjalAI(Creature* creature);
void Reset(); // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat
@@ -155,9 +155,9 @@ float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the
{5429.91f, -2718.44f, 1493.42f}//20 end 2
};
hyjal_trashAI::hyjal_trashAI(Creature* c) : npc_escortAI(c)
hyjal_trashAI::hyjal_trashAI(Creature* creature) : npc_escortAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
IsEvent = false;
Delay = 0;
LastOverronPos = 0;
@@ -395,9 +395,9 @@ public:
struct mob_giant_infernalAI : public hyjal_trashAI
{
mob_giant_infernalAI(Creature* c) : hyjal_trashAI(c)
mob_giant_infernalAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
meteor = false;//call once!
CanMove = false;
Delay = rand()%30000;
@@ -539,9 +539,9 @@ public:
struct mob_abominationAI : public hyjal_trashAI
{
mob_abominationAI(Creature* c) : hyjal_trashAI(c)
mob_abominationAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -640,9 +640,9 @@ public:
struct mob_ghoulAI : public hyjal_trashAI
{
mob_ghoulAI(Creature* c) : hyjal_trashAI(c)
mob_ghoulAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -749,9 +749,9 @@ public:
struct mob_necromancerAI : public hyjal_trashAI
{
mob_necromancerAI(Creature* c) : hyjal_trashAI(c), summons(me)
mob_necromancerAI(Creature* creature) : hyjal_trashAI(creature), summons(me)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -870,9 +870,9 @@ public:
struct mob_bansheeAI : public hyjal_trashAI
{
mob_bansheeAI(Creature* c) : hyjal_trashAI(c)
mob_bansheeAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -975,9 +975,9 @@ public:
struct mob_crypt_fiendAI : public hyjal_trashAI
{
mob_crypt_fiendAI(Creature* c) : hyjal_trashAI(c)
mob_crypt_fiendAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -1067,9 +1067,9 @@ public:
struct mob_fel_stalkerAI : public hyjal_trashAI
{
mob_fel_stalkerAI(Creature* c) : hyjal_trashAI(c)
mob_fel_stalkerAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -1159,9 +1159,9 @@ public:
struct mob_frost_wyrmAI : public hyjal_trashAI
{
mob_frost_wyrmAI(Creature* c) : hyjal_trashAI(c)
mob_frost_wyrmAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
Reset();
@@ -1276,9 +1276,9 @@ public:
struct mob_gargoyleAI : public hyjal_trashAI
{
mob_gargoyleAI(Creature* c) : hyjal_trashAI(c)
mob_gargoyleAI(Creature* creature) : hyjal_trashAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
go = false;
pos = 0;
DummyTarget[0] = 0;DummyTarget[1] = 0;DummyTarget[2] = 0;
@@ -1416,7 +1416,7 @@ public:
struct alliance_riflemanAI : public Scripted_NoMovementAI
{
alliance_riflemanAI(Creature* c) : Scripted_NoMovementAI(c)
alliance_riflemanAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
Reset();
}
@@ -25,7 +25,7 @@
struct hyjal_trashAI : public npc_escortAI
{
hyjal_trashAI(Creature* c);
hyjal_trashAI(Creature* creature);
void UpdateAI(const uint32 diff);
@@ -60,9 +60,9 @@ public:
struct boss_epochAI : public ScriptedAI
{
boss_epochAI(Creature* c) : ScriptedAI(c)
boss_epochAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint8 uiStep;
@@ -43,9 +43,9 @@ public:
struct boss_infinite_corruptorAI : public ScriptedAI
{
boss_infinite_corruptorAI(Creature* c) : ScriptedAI(c)
boss_infinite_corruptorAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -77,9 +77,9 @@ public:
struct boss_mal_ganisAI : public ScriptedAI
{
boss_mal_ganisAI(Creature* c) : ScriptedAI(c)
boss_mal_ganisAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
uint32 uiCarrionSwarmTimer;
@@ -57,9 +57,9 @@ public:
struct boss_meathookAI : public ScriptedAI
{
boss_meathookAI(Creature* c) : ScriptedAI(c)
boss_meathookAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
if (instance)
DoScriptText(SAY_SPAWN, me);
}
@@ -66,9 +66,9 @@ public:
struct boss_salrammAI : public ScriptedAI
{
boss_salrammAI(Creature* c) : ScriptedAI(c)
boss_salrammAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
if (instance)
DoScriptText(SAY_SPAWN, me);
}
@@ -55,9 +55,9 @@ public:
struct boss_aeonusAI : public ScriptedAI
{
boss_aeonusAI(Creature* c) : ScriptedAI(c)
boss_aeonusAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -55,9 +55,9 @@ public:
struct boss_chrono_lord_dejaAI : public ScriptedAI
{
boss_chrono_lord_dejaAI(Creature* c) : ScriptedAI(c)
boss_chrono_lord_dejaAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -54,9 +54,9 @@ public:
struct boss_temporusAI : public ScriptedAI
{
boss_temporusAI(Creature* c) : ScriptedAI(c)
boss_temporusAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -68,9 +68,9 @@ public:
struct npc_medivh_bmAI : public ScriptedAI
{
npc_medivh_bmAI(Creature* c) : ScriptedAI(c)
npc_medivh_bmAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -261,9 +261,9 @@ public:
struct npc_time_riftAI : public ScriptedAI
{
npc_time_riftAI(Creature* c) : ScriptedAI(c)
npc_time_riftAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -52,9 +52,9 @@ public:
struct boss_captain_skarlocAI : public ScriptedAI
{
boss_captain_skarlocAI(Creature* c) : ScriptedAI(c)
boss_captain_skarlocAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -54,9 +54,9 @@ public:
struct boss_epoch_hunterAI : public ScriptedAI
{
boss_epoch_hunterAI(Creature* c) : ScriptedAI(c)
boss_epoch_hunterAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -111,7 +111,7 @@ public:
struct boss_lieutenant_drakeAI : public ScriptedAI
{
boss_lieutenant_drakeAI(Creature* c) : ScriptedAI(c) {}
boss_lieutenant_drakeAI(Creature* creature) : ScriptedAI(creature) {}
bool CanPatrol;
uint32 wpId;
@@ -282,9 +282,9 @@ public:
struct npc_thrall_old_hillsbradAI : public npc_escortAI
{
npc_thrall_old_hillsbradAI(Creature* c) : npc_escortAI(c)
npc_thrall_old_hillsbradAI(Creature* creature) : npc_escortAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
HadMount = false;
me->setActive(true);
}
@@ -624,9 +624,9 @@ public:
struct npc_tarethaAI : public npc_escortAI
{
npc_tarethaAI(Creature* c) : npc_escortAI(c)
npc_tarethaAI(Creature* creature) : npc_escortAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -48,7 +48,7 @@ public:
struct boss_amnennar_the_coldbringerAI : public ScriptedAI
{
boss_amnennar_the_coldbringerAI(Creature* c) : ScriptedAI(c) {}
boss_amnennar_the_coldbringerAI(Creature* creature) : ScriptedAI(creature) {}
uint32 AmnenarsWrath_Timer;
uint32 FrostBolt_Timer;
@@ -70,7 +70,7 @@ public:
struct npc_willixAI : public npc_escortAI
{
npc_willixAI(Creature* c) : npc_escortAI(c) {}
npc_willixAI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
@@ -49,9 +49,9 @@ public:
struct boss_kriAI : public ScriptedAI
{
boss_kriAI(Creature* c) : ScriptedAI(c)
boss_kriAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -146,9 +146,9 @@ public:
struct boss_vemAI : public ScriptedAI
{
boss_vemAI(Creature* c) : ScriptedAI(c)
boss_vemAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -239,9 +239,9 @@ public:
struct boss_yaujAI : public ScriptedAI
{
boss_yaujAI(Creature* c) : ScriptedAI(c)
boss_yaujAI(Creature* creature) : ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -176,9 +176,9 @@ public:
struct eye_of_cthunAI : public Scripted_NoMovementAI
{
eye_of_cthunAI(Creature* c) : Scripted_NoMovementAI(c)
eye_of_cthunAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
if (!instance)
sLog->outError("TSCR: No Instance eye_of_cthunAI");
}
@@ -480,11 +480,11 @@ public:
struct cthunAI : public Scripted_NoMovementAI
{
cthunAI(Creature* c) : Scripted_NoMovementAI(c)
cthunAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
SetCombatMovement(false);
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
if (!instance)
sLog->outError("TSCR: No Instance eye_of_cthunAI");
}
@@ -935,7 +935,7 @@ public:
struct eye_tentacleAI : public Scripted_NoMovementAI
{
eye_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
eye_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
{
@@ -1008,7 +1008,7 @@ public:
struct claw_tentacleAI : public Scripted_NoMovementAI
{
claw_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
claw_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
SetCombatMovement(false);
@@ -1118,7 +1118,7 @@ public:
struct giant_claw_tentacleAI : public Scripted_NoMovementAI
{
giant_claw_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
giant_claw_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
SetCombatMovement(false);
@@ -1237,7 +1237,7 @@ public:
struct giant_eye_tentacleAI : public Scripted_NoMovementAI
{
giant_eye_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
giant_eye_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
SetCombatMovement(false);
@@ -1301,7 +1301,7 @@ public:
struct flesh_tentacleAI : public Scripted_NoMovementAI
{
flesh_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
flesh_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
SetCombatMovement(false);
}
@@ -49,7 +49,7 @@ public:
struct boss_fankrissAI : public ScriptedAI
{
boss_fankrissAI(Creature* c) : ScriptedAI(c) {}
boss_fankrissAI(Creature* creature) : ScriptedAI(creature) {}
uint32 MortalWound_Timer;
uint32 SpawnHatchlings_Timer;
@@ -47,7 +47,7 @@ public:
struct boss_huhuranAI : public ScriptedAI
{
boss_huhuranAI(Creature* c) : ScriptedAI(c) {}
boss_huhuranAI(Creature* creature) : ScriptedAI(creature) {}
uint32 Frenzy_Timer;
uint32 Wyvern_Timer;
@@ -45,7 +45,7 @@ public:
struct boss_ouroAI : public ScriptedAI
{
boss_ouroAI(Creature* c) : ScriptedAI(c) {}
boss_ouroAI(Creature* creature) : ScriptedAI(creature) {}
uint32 Sweep_Timer;
uint32 SandBlast_Timer;
@@ -49,7 +49,7 @@ public:
struct boss_sarturaAI : public ScriptedAI
{
boss_sarturaAI(Creature* c) : ScriptedAI(c) {}
boss_sarturaAI(Creature* creature) : ScriptedAI(creature) {}
uint32 WhirlWind_Timer;
uint32 WhirlWindRandom_Timer;
@@ -192,7 +192,7 @@ public:
struct mob_sartura_royal_guardAI : public ScriptedAI
{
mob_sartura_royal_guardAI(Creature* c) : ScriptedAI(c) {}
mob_sartura_royal_guardAI(Creature* creature) : ScriptedAI(creature) {}
uint32 WhirlWind_Timer;
uint32 WhirlWindRandom_Timer;
@@ -63,7 +63,7 @@ public:
struct boss_skeramAI : public ScriptedAI
{
boss_skeramAI(Creature* c) : ScriptedAI(c)
boss_skeramAI(Creature* creature) : ScriptedAI(creature)
{
IsImage = false;
}
@@ -61,9 +61,9 @@ EndScriptData */
struct boss_twinemperorsAI : public ScriptedAI
{
boss_twinemperorsAI(Creature* c): ScriptedAI(c)
boss_twinemperorsAI(Creature* creature): ScriptedAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
}
InstanceScript* instance;
@@ -86,7 +86,7 @@ public:
}
}
aqsentinelAI(Creature* c) : ScriptedAI(c)
aqsentinelAI(Creature* creature) : ScriptedAI(creature)
{
ClearBuddyList();
abselected = 0; // just initialization of variable
@@ -136,9 +136,9 @@ public:
struct npc_disciple_of_naralexAI : public npc_escortAI
{
npc_disciple_of_naralexAI(Creature* c) : npc_escortAI(c)
npc_disciple_of_naralexAI(Creature* creature) : npc_escortAI(creature)
{
instance = c->GetInstanceScript();
instance = creature->GetInstanceScript();
eventTimer = 0;
currentEvent = 0;
eventProgress = 0;
+1 -1
View File
@@ -185,7 +185,7 @@ class npc_ruul_snowhoof : public CreatureScript
struct npc_ruul_snowhoofAI : public npc_escortAI
{
npc_ruul_snowhoofAI(Creature* c) : npc_escortAI(c) {}
npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
+3 -3
View File
@@ -50,7 +50,7 @@ public:
struct mobs_spitelashesAI : public ScriptedAI
{
mobs_spitelashesAI(Creature* c) : ScriptedAI(c) {}
mobs_spitelashesAI(Creature* creature) : ScriptedAI(creature) {}
uint32 morphtimer;
bool spellhit;
@@ -296,7 +296,7 @@ public:
struct mob_rizzle_sprysprocketAI : public ScriptedAI
{
mob_rizzle_sprysprocketAI(Creature* c) : ScriptedAI(c) {}
mob_rizzle_sprysprocketAI(Creature* creature) : ScriptedAI(creature) {}
uint32 spellEscape_Timer;
uint32 Teleport_Timer;
@@ -470,7 +470,7 @@ public:
struct mob_depth_chargeAI : public ScriptedAI
{
mob_depth_chargeAI(Creature* c) : ScriptedAI(c) {}
mob_depth_chargeAI(Creature* creature) : ScriptedAI(creature) {}
bool we_must_die;
uint32 must_die_timer;
@@ -69,7 +69,7 @@ public:
struct npc_draenei_survivorAI : public ScriptedAI
{
npc_draenei_survivorAI(Creature* c) : ScriptedAI(c) {}
npc_draenei_survivorAI(Creature* creature) : ScriptedAI(creature) {}
uint64 pCaster;
@@ -223,12 +223,12 @@ public:
struct npc_engineer_spark_overgrindAI : public ScriptedAI
{
npc_engineer_spark_overgrindAI(Creature* c) : ScriptedAI(c)
npc_engineer_spark_overgrindAI(Creature* creature) : ScriptedAI(creature)
{
NormFaction = c->getFaction();
NpcFlags = c->GetUInt32Value(UNIT_NPC_FLAGS);
NormFaction = creature->getFaction();
NpcFlags = creature->GetUInt32Value(UNIT_NPC_FLAGS);
if (c->GetAreaId() == AREA_COVE || c->GetAreaId() == AREA_ISLE)
if (creature->GetAreaId() == AREA_COVE || creature->GetAreaId() == AREA_ISLE)
IsTreeEvent = true;
}
@@ -301,7 +301,7 @@ public:
struct npc_injured_draeneiAI : public ScriptedAI
{
npc_injured_draeneiAI(Creature* c) : ScriptedAI(c) {}
npc_injured_draeneiAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
{
@@ -367,7 +367,7 @@ public:
struct npc_magwinAI : public npc_escortAI
{
npc_magwinAI(Creature* c) : npc_escortAI(c) {}
npc_magwinAI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
@@ -443,7 +443,7 @@ public:
struct npc_geezleAI : public ScriptedAI
{
npc_geezleAI(Creature* c) : ScriptedAI(c) {}
npc_geezleAI(Creature* creature) : ScriptedAI(creature) {}
uint64 SparkGUID;
@@ -613,7 +613,7 @@ public:
struct npc_death_ravagerAI : public ScriptedAI
{
npc_death_ravagerAI(Creature* c) : ScriptedAI(c){}
npc_death_ravagerAI(Creature* creature) : ScriptedAI(creature){}
uint32 RendTimer;
uint32 EnragingBiteTimer;
@@ -49,7 +49,7 @@ public:
struct mob_webbed_creatureAI : public ScriptedAI
{
mob_webbed_creatureAI(Creature* c) : ScriptedAI(c) {}
mob_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
{
@@ -47,7 +47,7 @@ public:
struct boss_azuregosAI : public ScriptedAI
{
boss_azuregosAI(Creature* c) : ScriptedAI(c) {}
boss_azuregosAI(Creature* creature) : ScriptedAI(creature) {}
uint32 MarkOfFrost_Timer;
uint32 ManaStorm_Timer;
+1 -1
View File
@@ -48,7 +48,7 @@ public:
struct npc_lazy_peonAI : public ScriptedAI
{
npc_lazy_peonAI(Creature* c) : ScriptedAI(c) {}
npc_lazy_peonAI(Creature* creature) : ScriptedAI(creature) {}
uint64 uiPlayerGUID;
+1 -1
View File
@@ -296,7 +296,7 @@ public:
struct npc_clintar_spiritAI : public npc_escortAI
{
public:
npc_clintar_spiritAI(Creature* c) : npc_escortAI(c) {}
npc_clintar_spiritAI(Creature* creature) : npc_escortAI(creature) {}
uint32 Step;
uint32 CurrWP;
+2 -2
View File
@@ -96,7 +96,7 @@ public:
struct npc_kyle_frenziedAI : public ScriptedAI
{
npc_kyle_frenziedAI(Creature* c) : ScriptedAI(c) {}
npc_kyle_frenziedAI(Creature* creature) : ScriptedAI(creature) {}
bool bEvent;
bool m_bIsMovingToLunch;
@@ -269,7 +269,7 @@ public:
struct npc_plains_visionAI : public ScriptedAI
{
npc_plains_visionAI(Creature* c) : ScriptedAI(c) {}
npc_plains_visionAI(Creature* creature) : ScriptedAI(creature) {}
bool newWaypoint;
uint8 WayPointId;
+2 -2
View File
@@ -61,7 +61,7 @@ public:
struct npc_shenthulAI : public ScriptedAI
{
npc_shenthulAI(Creature* c) : ScriptedAI(c) {}
npc_shenthulAI(Creature* creature) : ScriptedAI(creature) {}
bool CanTalk;
bool CanEmote;
@@ -205,7 +205,7 @@ public:
struct npc_thrall_warchiefAI : public ScriptedAI
{
npc_thrall_warchiefAI(Creature* c) : ScriptedAI(c) {}
npc_thrall_warchiefAI(Creature* creature) : ScriptedAI(creature) {}
uint32 ChainLightning_Timer;
uint32 Shock_Timer;
+3 -3
View File
@@ -492,7 +492,7 @@ public:
struct npc_anachronos_the_ancientAI : public ScriptedAI
{
npc_anachronos_the_ancientAI(Creature* c) : ScriptedAI(c) {}
npc_anachronos_the_ancientAI(Creature* creature) : ScriptedAI(creature) {}
uint32 AnimationTimer;
uint8 AnimationCount;
@@ -820,7 +820,7 @@ public:
struct mob_qiraj_war_spawnAI : public ScriptedAI
{
mob_qiraj_war_spawnAI(Creature* c) : ScriptedAI(c) {}
mob_qiraj_war_spawnAI(Creature* creature) : ScriptedAI(creature) {}
uint64 MobGUID;
uint64 PlayerGUID;
@@ -935,7 +935,7 @@ public:
struct npc_anachronos_quest_triggerAI : public ScriptedAI
{
npc_anachronos_quest_triggerAI(Creature* c) : ScriptedAI(c) {}
npc_anachronos_quest_triggerAI(Creature* creature) : ScriptedAI(creature) {}
uint64 PlayerGUID;
@@ -112,7 +112,7 @@ public:
struct npc_kaya_flathoofAI : public npc_escortAI
{
npc_kaya_flathoofAI(Creature* c) : npc_escortAI(c) {}
npc_kaya_flathoofAI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
+3 -3
View File
@@ -58,7 +58,7 @@ public:
struct mob_aquementasAI : public ScriptedAI
{
mob_aquementasAI(Creature* c) : ScriptedAI(c) {}
mob_aquementasAI(Creature* creature) : ScriptedAI(creature) {}
uint32 SendItem_Timer;
uint32 SwitchFaction_Timer;
@@ -170,7 +170,7 @@ public:
struct npc_custodian_of_timeAI : public npc_escortAI
{
npc_custodian_of_timeAI(Creature* c) : npc_escortAI(c) {}
npc_custodian_of_timeAI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
@@ -426,7 +426,7 @@ public:
struct npc_OOX17AI : public npc_escortAI
{
npc_OOX17AI(Creature* c) : npc_escortAI(c) {}
npc_OOX17AI(Creature* creature) : npc_escortAI(creature) {}
void WaypointReached(uint32 i)
{
+3 -3
View File
@@ -234,9 +234,9 @@ public:
struct npc_taskmaster_fizzuleAI : public ScriptedAI
{
npc_taskmaster_fizzuleAI(Creature* c) : ScriptedAI(c)
npc_taskmaster_fizzuleAI(Creature* creature) : ScriptedAI(creature)
{
factionNorm = c->getFaction();
factionNorm = creature->getFaction();
}
uint32 factionNorm;
@@ -350,7 +350,7 @@ public:
struct npc_twiggy_flatheadAI : public ScriptedAI
{
npc_twiggy_flatheadAI(Creature* c) : ScriptedAI(c) {}
npc_twiggy_flatheadAI(Creature* creature) : ScriptedAI(creature) {}
bool EventInProgress;
bool EventGrate;
@@ -328,7 +328,7 @@ public:
struct npc_pluckyAI : public ScriptedAI
{
npc_pluckyAI(Creature* c) : ScriptedAI(c) { m_uiNormFaction = c->getFaction(); }
npc_pluckyAI(Creature* creature) : ScriptedAI(creature) { m_uiNormFaction = creature->getFaction(); }
uint32 m_uiNormFaction;
uint32 m_uiResetTimer;
@@ -437,7 +437,7 @@ public:
struct npc_enraged_pantherAI : public ScriptedAI
{
npc_enraged_pantherAI(Creature* c) : ScriptedAI(c) {}
npc_enraged_pantherAI(Creature* creature) : ScriptedAI(creature) {}
void Reset()
{
@@ -73,7 +73,7 @@ public:
struct npc_cairne_bloodhoofAI : public ScriptedAI
{
npc_cairne_bloodhoofAI(Creature* c) : ScriptedAI(c) {}
npc_cairne_bloodhoofAI(Creature* creature) : ScriptedAI(creature) {}
uint32 BerserkerCharge_Timer;
uint32 Cleave_Timer;
@@ -74,7 +74,7 @@ public:
struct npc_ameAI : public npc_escortAI
{
npc_ameAI(Creature* c) : npc_escortAI(c) {}
npc_ameAI(Creature* creature) : npc_escortAI(creature) {}
uint32 DEMORALIZINGSHOUT_Timer;