From d495d295d889d3051f353f120f9e539b0294887f Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Fri, 28 Mar 2014 15:12:52 +0200 Subject: [PATCH] Eluna edit override back to OVERRIDE --- HookMgr.cpp | 74 ++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/HookMgr.cpp b/HookMgr.cpp index 5fe018b..9ffe056 100644 --- a/HookMgr.cpp +++ b/HookMgr.cpp @@ -222,7 +222,7 @@ public: ElunaWorldAI() : WorldScript("ElunaWorldAI") {} ~ElunaWorldAI() {} - void OnOpenStateChange(bool open) override + void OnOpenStateChange(bool open) OVERRIDE { if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_OPEN_STATE_CHANGE)) return; @@ -233,7 +233,7 @@ public: sEluna->ServerEventBindings.EndCall(); } - void OnConfigLoad(bool reload) override + void OnConfigLoad(bool reload) OVERRIDE { if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_CONFIG_LOAD)) return; @@ -244,7 +244,7 @@ public: sEluna->ServerEventBindings.EndCall(); } - void OnMotdChange(std::string& newMotd) override + void OnMotdChange(std::string& newMotd) OVERRIDE { if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_MOTD_CHANGE)) return; @@ -255,7 +255,7 @@ public: 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)) return; @@ -267,7 +267,7 @@ public: sEluna->ServerEventBindings.EndCall(); } - void OnShutdownCancel() override + void OnShutdownCancel() OVERRIDE { if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN_CANCEL)) return; @@ -277,7 +277,7 @@ public: sEluna->ServerEventBindings.EndCall(); } - void OnUpdate(uint32 diff) override + void OnUpdate(uint32 diff) OVERRIDE { sEluna->m_EventMgr.Update(diff); if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_UPDATE)) @@ -289,7 +289,7 @@ public: sEluna->ServerEventBindings.EndCall(); } - void OnStartup() override + void OnStartup() OVERRIDE { if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_STARTUP)) return; @@ -299,7 +299,7 @@ public: sEluna->ServerEventBindings.EndCall(); } - void OnShutdown() override + void OnShutdown() OVERRIDE { if (!sEluna->ServerEventBindings.HasEvents(WORLD_EVENT_ON_SHUTDOWN)) return; @@ -1565,9 +1565,9 @@ struct ElunaCreatureAI : ScriptedAI //Called at World update tick #ifdef MANGOS - void UpdateAI(const uint32 diff) override + void UpdateAI(const uint32 diff) OVERRIDE #else - void UpdateAI(uint32 diff) override + void UpdateAI(uint32 diff) OVERRIDE #endif { 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 at creature aggro either by MoveInLOS or Attack Start - void EnterCombat(Unit* target) override + void EnterCombat(Unit* target) OVERRIDE { ScriptedAI::EnterCombat(target); 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) - void DamageTaken(Unit* attacker, uint32& damage) override + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { ScriptedAI::DamageTaken(attacker, damage); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_DAMAGE_TAKEN); @@ -1615,7 +1615,7 @@ struct ElunaCreatureAI : ScriptedAI } //Called at creature death - void JustDied(Unit* killer) override + void JustDied(Unit* killer) OVERRIDE { ScriptedAI::JustDied(killer); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_DIED); @@ -1630,7 +1630,7 @@ struct ElunaCreatureAI : ScriptedAI } //Called at creature killing another unit - void KilledUnit(Unit* victim) override + void KilledUnit(Unit* victim) OVERRIDE { ScriptedAI::KilledUnit(victim); 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 - void JustSummoned(Creature* summon) override + void JustSummoned(Creature* summon) OVERRIDE { ScriptedAI::JustSummoned(summon); 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 - void SummonedCreatureDespawn(Creature* summon) override + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { ScriptedAI::SummonedCreatureDespawn(summon); 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 - void MovementInform(uint32 type, uint32 id) override + void MovementInform(uint32 type, uint32 id) OVERRIDE { ScriptedAI::MovementInform(type, id); 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. - void AttackStart(Unit* target) override + void AttackStart(Unit* target) OVERRIDE { ScriptedAI::AttackStart(target); 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 - void EnterEvadeMode() override + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); 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) - void AttackedBy(Unit* attacker) override + void AttackedBy(Unit* attacker) OVERRIDE { ScriptedAI::AttackedBy(attacker); 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) - void JustRespawned() override + void JustRespawned() OVERRIDE { ScriptedAI::JustRespawned(); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SPAWN); @@ -1749,7 +1749,7 @@ struct ElunaCreatureAI : ScriptedAI } // Called at reaching home after evade - void JustReachedHome() override + void JustReachedHome() OVERRIDE { ScriptedAI::JustReachedHome(); 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 - void ReceiveEmote(Player* player, uint32 emoteId) override + void ReceiveEmote(Player* player, uint32 emoteId) OVERRIDE { ScriptedAI::ReceiveEmote(player, emoteId); 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 - void CorpseRemoved(uint32& respawnDelay) override + void CorpseRemoved(uint32& respawnDelay) OVERRIDE { ScriptedAI::CorpseRemoved(respawnDelay); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CORPSE_REMOVED); @@ -1793,7 +1793,7 @@ struct ElunaCreatureAI : ScriptedAI sEluna->ExecuteCall(3, 0); } - void MoveInLineOfSight(Unit* who) override + void MoveInLineOfSight(Unit* who) OVERRIDE { ScriptedAI::MoveInLineOfSight(who); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_MOVE_IN_LOS); @@ -1809,7 +1809,7 @@ struct ElunaCreatureAI : ScriptedAI #ifndef MANGOS // 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); 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 - void SpellHitTarget(Unit* target, SpellInfo const* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { ScriptedAI::SpellHitTarget(target, spell); 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 - void Reset() override + void Reset() OVERRIDE { ELUNA_GUARD(); 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. - bool CanRespawn() override + bool CanRespawn() OVERRIDE { ScriptedAI::CanRespawn(); 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 - void IsSummonedBy(Unit* summoner) override + void IsSummonedBy(Unit* summoner) OVERRIDE { ScriptedAI::IsSummonedBy(summoner); sHookMgr->OnSummoned(me, summoner); } - void SummonedCreatureDies(Creature* summon, Unit* killer) override + void SummonedCreatureDies(Creature* summon, Unit* killer) OVERRIDE { ScriptedAI::SummonedCreatureDies(summon, killer); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_SUMMONED_CREATURE_DIED); @@ -1906,7 +1906,7 @@ struct ElunaCreatureAI : ScriptedAI sEluna->ExecuteCall(4, 0); } - void OnCharmed(bool apply) override + void OnCharmed(bool apply) OVERRIDE { ScriptedAI::OnCharmed(apply); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_CHARMED); @@ -1921,7 +1921,7 @@ struct ElunaCreatureAI : ScriptedAI } // Called when owner takes damage - void OwnerAttackedBy(Unit* attacker) override + void OwnerAttackedBy(Unit* attacker) OVERRIDE { ScriptedAI::OwnerAttackedBy(attacker); 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 - void OwnerAttacked(Unit* target) override + void OwnerAttacked(Unit* target) OVERRIDE { ScriptedAI::OwnerAttacked(target); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_OWNER_ATTACKED); @@ -1950,7 +1950,7 @@ struct ElunaCreatureAI : ScriptedAI 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); int bind = sEluna->CreatureEventBindings.GetBind(me->GetEntry(), CREATURE_EVENT_ON_PASSANGER_BOARDED); @@ -1966,7 +1966,7 @@ struct ElunaCreatureAI : ScriptedAI sEluna->ExecuteCall(5, 0); } - void OnSpellClick(Unit* clicker, bool& result) override + void OnSpellClick(Unit* clicker, bool& result) OVERRIDE { ScriptedAI::OnSpellClick(clicker, result); 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); if (!bind)