yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eluna edit override back to OVERRIDE

Browse Source
This commit is contained in:
Rochet2
2014-03-28 15:12:52 +02:00
committed by Foereaper
parent 191f9ab768
commit d495d295d8
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
HookMgr.cpp
View File

@@ -222,7 +222,7 @@ public:
ElunaWorldAI() : WorldScript("ElunaWorldAI") {} ElunaWorldAI() : WorldScript("ElunaWorldAI") {}
~ElunaWorldAI() {} ~ElunaWorldAI() {}
void OnOpenStateChange(bool open) override void OnOpenStateChange(bool open) OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_OPEN_STATE_CHANGE)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_OPEN_STATE_CHANGE))
return; return;
@@ -233,7 +233,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnConfigLoad(bool reload) override void OnConfigLoad(bool reload) OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_CONFIG_LOAD)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_CONFIG_LOAD))
return; return;
@@ -244,7 +244,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnMotdChange(std::string& newMotd) override void OnMotdChange(std::string& newMotd) OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_MOTD_CHANGE)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_MOTD_CHANGE))
return; return;
@@ -255,7 +255,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnShutdownInitiate(ShutdownExitCode code, ShutdownMask mask) override void OnShutdownInitiate(ShutdownExitCode code, ShutdownMask mask) OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN_INIT)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN_INIT))
return; return;
@@ -267,7 +267,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnShutdownCancel() override void OnShutdownCancel() OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN_CANCEL)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN_CANCEL))
return; return;
@@ -277,7 +277,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnUpdate(uint32 diff) override void OnUpdate(uint32 diff) OVERRIDE
{ {
sEluna->m_EventMgr.Update(diff); sEluna->m_EventMgr.Update(diff);
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_UPDATE)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_UPDATE))
@@ -289,7 +289,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnStartup() override void OnStartup() OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_STARTUP)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_STARTUP))
return; return;
@@ -299,7 +299,7 @@ public:
sEluna->ServerEventBindings.EndCall(); sEluna->ServerEventBindings.EndCall();
} }
void OnShutdown() override void OnShutdown() OVERRIDE
{ {
if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN)) if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN))
return; return;
@@ -1565,9 +1565,9 @@ struct ElunaCreatureAI : ScriptedAI
//Called at World update tick //Called at World update tick
#ifdef MANGOS #ifdef MANGOS
void UpdateAI(const uint32 diff) override void UpdateAI(const uint32 diff) OVERRIDE
#else #else
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) OVERRIDE
#endif #endif
{ {
ScriptedAI::UpdateAI(diff); ScriptedAI::UpdateAI(diff);
@@ -1584,7 +1584,7 @@ struct ElunaCreatureAI : ScriptedAI
//Called for reaction at enter to combat if not in combat yet (enemy can be NULL) //Called for reaction at enter to combat if not in combat yet (enemy can be NULL)
//Called at creature aggro either by MoveInLOS or Attack Start //Called at creature aggro either by MoveInLOS or Attack Start
void EnterCombat(Unit* target) override void EnterCombat(Unit* target) OVERRIDE
{ {
ScriptedAI::EnterCombat(target); ScriptedAI::EnterCombat(target);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_ENTER_COMBAT); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_ENTER_COMBAT);
@@ -1599,7 +1599,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called at any Damage from any attacker (before damage apply) // Called at any Damage from any attacker (before damage apply)
void DamageTaken(Unit* attacker, uint32& damage) override void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE
{ {
ScriptedAI::DamageTaken(attacker, damage); ScriptedAI::DamageTaken(attacker, damage);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_DAMAGE_TAKEN); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_DAMAGE_TAKEN);
@@ -1615,7 +1615,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
//Called at creature death //Called at creature death
void JustDied(Unit* killer) override void JustDied(Unit* killer) OVERRIDE
{ {
ScriptedAI::JustDied(killer); ScriptedAI::JustDied(killer);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_DIED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_DIED);
@@ -1630,7 +1630,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
//Called at creature killing another unit //Called at creature killing another unit
void KilledUnit(Unit* victim) override void KilledUnit(Unit* victim) OVERRIDE
{ {
ScriptedAI::KilledUnit(victim); ScriptedAI::KilledUnit(victim);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_TARGET_DIED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_TARGET_DIED);
@@ -1645,7 +1645,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when the creature summon successfully other creature // Called when the creature summon successfully other creature
void JustSummoned(Creature* summon) override void JustSummoned(Creature* summon) OVERRIDE
{ {
ScriptedAI::JustSummoned(summon); ScriptedAI::JustSummoned(summon);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_JUST_SUMMONED_CREATURE); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_JUST_SUMMONED_CREATURE);
@@ -1660,7 +1660,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when a summoned creature is despawned // Called when a summoned creature is despawned
void SummonedCreatureDespawn(Creature* summon) override void SummonedCreatureDespawn(Creature* summon) OVERRIDE
{ {
ScriptedAI::SummonedCreatureDespawn(summon); ScriptedAI::SummonedCreatureDespawn(summon);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SUMMONED_CREATURE_DESPAWN); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SUMMONED_CREATURE_DESPAWN);
@@ -1675,7 +1675,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
//Called at waypoint reached or PointMovement end //Called at waypoint reached or PointMovement end
void MovementInform(uint32 type, uint32 id) override void MovementInform(uint32 type, uint32 id) OVERRIDE
{ {
ScriptedAI::MovementInform(type, id); ScriptedAI::MovementInform(type, id);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_REACH_WP); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_REACH_WP);
@@ -1691,7 +1691,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called before EnterCombat even before the creature is in combat. // Called before EnterCombat even before the creature is in combat.
void AttackStart(Unit* target) override void AttackStart(Unit* target) OVERRIDE
{ {
ScriptedAI::AttackStart(target); ScriptedAI::AttackStart(target);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_PRE_COMBAT); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_PRE_COMBAT);
@@ -1706,7 +1706,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called for reaction at stopping attack at no attackers or targets // Called for reaction at stopping attack at no attackers or targets
void EnterEvadeMode() override void EnterEvadeMode() OVERRIDE
{ {
ScriptedAI::EnterEvadeMode(); ScriptedAI::EnterEvadeMode();
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_LEAVE_COMBAT); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_LEAVE_COMBAT);
@@ -1720,7 +1720,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc) // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
void AttackedBy(Unit* attacker) override void AttackedBy(Unit* attacker) OVERRIDE
{ {
ScriptedAI::AttackedBy(attacker); ScriptedAI::AttackedBy(attacker);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_ATTACKED_AT); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_ATTACKED_AT);
@@ -1735,7 +1735,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when creature is spawned or respawned (for reseting variables) // Called when creature is spawned or respawned (for reseting variables)
void JustRespawned() override void JustRespawned() OVERRIDE
{ {
ScriptedAI::JustRespawned(); ScriptedAI::JustRespawned();
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPAWN); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPAWN);
@@ -1749,7 +1749,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called at reaching home after evade // Called at reaching home after evade
void JustReachedHome() override void JustReachedHome() OVERRIDE
{ {
ScriptedAI::JustReachedHome(); ScriptedAI::JustReachedHome();
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_REACH_HOME); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_REACH_HOME);
@@ -1763,7 +1763,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called at text emote receive from player // Called at text emote receive from player
void ReceiveEmote(Player* player, uint32 emoteId) override void ReceiveEmote(Player* player, uint32 emoteId) OVERRIDE
{ {
ScriptedAI::ReceiveEmote(player, emoteId); ScriptedAI::ReceiveEmote(player, emoteId);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_RECEIVE_EMOTE); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_RECEIVE_EMOTE);
@@ -1779,7 +1779,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// called when the corpse of this creature gets removed // called when the corpse of this creature gets removed
void CorpseRemoved(uint32& respawnDelay) override void CorpseRemoved(uint32& respawnDelay) OVERRIDE
{ {
ScriptedAI::CorpseRemoved(respawnDelay); ScriptedAI::CorpseRemoved(respawnDelay);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CORPSE_REMOVED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CORPSE_REMOVED);
@@ -1793,7 +1793,7 @@ struct ElunaCreatureAI : ScriptedAI
sEluna->ExecuteCall(3, 0); sEluna->ExecuteCall(3, 0);
} }
void MoveInLineOfSight(Unit* who) override void MoveInLineOfSight(Unit* who) OVERRIDE
{ {
ScriptedAI::MoveInLineOfSight(who); ScriptedAI::MoveInLineOfSight(who);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_MOVE_IN_LOS); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_MOVE_IN_LOS);
@@ -1809,7 +1809,7 @@ struct ElunaCreatureAI : ScriptedAI
#ifndef MANGOS #ifndef MANGOS
// Called when hit by a spell // Called when hit by a spell
void SpellHit(Unit* caster, SpellInfo const* spell) override void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE
{ {
ScriptedAI::SpellHit(caster, spell); ScriptedAI::SpellHit(caster, spell);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_HIT_BY_SPELL); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_HIT_BY_SPELL);
@@ -1825,7 +1825,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when spell hits a target // Called when spell hits a target
void SpellHitTarget(Unit* target, SpellInfo const* spell) override void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE
{ {
ScriptedAI::SpellHitTarget(target, spell); ScriptedAI::SpellHitTarget(target, spell);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPELL_HIT_TARGET); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPELL_HIT_TARGET);
@@ -1856,7 +1856,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
//Called at creature reset either by death or evade //Called at creature reset either by death or evade
void Reset() override void Reset() OVERRIDE
{ {
ELUNA_GUARD(); ELUNA_GUARD();
ScriptedAI::Reset(); ScriptedAI::Reset();
@@ -1870,7 +1870,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called in Creature::Update when deathstate = DEAD. Inherited classes may maniuplate the ability to respawn based on scripted events. // Called in Creature::Update when deathstate = DEAD. Inherited classes may maniuplate the ability to respawn based on scripted events.
bool CanRespawn() override bool CanRespawn() OVERRIDE
{ {
ScriptedAI::CanRespawn(); ScriptedAI::CanRespawn();
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CAN_RESPAWN); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CAN_RESPAWN);
@@ -1885,13 +1885,13 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when the creature is summoned successfully by other creature // Called when the creature is summoned successfully by other creature
void IsSummonedBy(Unit* summoner) override void IsSummonedBy(Unit* summoner) OVERRIDE
{ {
ScriptedAI::IsSummonedBy(summoner); ScriptedAI::IsSummonedBy(summoner);
sHookMgr->OnSummoned(me, summoner); sHookMgr->OnSummoned(me, summoner);
} }
void SummonedCreatureDies(Creature* summon, Unit* killer) override void SummonedCreatureDies(Creature* summon, Unit* killer) OVERRIDE
{ {
ScriptedAI::SummonedCreatureDies(summon, killer); ScriptedAI::SummonedCreatureDies(summon, killer);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SUMMONED_CREATURE_DIED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SUMMONED_CREATURE_DIED);
@@ -1906,7 +1906,7 @@ struct ElunaCreatureAI : ScriptedAI
sEluna->ExecuteCall(4, 0); sEluna->ExecuteCall(4, 0);
} }
void OnCharmed(bool apply) override void OnCharmed(bool apply) OVERRIDE
{ {
ScriptedAI::OnCharmed(apply); ScriptedAI::OnCharmed(apply);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CHARMED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CHARMED);
@@ -1921,7 +1921,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when owner takes damage // Called when owner takes damage
void OwnerAttackedBy(Unit* attacker) override void OwnerAttackedBy(Unit* attacker) OVERRIDE
{ {
ScriptedAI::OwnerAttackedBy(attacker); ScriptedAI::OwnerAttackedBy(attacker);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_OWNER_ATTACKED_AT); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_OWNER_ATTACKED_AT);
@@ -1936,7 +1936,7 @@ struct ElunaCreatureAI : ScriptedAI
} }
// Called when owner attacks something // Called when owner attacks something
void OwnerAttacked(Unit* target) override void OwnerAttacked(Unit* target) OVERRIDE
{ {
ScriptedAI::OwnerAttacked(target); ScriptedAI::OwnerAttacked(target);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_OWNER_ATTACKED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_OWNER_ATTACKED);
@@ -1950,7 +1950,7 @@ struct ElunaCreatureAI : ScriptedAI
sEluna->ExecuteCall(3, 0); sEluna->ExecuteCall(3, 0);
} }
void PassengerBoarded(Unit* passenger, int8 seatId, bool apply) override void PassengerBoarded(Unit* passenger, int8 seatId, bool apply) OVERRIDE
{ {
ScriptedAI::PassengerBoarded(passenger, seatId, apply); ScriptedAI::PassengerBoarded(passenger, seatId, apply);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_PASSANGER_BOARDED); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_PASSANGER_BOARDED);
@@ -1966,7 +1966,7 @@ struct ElunaCreatureAI : ScriptedAI
sEluna->ExecuteCall(5, 0); sEluna->ExecuteCall(5, 0);
} }
void OnSpellClick(Unit* clicker, bool& result) override void OnSpellClick(Unit* clicker, bool& result) OVERRIDE
{ {
ScriptedAI::OnSpellClick(clicker, result); ScriptedAI::OnSpellClick(clicker, result);
int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPELL_CLICK); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPELL_CLICK);
@@ -2120,7 +2120,7 @@ struct ElunaGameObjectAI : public GameObjectAI
{ {
} }
void Reset() override void Reset() OVERRIDE
{ {
int bind = sEluna->GameObjectEventBindings.GetBind(go->GetEntry(), GAMEOBJECT_EVENT_ON_RESET); int bind = sEluna->GameObjectEventBindings.GetBind(go->GetEntry(), GAMEOBJECT_EVENT_ON_RESET);
if (!bind) if (!bind)