diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h index 3c333044598..ac712a06982 100644 --- a/src/server/game/AI/CoreAI/GuardAI.h +++ b/src/server/game/AI/CoreAI/GuardAI.h @@ -30,9 +30,9 @@ class GuardAI : public ScriptedAI explicit GuardAI(Creature* creature); static int Permissible(Creature const* creature); - bool CanSeeAlways(WorldObject const* obj) OVERRIDE; + bool CanSeeAlways(WorldObject const* obj) override; - void EnterEvadeMode() OVERRIDE; - void JustDied(Unit* killer) OVERRIDE; + void EnterEvadeMode() override; + void JustDied(Unit* killer) override; }; #endif diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index 8f718963f3d..46c82d26165 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -27,9 +27,9 @@ class PassiveAI : public CreatureAI public: explicit PassiveAI(Creature* c); - void MoveInLineOfSight(Unit*) OVERRIDE { } - void AttackStart(Unit*) OVERRIDE { } - void UpdateAI(uint32) OVERRIDE; + void MoveInLineOfSight(Unit*) override { } + void AttackStart(Unit*) override { } + void UpdateAI(uint32) override; static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } }; @@ -39,13 +39,13 @@ class PossessedAI : public CreatureAI public: explicit PossessedAI(Creature* c); - void MoveInLineOfSight(Unit*) OVERRIDE { } - void AttackStart(Unit* target) OVERRIDE; - void UpdateAI(uint32) OVERRIDE; - void EnterEvadeMode() OVERRIDE { } + void MoveInLineOfSight(Unit*) override { } + void AttackStart(Unit* target) override; + void UpdateAI(uint32) override; + void EnterEvadeMode() override { } - void JustDied(Unit*) OVERRIDE; - void KilledUnit(Unit* victim) OVERRIDE; + void JustDied(Unit*) override; + void KilledUnit(Unit* victim) override; static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } }; @@ -55,11 +55,11 @@ class NullCreatureAI : public CreatureAI public: explicit NullCreatureAI(Creature* c); - void MoveInLineOfSight(Unit*) OVERRIDE { } - void AttackStart(Unit*) OVERRIDE { } - void UpdateAI(uint32) OVERRIDE { } - void EnterEvadeMode() OVERRIDE { } - void OnCharmed(bool /*apply*/) OVERRIDE { } + void MoveInLineOfSight(Unit*) override { } + void AttackStart(Unit*) override { } + void UpdateAI(uint32) override { } + void EnterEvadeMode() override { } + void OnCharmed(bool /*apply*/) override { } static int Permissible(const Creature*) { return PERMIT_BASE_IDLE; } }; @@ -69,15 +69,15 @@ class CritterAI : public PassiveAI public: explicit CritterAI(Creature* c) : PassiveAI(c) { } - void DamageTaken(Unit* done_by, uint32& /*damage*/) OVERRIDE; - void EnterEvadeMode() OVERRIDE; + void DamageTaken(Unit* done_by, uint32& /*damage*/) override; + void EnterEvadeMode() override; }; class TriggerAI : public NullCreatureAI { public: explicit TriggerAI(Creature* c) : NullCreatureAI(c) { } - void IsSummonedBy(Unit* summoner) OVERRIDE; + void IsSummonedBy(Unit* summoner) override; }; #endif diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index 6c89cb84d11..f7c2ca5660a 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -31,23 +31,23 @@ class PetAI : public CreatureAI public: explicit PetAI(Creature* c); - void UpdateAI(uint32) OVERRIDE; + void UpdateAI(uint32) override; static int Permissible(const Creature*); - void KilledUnit(Unit* /*victim*/) OVERRIDE; - void AttackStart(Unit* target) OVERRIDE; - void MovementInform(uint32 moveType, uint32 data) OVERRIDE; - void OwnerAttackedBy(Unit* attacker) OVERRIDE; - void OwnerAttacked(Unit* target) OVERRIDE; - void AttackedBy(Unit* attacker) OVERRIDE; - void ReceiveEmote(Player* player, uint32 textEmote) OVERRIDE; + void KilledUnit(Unit* /*victim*/) override; + void AttackStart(Unit* target) override; + void MovementInform(uint32 moveType, uint32 data) override; + void OwnerAttackedBy(Unit* attacker) override; + void OwnerAttacked(Unit* target) override; + void AttackedBy(Unit* attacker) override; + void ReceiveEmote(Player* player, uint32 textEmote) override; // The following aren't used by the PetAI but need to be defined to override // default CreatureAI functions which interfere with the PetAI // - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } // CreatureAI interferes with returning pets + void MoveInLineOfSight(Unit* /*who*/) override { } // CreatureAI interferes with returning pets void MoveInLineOfSight_Safe(Unit* /*who*/) { } // CreatureAI interferes with returning pets - void EnterEvadeMode() OVERRIDE { } // For fleeing, pets don't use this type of Evade mechanic + void EnterEvadeMode() override { } // For fleeing, pets don't use this type of Evade mechanic private: bool _isVisible(Unit*) const; diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h index 2f19b10cbc0..7ee769ad7de 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.h +++ b/src/server/game/AI/CoreAI/ReactorAI.h @@ -29,8 +29,8 @@ class ReactorAI : public CreatureAI public: explicit ReactorAI(Creature* c) : CreatureAI(c) { } - void MoveInLineOfSight(Unit*) OVERRIDE { } - void UpdateAI(uint32 diff) OVERRIDE; + void MoveInLineOfSight(Unit*) override { } + void UpdateAI(uint32 diff) override; static int Permissible(const Creature*); }; diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index 0a20fa901de..95eaf656261 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -31,11 +31,11 @@ class TotemAI : public CreatureAI public: explicit TotemAI(Creature* c); - void MoveInLineOfSight(Unit* who) OVERRIDE; - void AttackStart(Unit* victim) OVERRIDE; - void EnterEvadeMode() OVERRIDE; + void MoveInLineOfSight(Unit* who) override; + void AttackStart(Unit* victim) override; + void EnterEvadeMode() override; - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; static int Permissible(Creature const* creature); private: diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 166081d8297..6be53875b97 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -277,13 +277,13 @@ class PlayerAI : public UnitAI public: explicit PlayerAI(Player* player) : UnitAI((Unit*)player), me(player) { } - void OnCharmed(bool apply) OVERRIDE; + void OnCharmed(bool apply) override; }; class SimpleCharmedAI : public PlayerAI { public: - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; SimpleCharmedAI(Player* player): PlayerAI(player) { } }; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index d6d16c0372e..4e0eee9de56 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -156,31 +156,31 @@ struct ScriptedAI : public CreatureAI void AttackStartNoMove(Unit* target); // Called at any Damage from any attacker (before damage apply) - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { } + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { } //Called at World update tick - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; //Called at creature death - void JustDied(Unit* /*killer*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) override { } //Called at creature killing another unit - void KilledUnit(Unit* /*victim*/) OVERRIDE { } + void KilledUnit(Unit* /*victim*/) override { } // Called when the creature summon successfully other creature - void JustSummoned(Creature* /*summon*/) OVERRIDE { } + void JustSummoned(Creature* /*summon*/) override { } // Called when a summoned creature is despawned - void SummonedCreatureDespawn(Creature* /*summon*/) OVERRIDE { } + void SummonedCreatureDespawn(Creature* /*summon*/) override { } // Called when hit by a spell - void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) OVERRIDE { } + void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) override { } // Called when spell hits a target - void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spell*/) OVERRIDE { } + void SpellHitTarget(Unit* /*target*/, SpellInfo const* /*spell*/) override { } //Called at waypoint reached or PointMovement end - void MovementInform(uint32 /*type*/, uint32 /*id*/) OVERRIDE { } + void MovementInform(uint32 /*type*/, uint32 /*id*/) override { } // Called when AI is temporarily replaced or put back when possess is applied or removed void OnPossess(bool /*apply*/) @@ -201,13 +201,13 @@ struct ScriptedAI : public CreatureAI // ************* //Called at creature reset either by death or evade - void Reset() OVERRIDE { } + void Reset() override { } //Called at creature aggro either by MoveInLOS or Attack Start - void EnterCombat(Unit* /*victim*/) OVERRIDE { } + void EnterCombat(Unit* /*victim*/) override { } // Called before EnterCombat even before the creature is in combat. - void AttackStart(Unit* /*target*/) OVERRIDE; + void AttackStart(Unit* /*target*/) override; // ************* //AI Helper Functions diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index 610398d7ec3..ff0f1052bdd 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -57,22 +57,22 @@ struct npc_escortAI : public ScriptedAI ~npc_escortAI() { } // CreatureAI functions - void AttackStart(Unit* who) OVERRIDE; + void AttackStart(Unit* who) override; - void MoveInLineOfSight(Unit* who) OVERRIDE; + void MoveInLineOfSight(Unit* who) override; - void JustDied(Unit*) OVERRIDE; + void JustDied(Unit*) override; - void JustRespawned() OVERRIDE; + void JustRespawned() override; void ReturnToLastPoint(); - void EnterEvadeMode() OVERRIDE; + void EnterEvadeMode() override; - void UpdateAI(uint32 diff) OVERRIDE; //the "internal" update, calls UpdateEscortAI() + void UpdateAI(uint32 diff) override; //the "internal" update, calls UpdateEscortAI() virtual void UpdateEscortAI(uint32 const diff); //used when it's needed to add code in update (abilities, scripted events, etc) - void MovementInform(uint32, uint32) OVERRIDE; + void MovementInform(uint32, uint32) override; // EscortAI functions void AddWaypoint(uint32 id, float x, float y, float z, uint32 waitTime = 0); // waitTime is in ms @@ -95,7 +95,7 @@ struct npc_escortAI : public ScriptedAI void SetEscortPaused(bool on); bool HasEscortState(uint32 escortState) { return (m_uiEscortState & escortState); } - virtual bool IsEscorted() OVERRIDE { return (m_uiEscortState & STATE_ESCORT_ESCORTING); } + virtual bool IsEscorted() override { return (m_uiEscortState & STATE_ESCORT_ESCORTING); } void SetMaxPlayerDistance(float newMax) { MaxPlayerDistance = newMax; } float GetMaxPlayerDistance() { return MaxPlayerDistance; } diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h index b26b0c23ff6..89b13983471 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h @@ -41,19 +41,19 @@ class FollowerAI : public ScriptedAI //virtual void WaypointReached(uint32 uiPointId) = 0; - void MovementInform(uint32 motionType, uint32 pointId) OVERRIDE; + void MovementInform(uint32 motionType, uint32 pointId) override; - void AttackStart(Unit*) OVERRIDE; + void AttackStart(Unit*) override; - void MoveInLineOfSight(Unit*) OVERRIDE; + void MoveInLineOfSight(Unit*) override; - void EnterEvadeMode() OVERRIDE; + void EnterEvadeMode() override; - void JustDied(Unit*) OVERRIDE; + void JustDied(Unit*) override; - void JustRespawned() OVERRIDE; + void JustRespawned() override; - void UpdateAI(uint32) OVERRIDE; //the "internal" update, calls UpdateFollowerAI() + void UpdateAI(uint32) override; //the "internal" update, calls UpdateFollowerAI() virtual void UpdateFollowerAI(uint32); //used when it's needed to add code in update (abilities, scripted events, etc) void StartFollow(Player* player, uint32 factionForFollower = 0, const Quest* quest = NULL); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 2fdd3e35064..94725e42125 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -70,97 +70,97 @@ class SmartAI : public CreatureAI bool IsEscortInvokerInRange(); // Called when creature is spawned or respawned - void JustRespawned() OVERRIDE; + void JustRespawned() override; // Called after InitializeAI(), EnterEvadeMode() for resetting variables - void Reset() OVERRIDE; + void Reset() override; // Called at reaching home after evade - void JustReachedHome() OVERRIDE; + void JustReachedHome() override; // Called for reaction at enter to combat if not in combat yet (enemy can be NULL) - void EnterCombat(Unit* enemy) OVERRIDE; + void EnterCombat(Unit* enemy) override; // Called for reaction at stopping attack at no attackers or targets - void EnterEvadeMode() OVERRIDE; + void EnterEvadeMode() override; // Called when the creature is killed - void JustDied(Unit* killer) OVERRIDE; + void JustDied(Unit* killer) override; // Called when the creature kills a unit - void KilledUnit(Unit* victim) OVERRIDE; + void KilledUnit(Unit* victim) override; // Called when the creature summon successfully other creature - void JustSummoned(Creature* creature) OVERRIDE; + void JustSummoned(Creature* creature) override; // Tell creature to attack and follow the victim - void AttackStart(Unit* who) OVERRIDE; + void AttackStart(Unit* who) override; // Called if IsVisible(Unit* who) is true at each *who move, reaction at visibility zone enter - void MoveInLineOfSight(Unit* who) OVERRIDE; + void MoveInLineOfSight(Unit* who) override; // Called when hit by a spell - void SpellHit(Unit* unit, const SpellInfo* spellInfo) OVERRIDE; + void SpellHit(Unit* unit, const SpellInfo* spellInfo) override; // Called when spell hits a target - void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) OVERRIDE; + void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override; // Called at any Damage from any attacker (before damage apply) - void DamageTaken(Unit* doneBy, uint32& damage) OVERRIDE; + void DamageTaken(Unit* doneBy, uint32& damage) override; // Called when the creature receives heal - void HealReceived(Unit* doneBy, uint32& addhealth) OVERRIDE; + void HealReceived(Unit* doneBy, uint32& addhealth) override; // Called at World update tick - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; // Called at text emote receive from player - void ReceiveEmote(Player* player, uint32 textEmote) OVERRIDE; + void ReceiveEmote(Player* player, uint32 textEmote) override; // Called at waypoint reached or point movement finished - void MovementInform(uint32 MovementType, uint32 Data) OVERRIDE; + void MovementInform(uint32 MovementType, uint32 Data) override; // Called when creature is summoned by another unit - void IsSummonedBy(Unit* summoner) OVERRIDE; + void IsSummonedBy(Unit* summoner) override; // Called at any Damage to any victim (before damage apply) - void DamageDealt(Unit* doneTo, uint32& damage, DamageEffectType /*damagetype*/) OVERRIDE; + void DamageDealt(Unit* doneTo, uint32& damage, DamageEffectType /*damagetype*/) override; // Called when a summoned creature dissapears (UnSommoned) - void SummonedCreatureDespawn(Creature* unit) OVERRIDE; + void SummonedCreatureDespawn(Creature* unit) override; // called when the corpse of this creature gets removed - void CorpseRemoved(uint32& respawnDelay) OVERRIDE; + void CorpseRemoved(uint32& respawnDelay) override; // Called at World update tick if creature is charmed void UpdateAIWhileCharmed(const uint32 diff); // Called when a Player/Creature enters the creature (vehicle) - void PassengerBoarded(Unit* who, int8 seatId, bool apply) OVERRIDE; + void PassengerBoarded(Unit* who, int8 seatId, bool apply) override; // Called when gets initialized, when creature is added to world - void InitializeAI() OVERRIDE; + void InitializeAI() override; // Called when creature gets charmed by another unit - void OnCharmed(bool apply) OVERRIDE; + void OnCharmed(bool apply) override; // Called when victim is in line of sight - bool CanAIAttack(const Unit* who) const OVERRIDE; + bool CanAIAttack(const Unit* who) const override; // Used in scripts to share variables - void DoAction(int32 param = 0) OVERRIDE; + void DoAction(int32 param = 0) override; // Used in scripts to share variables - uint32 GetData(uint32 id = 0) const OVERRIDE; + uint32 GetData(uint32 id = 0) const override; // Used in scripts to share variables - void SetData(uint32 id, uint32 value) OVERRIDE; + void SetData(uint32 id, uint32 value) override; // Used in scripts to share variables - void SetGUID(uint64 guid, int32 id = 0) OVERRIDE; + void SetGUID(uint64 guid, int32 id = 0) override; // Used in scripts to share variables - uint64 GetGUID(int32 id = 0) const OVERRIDE; + uint64 GetGUID(int32 id = 0) const override; //core related static int Permissible(const Creature*); @@ -177,15 +177,15 @@ class SmartAI : public CreatureAI void SetInvincibilityHpLevel(uint32 level) { mInvincibilityHpLevel = level; } - void sGossipHello(Player* player) OVERRIDE; - void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE; - void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code) OVERRIDE; - void sQuestAccept(Player* player, Quest const* quest) OVERRIDE; - //void sQuestSelect(Player* player, Quest const* quest) OVERRIDE; - //void sQuestComplete(Player* player, Quest const* quest) OVERRIDE; - void sQuestReward(Player* player, Quest const* quest, uint32 opt) OVERRIDE; - bool sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex) OVERRIDE; - void sOnGameEvent(bool start, uint16 eventId) OVERRIDE; + void sGossipHello(Player* player) override; + void sGossipSelect(Player* player, uint32 sender, uint32 action) override; + void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code) override; + void sQuestAccept(Player* player, Quest const* quest) override; + //void sQuestSelect(Player* player, Quest const* quest) override; + //void sQuestComplete(Player* player, Quest const* quest) override; + void sQuestReward(Player* player, Quest const* quest, uint32 opt) override; + bool sOnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex) override; + void sOnGameEvent(bool start, uint16 eventId) override; uint32 mEscortQuestID; @@ -198,7 +198,7 @@ class SmartAI : public CreatureAI void RemoveAuras(); - void OnSpellClick(Unit* clicker, bool& result) OVERRIDE; + void OnSpellClick(Unit* clicker, bool& result) override; private: uint32 mFollowCreditType; @@ -241,24 +241,24 @@ class SmartGameObjectAI : public GameObjectAI SmartGameObjectAI(GameObject* g) : GameObjectAI(g), go(g) { } ~SmartGameObjectAI() { } - void UpdateAI(uint32 diff) OVERRIDE; - void InitializeAI() OVERRIDE; - void Reset() OVERRIDE; + void UpdateAI(uint32 diff) override; + void InitializeAI() override; + void Reset() override; SmartScript* GetScript() { return &mScript; } static int Permissible(const GameObject* g); - bool GossipHello(Player* player) OVERRIDE; - bool GossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE; - bool GossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) OVERRIDE; - bool QuestAccept(Player* player, Quest const* quest) OVERRIDE; - bool QuestReward(Player* player, Quest const* quest, uint32 opt) OVERRIDE; - uint32 GetDialogStatus(Player* /*player*/) OVERRIDE; - void Destroyed(Player* player, uint32 eventId) OVERRIDE; - void SetData(uint32 id, uint32 value) OVERRIDE; + bool GossipHello(Player* player) override; + bool GossipSelect(Player* player, uint32 sender, uint32 action) override; + bool GossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) override; + bool QuestAccept(Player* player, Quest const* quest) override; + bool QuestReward(Player* player, Quest const* quest, uint32 opt) override; + uint32 GetDialogStatus(Player* /*player*/) override; + void Destroyed(Player* player, uint32 eventId) override; + void SetData(uint32 id, uint32 value) override; void SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker); - void OnGameEvent(bool start, uint16 eventId) OVERRIDE; - void OnStateChanged(uint32 state, Unit* unit) OVERRIDE; - void EventInform(uint32 eventId) OVERRIDE; + void OnGameEvent(bool start, uint16 eventId) override; + void OnStateChanged(uint32 state, Unit* unit) override; + void EventInform(uint32 eventId) override; protected: GameObject* const go; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h index 8330e2ee873..4698dc69824 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h @@ -252,31 +252,31 @@ class BattlegroundAB : public Battleground BattlegroundAB(); ~BattlegroundAB(); - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void Reset() override; void EndBattleground(uint32 winner); - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; /* Scorekeeping */ - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; /* Nodes occupying */ - void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) OVERRIDE; + void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override; /* achievement req. */ - bool IsAllNodesControlledByTeam(uint32 team) const OVERRIDE; - bool CheckAchievementCriteriaMeet(uint32 /*criteriaId*/, Player const* /*player*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) OVERRIDE; + bool IsAllNodesControlledByTeam(uint32 team) const override; + bool CheckAchievementCriteriaMeet(uint32 /*criteriaId*/, Player const* /*player*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) override; - uint32 GetPrematureWinner() OVERRIDE; + uint32 GetPrematureWinner() override; private: - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; /* Gameobject spawning/despawning */ void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay); void _DelBanner(uint8 node, uint8 type, uint8 teamIndex); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index e3e557111e8..ad63d5da794 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1546,37 +1546,37 @@ class BattlegroundAV : public Battleground ~BattlegroundAV(); /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* player, uint32 trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void ResetBGSubclass() OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* player, uint32 trigger) override; + bool SetupBattleground() override; + void ResetBGSubclass() override; /*general stuff*/ void UpdateScore(uint16 team, int16 points); - void UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) override; /*handlestuff*/ //these are functions which get called from extern - void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; - void HandleKillUnit(Creature* unit, Player* killer) OVERRIDE; - void HandleQuestComplete(uint32 questid, Player* player) OVERRIDE; - bool CanActivateGO(int32 GOId, uint32 team) const OVERRIDE; + void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override; + void HandleKillPlayer(Player* player, Player* killer) override; + void HandleKillUnit(Creature* unit, Player* killer) override; + void HandleQuestComplete(uint32 questid, Player* player) override; + bool CanActivateGO(int32 GOId, uint32 team) const override; void EndBattleground(uint32 winner); - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; // Achievement: Av perfection and Everything counts - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) OVERRIDE; + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) override; - uint32 GetPrematureWinner() OVERRIDE; + uint32 GetPrematureWinner() override; private: - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; /* Nodes occupying */ void EventPlayerAssaultsPoint(Player* player, uint32 object); @@ -1600,7 +1600,7 @@ class BattlegroundAV : public Battleground void ChangeMineOwner(uint8 mine, uint32 team, bool initial=false); /*worldstates*/ - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; uint8 GetWorldStateType(uint8 state, uint16 team) ; void SendMineWorldStates(uint32 mine); void UpdateNodeWorldState(BG_AV_Nodes node); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h index fb0c944f495..1fd4d13bf4d 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h @@ -50,18 +50,18 @@ class BattlegroundBE : public Battleground ~BattlegroundBE() { } /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void Reset() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void HandleKillPlayer(Player* player, Player* killer) override; /* Scorekeeping */ - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h index d60433487b5..08318a5bc00 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h @@ -224,31 +224,31 @@ class BattlegroundBFG : public Battleground BattlegroundBFG(); ~BattlegroundBFG(); - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void Reset() override; void EndBattleground(uint32 winner); - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; /* Scorekeeping */ - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; /* Nodes occupying */ - void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) OVERRIDE; + void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override; /* achievement req. */ - bool IsAllNodesControlledByTeam(uint32 team) const OVERRIDE; - bool CheckAchievementCriteriaMeet(uint32 /*criteriaId*/, Player const* /*player*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) OVERRIDE; + bool IsAllNodesControlledByTeam(uint32 team) const override; + bool CheckAchievementCriteriaMeet(uint32 /*criteriaId*/, Player const* /*player*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0) override; - uint32 GetPrematureWinner() OVERRIDE; + uint32 GetPrematureWinner() override; private: - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; /* Gameobject spawning/despawning */ void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay); void _DelBanner(uint8 node, uint8 type, uint8 teamIndex); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h index dac5cc16b0e..4e870bdad7f 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h @@ -87,16 +87,16 @@ class BattlegroundDS : public Battleground ~BattlegroundDS(); /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void Reset() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void HandleKillPlayer(Player* player, Player* killer) override; private: uint32 _waterfallTimer; uint8 _waterfallStatus; @@ -104,7 +104,7 @@ class BattlegroundDS : public Battleground uint32 _pipeKnockBackTimer; uint8 _pipeKnockBackCount; - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; protected: uint32 getWaterFallStatus() { return _waterfallStatus; } void setWaterFallStatus(uint8 status) { _waterfallStatus = status; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index d98a7c7d311..b646aa5565e 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -337,42 +337,42 @@ class BattlegroundEY : public Battleground ~BattlegroundEY(); /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; /* BG Flags */ - uint64 GetFlagPickerGUID(int32 /*team*/ = -1) const OVERRIDE { return m_FlagKeeper; } + uint64 GetFlagPickerGUID(int32 /*team*/ = -1) const override { return m_FlagKeeper; } void SetFlagPicker(uint64 guid) { m_FlagKeeper = guid; } bool IsFlagPickedup() const { return m_FlagKeeper != 0; } uint8 GetFlagState() const { return m_FlagState; } void RespawnFlag(bool send_message); void RespawnFlagAfterDrop(); - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; void HandleBuffUse(uint64 buff_guid); - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + void HandleKillPlayer(Player* player, Player* killer) override; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; + bool SetupBattleground() override; + void Reset() override; void UpdateTeamScore(uint32 Team); void EndBattleground(uint32 winner); - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void SetDroppedFlagGUID(uint64 guid, int32 /*TeamID*/ = -1) OVERRIDE { m_DroppedFlagGUID = guid;} + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void SetDroppedFlagGUID(uint64 guid, int32 /*TeamID*/ = -1) override { m_DroppedFlagGUID = guid;} uint64 GetDroppedFlagGUID() const { return m_DroppedFlagGUID;} /* Battleground Events */ - void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) OVERRIDE; - void EventPlayerDroppedFlag(Player* Source) OVERRIDE; + void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) override; + void EventPlayerDroppedFlag(Player* Source) override; /* achievement req. */ - bool IsAllNodesControlledByTeam(uint32 team) const OVERRIDE; + bool IsAllNodesControlledByTeam(uint32 team) const override; - uint32 GetPrematureWinner() OVERRIDE; + uint32 GetPrematureWinner() override; private: - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; void EventPlayerCapturedFlag(Player* Source, uint32 BgObjectType); void EventTeamCapturedPoint(Player* Source, uint32 Point); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index 7c8bee68086..bf7a0345d48 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -863,39 +863,39 @@ class BattlegroundIC : public Battleground ~BattlegroundIC(); /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; - void PostUpdateImpl(uint32 diff) OVERRIDE; - - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* player, uint32 trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; + void PostUpdateImpl(uint32 diff) override; + + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* player, uint32 trigger) override; + bool SetupBattleground() override; void SpawnLeader(uint32 teamid); - void HandleKillUnit(Creature* unit, Player* killer) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void HandleKillUnit(Creature* unit, Player* killer) override; + void HandleKillPlayer(Player* player, Player* killer) override; void EndBattleground(uint32 winner); - void EventPlayerClickedOnFlag(Player* source, GameObject* /*target_obj*/) OVERRIDE; + void EventPlayerClickedOnFlag(Player* source, GameObject* /*target_obj*/) override; - void EventPlayerDamagedGO(Player* /*player*/, GameObject* go, uint32 eventType) OVERRIDE; - void DestroyGate(Player* player, GameObject* go) OVERRIDE; + void EventPlayerDamagedGO(Player* /*player*/, GameObject* go, uint32 eventType) override; + void DestroyGate(Player* player, GameObject* go) override; - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; /* Scorekeeping */ - void UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) override; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; - void DoAction(uint32 action, uint64 var) OVERRIDE; + void DoAction(uint32 action, uint64 var) override; - void HandlePlayerResurrect(Player* player) OVERRIDE; + void HandlePlayerResurrect(Player* player) override; uint32 GetNodeState(uint8 nodeType) const { return (uint8)nodePoint[nodeType].nodeState; } - bool IsAllNodesControlledByTeam(uint32 team) const OVERRIDE; + bool IsAllNodesControlledByTeam(uint32 team) const override; - bool IsSpellAllowed(uint32 spellId, Player const* player) const OVERRIDE; + bool IsSpellAllowed(uint32 spellId, Player const* player) const override; private: uint32 closeFortressDoorsTimer; bool doorsClosed; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h index a21445bfda7..b7b4f5642af 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h @@ -50,15 +50,15 @@ class BattlegroundNA : public Battleground ~BattlegroundNA() { } /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder &builder) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void Reset() override; + void FillInitialWorldStates(WorldStateBuilder &builder) override; + void HandleKillPlayer(Player* player, Player* killer) override; }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h index c0046cfa1ca..1d6fd79b2c0 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h @@ -46,15 +46,15 @@ class BattlegroundRL : public Battleground ~BattlegroundRL() { } /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void Reset() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void Reset() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void HandleKillPlayer(Player* player, Player* killer) override; }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h index cdf699c9419..ff0a3c20aa0 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h @@ -100,23 +100,23 @@ class BattlegroundRV : public Battleground ~BattlegroundRV(); /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; - void Reset() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; + void Reset() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void HandleKillPlayer(Player* player, Player* killer) override; private: uint32 Timer; uint32 State; bool PillarCollision; - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; protected: uint32 getTimer() { return Timer; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index ece7d3e1592..c8c69e0d98d 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -449,29 +449,29 @@ class BattlegroundSA : public Battleground * -Update timer * -Round switch */ - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; /* inherited from BattlegroundClass */ /// Called when a player join battle - void AddPlayer(Player* player) OVERRIDE; + void AddPlayer(Player* player) override; /// Called when battle start - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; /// Called for ini battleground, after that the first player be entered - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + bool SetupBattleground() override; + void Reset() override; /// Called for generate packet contain worldstate data - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; /// Called when a player deal damage to building (door) - void EventPlayerDamagedGO(Player* player, GameObject* go, uint32 eventType) OVERRIDE; + void EventPlayerDamagedGO(Player* player, GameObject* go, uint32 eventType) override; /// Called when a player kill a unit in bg - void HandleKillUnit(Creature* creature, Player* killer) OVERRIDE; + void HandleKillUnit(Creature* creature, Player* killer) override; /// Return the nearest graveyard where player can respawn - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; /// Called when a player click on flag (graveyard flag) - void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) OVERRIDE; + void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) override; /// Called when a player use a gamobject (relic) - void EventPlayerUsedGO(Player* Source, GameObject* object) OVERRIDE; + void EventPlayerUsedGO(Player* Source, GameObject* object) override; /// Return gate id, relative to bg data, according to gameobject id uint32 getGateIdFromDamagedOrDestroyEventId(uint32 id) { @@ -533,18 +533,18 @@ class BattlegroundSA : public Battleground void EndBattleground(uint32 winner); /// CAlled when a player leave battleground - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; /* Scorekeeping */ /// Update score board - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; // Achievement: Defense of the Ancients bool gateDestroyed; // Achievement: Not Even a Scratch - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) OVERRIDE; + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) override; /// Id of attacker team TeamId Attackers; @@ -576,7 +576,7 @@ class BattlegroundSA : public Battleground * -Update worldstate * -Delete gameobject in front of door (lighting object, with different colours for each door) */ - void DestroyGate(Player* player, GameObject* go) OVERRIDE; + void DestroyGate(Player* player, GameObject* go) override; /// Update timer worldstate void SendTime(); /** diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h index 5c8388ffb3b..9ac3ea41caf 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h @@ -176,13 +176,13 @@ class BattlegroundTP : public Battleground /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; /* BG Flags */ - uint64 GetFlagPickerGUID(int32 team) const OVERRIDE + uint64 GetFlagPickerGUID(int32 team) const override { if (team == TEAM_ALLIANCE || team == TEAM_HORDE) return m_FlagKeepers[team]; @@ -198,25 +198,25 @@ class BattlegroundTP : public Battleground /* Battleground Events */ - void EventPlayerDroppedFlag(Player* Source) OVERRIDE; - void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) OVERRIDE; + void EventPlayerDroppedFlag(Player* Source) override; + void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) override; void EventPlayerCapturedFlag(Player* Source); - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + void HandleKillPlayer(Player* player, Player* killer) override; + bool SetupBattleground() override; + void Reset() override; void EndBattleground(uint32 winner); - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; void UpdateFlagState(uint32 team, uint32 value); void SetLastFlagCapture(uint32 team) { _lastFlagCaptureTeam = team; } void UpdateTeamScore(uint32 team); - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; - void SetDroppedFlagGUID(uint64 guid, int32 team = -1) OVERRIDE + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; + void SetDroppedFlagGUID(uint64 guid, int32 team = -1) override { if (team == TEAM_ALLIANCE || team == TEAM_HORDE) m_DroppedFlagGUID[team] = guid; @@ -224,7 +224,7 @@ class BattlegroundTP : public Battleground uint64 GetDroppedFlagGUID(uint32 TeamID) { return m_DroppedFlagGUID[GetTeamIndexByTeamId(TeamID)];} - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; /* Scorekeeping */ @@ -233,7 +233,7 @@ class BattlegroundTP : public Battleground void RemovePoint(uint32 TeamID, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] -= Points; } - uint32 GetPrematureWinner() OVERRIDE; + uint32 GetPrematureWinner() override; private: uint64 m_FlagKeepers[2]; // 0 - alliance, 1 - horde uint64 m_DroppedFlagGUID[2]; @@ -252,7 +252,7 @@ class BattlegroundTP : public Battleground uint8 _minutesElapsed; - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTV.h b/src/server/game/Battlegrounds/Zones/BattlegroundTV.h index 77acea5f324..f30f92e7f71 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundTV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundTV.h @@ -46,18 +46,18 @@ class BattlegroundTV : public Battleground ~BattlegroundTV() { } /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* Source, uint32 Trigger) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* Source, uint32 Trigger) override; + bool SetupBattleground() override; + void Reset() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void HandleKillPlayer(Player* player, Player* killer) override; /* Scorekeeping */ - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundVOP.h b/src/server/game/Battlegrounds/Zones/BattlegroundVOP.h index 2d96f9ff9fb..fd943b40cac 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundVOP.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundVOP.h @@ -95,22 +95,22 @@ class BattlegroundVOP : public Battleground ~BattlegroundVOP() { } /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; /* Battleground Events */ - void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) OVERRIDE; - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + void EventPlayerClickedOnFlag(Player* Source, GameObject* target_obj) override; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleKillPlayer(Player* player, Player* killer) override; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; + bool SetupBattleground() override; + void Reset() override; void UpdateTeamScore(uint32 Team); void EndBattleground(uint32 winner); - void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - uint32 GetPrematureWinner() OVERRIDE; - void PostUpdateImpl(uint32 diff) OVERRIDE; + void UpdatePlayerScore(Player* Source, uint32 type, uint32 value, bool doAddHonor = true) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + uint32 GetPrematureWinner() override; + void PostUpdateImpl(uint32 diff) override; private: uint64 m_FlagKeeper[4] = { }; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h index a34feee0048..6bd5bff13a3 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h @@ -163,12 +163,12 @@ class BattlegroundWS : public Battleground ~BattlegroundWS(); /* inherited from BattlegroundClass */ - void AddPlayer(Player* player) OVERRIDE; - void StartingEventCloseDoors() OVERRIDE; - void StartingEventOpenDoors() OVERRIDE; + void AddPlayer(Player* player) override; + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; /* BG Flags */ - uint64 GetFlagPickerGUID(int32 team) const OVERRIDE + uint64 GetFlagPickerGUID(int32 team) const override { if (team == TEAM_ALLIANCE || team == TEAM_HORDE) return m_FlagKeepers[team]; @@ -183,40 +183,40 @@ class BattlegroundWS : public Battleground uint8 GetFlagState(uint32 team) { return _flagState[GetTeamIndexByTeamId(team)]; } /* Battleground Events */ - void EventPlayerDroppedFlag(Player* player) OVERRIDE; - void EventPlayerClickedOnFlag(Player* player, GameObject* target_obj) OVERRIDE; + void EventPlayerDroppedFlag(Player* player) override; + void EventPlayerClickedOnFlag(Player* player, GameObject* target_obj) override; void EventPlayerCapturedFlag(Player* player); - void RemovePlayer(Player* player, uint64 guid, uint32 team) OVERRIDE; - void HandleAreaTrigger(Player* player, uint32 trigger) OVERRIDE; - void HandleKillPlayer(Player* player, Player* killer) OVERRIDE; - bool SetupBattleground() OVERRIDE; - void Reset() OVERRIDE; + void RemovePlayer(Player* player, uint64 guid, uint32 team) override; + void HandleAreaTrigger(Player* player, uint32 trigger) override; + void HandleKillPlayer(Player* player, Player* killer) override; + bool SetupBattleground() override; + void Reset() override; void EndBattleground(uint32 winner); - WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) OVERRIDE; + WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override; void UpdateFlagState(uint32 team, uint32 value); void SetLastFlagCapture(uint32 team) { _lastFlagCaptureTeam = team; } void UpdateTeamScore(uint32 team); - void UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) OVERRIDE; - void SetDroppedFlagGUID(uint64 guid, int32 team = -1) OVERRIDE + void UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) override; + void SetDroppedFlagGUID(uint64 guid, int32 team = -1) override { if (team == TEAM_ALLIANCE || team == TEAM_HORDE) m_DroppedFlagGUID[team] = guid; } uint64 GetDroppedFlagGUID(uint32 TeamID) { return m_DroppedFlagGUID[GetTeamIndexByTeamId(TeamID)];} - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void FillInitialWorldStates(WorldStateBuilder& builder) override; /* Scorekeeping */ void AddPoint(uint32 TeamID, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] += Points; } void SetTeamPoint(uint32 TeamID, uint32 Points = 0) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] = Points; } void RemovePoint(uint32 TeamID, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] -= Points; } - uint32 GetPrematureWinner() OVERRIDE; + uint32 GetPrematureWinner() override; /* Achievements*/ - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) OVERRIDE; + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) override; private: uint64 m_FlagKeepers[2]; // 0 - alliance, 1 - horde @@ -234,6 +234,6 @@ class BattlegroundWS : public Battleground uint8 _flagDebuffState; // 0 - no debuffs, 1 - focused assault, 2 - brutal assault uint8 _minutesElapsed; - void PostUpdateImpl(uint32 diff) OVERRIDE; + void PostUpdateImpl(uint32 diff) override; }; #endif diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 808cead4ccd..161a4846ac6 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -443,11 +443,11 @@ class Creature : public Unit, public GridObject, public MapObject explicit Creature(bool isWorldObject = false); virtual ~Creature(); - void AddToWorld() OVERRIDE; - void RemoveFromWorld() OVERRIDE; + void AddToWorld() override; + void RemoveFromWorld() override; - void SetObjectScale(float scale) OVERRIDE; - void SetDisplayId(uint32 modelId) OVERRIDE; + void SetObjectScale(float scale) override; + void SetDisplayId(uint32 modelId) override; void DisappearAndDie(); @@ -458,7 +458,7 @@ class Creature : public Unit, public GridObject, public MapObject uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; } - void Update(uint32 time) OVERRIDE; // overwrited Unit::Update + void Update(uint32 time) override; // overwrited Unit::Update void GetRespawnPosition(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const; void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; } @@ -469,7 +469,7 @@ class Creature : public Unit, public GridObject, public MapObject bool IsGuard() const { return GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_GUARD; } bool CanWalk() const { return GetCreatureTemplate()->InhabitType & INHABIT_GROUND; } bool CanSwim() const { return GetCreatureTemplate()->InhabitType & INHABIT_WATER || IsPet(); } - bool CanFly() const OVERRIDE { return GetCreatureTemplate()->InhabitType & INHABIT_AIR; } + bool CanFly() const override { return GetCreatureTemplate()->InhabitType & INHABIT_AIR; } void SetReactState(ReactStates st) { m_reactState = st; } ReactStates GetReactState() { return m_reactState; } @@ -480,14 +480,14 @@ class Creature : public Unit, public GridObject, public MapObject bool isCanInteractWithBattleMaster(Player* player, bool msg) const; bool isCanTrainingAndResetTalentsOf(Player* player) const; bool CanCreatureAttack(Unit const* victim, bool force = true) const; - bool IsImmunedToSpell(SpellInfo const* spellInfo) const OVERRIDE; // override Unit::IsImmunedToSpell - bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const OVERRIDE; // override Unit::IsImmunedToSpellEffect + bool IsImmunedToSpell(SpellInfo const* spellInfo) const override; // override Unit::IsImmunedToSpell + bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const override; // override Unit::IsImmunedToSpellEffect bool isElite() const; bool isWorldBoss() const; bool IsDungeonBoss() const; - uint8 getLevelForTarget(WorldObject const* target) const OVERRIDE; // overwrite Unit::getLevelForTarget for boss level support + uint8 getLevelForTarget(WorldObject const* target) const override; // overwrite Unit::getLevelForTarget for boss level support bool IsInEvadeMode() const { return HasUnitState(UNIT_STATE_EVADE); } @@ -496,7 +496,7 @@ class Creature : public Unit, public GridObject, public MapObject CreatureAI* AI() const { return (CreatureAI*)i_AI; } - SpellSchoolMask GetMeleeDamageSchoolMask() const OVERRIDE { return m_meleeDamageSchoolMask; } + SpellSchoolMask GetMeleeDamageSchoolMask() const override { return m_meleeDamageSchoolMask; } void SetMeleeDamageSchool(SpellSchools school) { m_meleeDamageSchoolMask = SpellSchoolMask(1 << school); } void _AddCreatureSpellCooldown(uint32 spell_id, time_t end_time); @@ -505,22 +505,22 @@ class Creature : public Unit, public GridObject, public MapObject bool HasSpellCooldown(uint32 spell_id) const; bool HasCategoryCooldown(uint32 spell_id) const; uint32 GetCreatureSpellCooldownDelay(uint32 spellId) const; - virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) OVERRIDE; + virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) override; - bool HasSpell(uint32 spellID) const OVERRIDE; + bool HasSpell(uint32 spellID) const override; bool UpdateEntry(uint32 entry, uint32 team=ALLIANCE, const CreatureData* data=NULL); void UpdateMovementFlags(); - bool UpdateStats(Stats stat) OVERRIDE; - bool UpdateAllStats() OVERRIDE; - void UpdateResistances(uint32 school) OVERRIDE; - void UpdateArmor() OVERRIDE; - void UpdateMaxHealth() OVERRIDE; - void UpdateMaxPower(Powers power) OVERRIDE; - void UpdateAttackPowerAndDamage(bool ranged = false) OVERRIDE; - void UpdateDamagePhysical(WeaponAttackType attType) OVERRIDE; + bool UpdateStats(Stats stat) override; + bool UpdateAllStats() override; + void UpdateResistances(uint32 school) override; + void UpdateArmor() override; + void UpdateMaxHealth() override; + void UpdateMaxPower(Powers power) override; + void UpdateAttackPowerAndDamage(bool ranged = false) override; + void UpdateDamagePhysical(WeaponAttackType attType) override; int8 GetOriginalEquipmentId() const { return m_originalEquipmentId; } uint8 GetCurrentEquipmentId() { return m_equipmentId; } @@ -543,9 +543,9 @@ class Creature : public Unit, public GridObject, public MapObject uint32 GetScriptId() const; // override WorldObject function for proper name localization - std::string const& GetNameForLocaleIdx(LocaleConstant locale_idx) const OVERRIDE; + std::string const& GetNameForLocaleIdx(LocaleConstant locale_idx) const override; - void setDeathState(DeathState s) OVERRIDE; // override virtual Unit::setDeathState + void setDeathState(DeathState s) override; // override virtual Unit::setDeathState bool LoadFromDB(uint32 guid, Map* map) { return LoadCreatureFromDB(guid, map, false); } bool LoadCreatureFromDB(uint32 guid, Map* map, bool addToMap = true); @@ -610,7 +610,7 @@ class Creature : public Unit, public GridObject, public MapObject time_t GetRespawnTimeEx() const; void SetRespawnTime(uint32 respawn) { m_respawnTime = respawn ? time(NULL) + respawn : 0; } void Respawn(bool force = false); - void SaveRespawnTime() OVERRIDE; + void SaveRespawnTime() override; uint32 GetRespawnDelay() const { return m_respawnDelay; } void SetRespawnDelay(uint32 delay) { m_respawnDelay = delay; } @@ -625,8 +625,8 @@ class Creature : public Unit, public GridObject, public MapObject void SetInCombatWithZone(); - bool hasQuest(uint32 quest_id) const OVERRIDE; - bool hasInvolvedQuest(uint32 quest_id) const OVERRIDE; + bool hasQuest(uint32 quest_id) const override; + bool hasInvolvedQuest(uint32 quest_id) const override; bool isRegeneratingHealth() { return m_regenHealth; } void setRegeneratingHealth(bool regenHealth) { m_regenHealth = regenHealth; } @@ -677,7 +677,7 @@ class Creature : public Unit, public GridObject, public MapObject bool m_isTempWorldObject; //true when possessed // Handling caster facing during spellcast - void SetTarget(uint64 guid) OVERRIDE; + void SetTarget(uint64 guid) override; void FocusTarget(Spell const* focusSpell, WorldObject const* target); void ReleaseFocus(Spell const* focusSpell); @@ -728,8 +728,8 @@ class Creature : public Unit, public GridObject, public MapObject uint16 m_LootMode; // Bitmask (default: LOOT_MODE_DEFAULT) that determines what loot will be lootable uint32 guid_transport; - bool IsInvisibleDueToDespawn() const OVERRIDE; - bool CanAlwaysSee(WorldObject const* obj) const OVERRIDE; + bool IsInvisibleDueToDespawn() const override; + bool CanAlwaysSee(WorldObject const* obj) const override; private: void ForcedDespawn(uint32 timeMSToDespawn = 0); @@ -749,7 +749,7 @@ class AssistDelayEvent : public BasicEvent public: AssistDelayEvent(uint64 victim, Unit& owner) : BasicEvent(), m_victim(victim), m_owner(owner) { } - bool Execute(uint64 e_time, uint32 p_time) OVERRIDE; + bool Execute(uint64 e_time, uint32 p_time) override; void AddAssistant(uint64 guid) { m_assistants.push_back(guid); } private: AssistDelayEvent(); @@ -763,7 +763,7 @@ class ForcedDespawnDelayEvent : public BasicEvent { public: ForcedDespawnDelayEvent(Creature& owner) : BasicEvent(), m_owner(owner) { } - bool Execute(uint64 e_time, uint32 p_time) OVERRIDE; + bool Execute(uint64 e_time, uint32 p_time) override; private: Creature& m_owner; diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index 8e1eb7c6c71..24c3637b588 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -42,13 +42,13 @@ class TempSummon : public Creature public: explicit TempSummon(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject); virtual ~TempSummon() { } - void Update(uint32 time) OVERRIDE; + void Update(uint32 time) override; virtual void InitStats(uint32 lifetime); virtual void InitSummon(); virtual void UnSummon(uint32 msTime = 0); - void RemoveFromWorld() OVERRIDE; + void RemoveFromWorld() override; void SetTempSummonType(TempSummonType type); - void SaveToDB(uint32 /*mapid*/, uint32 /*spawnMask*/) OVERRIDE { } + void SaveToDB(uint32 /*mapid*/, uint32 /*spawnMask*/) override { } Unit* GetSummoner() const; Creature* GetSummonerCreatureBase() const; uint64 GetSummonerGUID() const { return m_summonerGUID; } @@ -67,10 +67,10 @@ class Minion : public TempSummon { public: Minion(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject); - void InitStats(uint32 duration) OVERRIDE; - void RemoveFromWorld() OVERRIDE; + void InitStats(uint32 duration) override; + void RemoveFromWorld() override; Unit* GetOwner() const { return m_owner; } - float GetFollowAngle() const OVERRIDE { return m_followAngle; } + float GetFollowAngle() const override { return m_followAngle; } void SetFollowAngle(float angle) { m_followAngle = angle; } bool IsPetGhoul() const {return GetEntry() == 26125;} // Ghoul may be guardian or pet bool IsSpiritWolf() const {return GetEntry() == 29264;} // Spirit wolf from feral spirits @@ -85,18 +85,18 @@ class Guardian : public Minion { public: Guardian(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject); - void InitStats(uint32 duration) OVERRIDE; + void InitStats(uint32 duration) override; bool InitStatsForLevel(uint8 level); - void InitSummon() OVERRIDE; + void InitSummon() override; - bool UpdateStats(Stats stat) OVERRIDE; - bool UpdateAllStats() OVERRIDE; - void UpdateResistances(uint32 school) OVERRIDE; - void UpdateArmor() OVERRIDE; - void UpdateMaxHealth() OVERRIDE; - void UpdateMaxPower(Powers power) OVERRIDE; - void UpdateAttackPowerAndDamage(bool ranged = false) OVERRIDE; - void UpdateDamagePhysical(WeaponAttackType attType) OVERRIDE; + bool UpdateStats(Stats stat) override; + bool UpdateAllStats() override; + void UpdateResistances(uint32 school) override; + void UpdateArmor() override; + void UpdateMaxHealth() override; + void UpdateMaxPower(Powers power) override; + void UpdateAttackPowerAndDamage(bool ranged = false) override; + void UpdateDamagePhysical(WeaponAttackType attType) override; int32 GetBonusDamage() const { return m_bonusSpellDamage; } void SetBonusDamage(int32 damage); @@ -109,17 +109,17 @@ class Puppet : public Minion { public: Puppet(SummonPropertiesEntry const* properties, Unit* owner); - void InitStats(uint32 duration) OVERRIDE; - void InitSummon() OVERRIDE; - void Update(uint32 time) OVERRIDE; - void RemoveFromWorld() OVERRIDE; + void InitStats(uint32 duration) override; + void InitSummon() override; + void Update(uint32 time) override; + void RemoveFromWorld() override; }; class ForcedUnsummonDelayEvent : public BasicEvent { public: ForcedUnsummonDelayEvent(TempSummon& owner) : BasicEvent(), m_owner(owner) { } - bool Execute(uint64 e_time, uint32 p_time) OVERRIDE; + bool Execute(uint64 e_time, uint32 p_time) override; private: TempSummon& m_owner; diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h index e06fde5f527..880ec4efa41 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.h +++ b/src/server/game/Entities/DynamicObject/DynamicObject.h @@ -39,11 +39,11 @@ class DynamicObject : public WorldObject, public GridObject DynamicObject(bool isWorldObject); ~DynamicObject(); - void AddToWorld() OVERRIDE; - void RemoveFromWorld() OVERRIDE; + void AddToWorld() override; + void RemoveFromWorld() override; bool CreateDynamicObject(uint32 guidlow, Unit* caster, SpellInfo const* spell, Position const& pos, float radius, DynamicObjectType type); - void Update(uint32 p_time) OVERRIDE; + void Update(uint32 p_time) override; void Remove(); void SetDuration(int32 newDuration); int32 GetDuration() const; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 2650b2a109c..40b8a6be953 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2290,13 +2290,13 @@ class GameObjectModelOwnerImpl : public GameObjectModelOwnerBase public: explicit GameObjectModelOwnerImpl(GameObject const* owner) : _owner(owner) { } - bool isSpawned() const OVERRIDE { return _owner->isSpawned(); } - uint32 GetDisplayId() const OVERRIDE { return _owner->GetDisplayId(); } - uint32 GetPhaseMask() const OVERRIDE { return _owner->GetPhaseMask(); } - G3D::Vector3 GetPosition() const OVERRIDE { return G3D::Vector3(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()); } - float GetOrientation() const OVERRIDE { return _owner->GetOrientation(); } - float GetScale() const OVERRIDE { return _owner->GetObjectScale(); } - void DebugVisualizeCorner(G3D::Vector3 const& corner) const OVERRIDE { _owner->SummonCreature(1, corner.x, corner.y, corner.z, 0, TempSummonType::TEMPSUMMON_MANUAL_DESPAWN); } + bool isSpawned() const override { return _owner->isSpawned(); } + uint32 GetDisplayId() const override { return _owner->GetDisplayId(); } + uint32 GetPhaseMask() const override { return _owner->GetPhaseMask(); } + G3D::Vector3 GetPosition() const override { return G3D::Vector3(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()); } + float GetOrientation() const override { return _owner->GetOrientation(); } + float GetScale() const override { return _owner->GetObjectScale(); } + void DebugVisualizeCorner(G3D::Vector3 const& corner) const override { _owner->SummonCreature(1, corner.x, corner.y, corner.z, 0, TempSummonType::TEMPSUMMON_MANUAL_DESPAWN); } private: GameObject const* _owner; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 373325fbd0d..458eefdb9b2 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -637,14 +637,14 @@ class GameObject : public WorldObject, public GridObject, public Map explicit GameObject(); ~GameObject(); - void BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, Player* target) const OVERRIDE; + void BuildValuesUpdate(uint8 updatetype, ByteBuffer* data, Player* target) const override; - void AddToWorld() OVERRIDE; - void RemoveFromWorld() OVERRIDE; - void CleanupsBeforeDelete(bool finalCleanup = true) OVERRIDE; + void AddToWorld() override; + void RemoveFromWorld() override; + void CleanupsBeforeDelete(bool finalCleanup = true) override; bool Create(uint32 guidlow, uint32 name_id, Map* map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state, uint32 artKit = 0); - void Update(uint32 p_time) OVERRIDE; + void Update(uint32 p_time) override; static GameObject* GetGameObject(WorldObject& object, uint64 guid); GameObjectTemplate const* GetGOInfo() const { return m_goInfo; } GameObjectData const* GetGOData() const { return m_goData; } @@ -659,7 +659,7 @@ class GameObject : public WorldObject, public GridObject, public Map void UpdateRotationFields(float rotation2 = 0.0f, float rotation3 = 0.0f); // overwrite WorldObject function for proper name localization - std::string const& GetNameForLocaleIdx(LocaleConstant locale_idx) const OVERRIDE; + std::string const& GetNameForLocaleIdx(LocaleConstant locale_idx) const override; void SaveToDB(); void SaveToDB(uint32 mapid, uint32 spawnMask); @@ -760,7 +760,7 @@ class GameObject : public WorldObject, public GridObject, public Map uint32 GetUseCount() const { return m_usetimes; } uint32 GetUniqueUseCount() const { return m_unique_users.size(); } - void SaveRespawnTime() OVERRIDE; + void SaveRespawnTime() override; Loot loot; @@ -772,8 +772,8 @@ class GameObject : public WorldObject, public GridObject, public Map uint32 m_groupLootTimer; // (msecs)timer used for group loot uint32 lootingGroupLowGUID; // used to find group which is looting - bool hasQuest(uint32 quest_id) const OVERRIDE; - bool hasInvolvedQuest(uint32 quest_id) const OVERRIDE; + bool hasQuest(uint32 quest_id) const override; + bool hasInvolvedQuest(uint32 quest_id) const override; bool ActivateToQuest(Player* target) const; void UseDoorOrButton(uint32 time_to_restore = 0, bool alternative = false, Unit* user = NULL); // 0 = use `gameobject`.`spawntimesecs` @@ -781,10 +781,10 @@ class GameObject : public WorldObject, public GridObject, public Map void TriggeringLinkedGameObject(uint32 trapEntry, Unit* target); - bool IsAlwaysVisibleFor(WorldObject const* seer) const OVERRIDE; - bool IsInvisibleDueToDespawn() const OVERRIDE; + bool IsAlwaysVisibleFor(WorldObject const* seer) const override; + bool IsInvisibleDueToDespawn() const override; - uint8 getLevelForTarget(WorldObject const* target) const OVERRIDE + uint8 getLevelForTarget(WorldObject const* target) const override { if (Unit* owner = GetOwner()) return owner->getLevelForTarget(target); @@ -826,10 +826,10 @@ class GameObject : public WorldObject, public GridObject, public Map Transport* ToTransport() { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MO_TRANSPORT) return reinterpret_cast(this); else return NULL; } Transport const* ToTransport() const { if (GetGOInfo()->type == GAMEOBJECT_TYPE_MO_TRANSPORT) return reinterpret_cast(this); else return NULL; } - float GetStationaryX() const OVERRIDE { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionX(); return GetPositionX(); } - float GetStationaryY() const OVERRIDE { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionY(); return GetPositionY(); } - float GetStationaryZ() const OVERRIDE { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionZ(); return GetPositionZ(); } - float GetStationaryO() const OVERRIDE { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetOrientation(); return GetOrientation(); } + float GetStationaryX() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionX(); return GetPositionX(); } + float GetStationaryY() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionY(); return GetPositionY(); } + float GetStationaryZ() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetPositionZ(); return GetPositionZ(); } + float GetStationaryO() const override { if (GetGOInfo()->type != GAMEOBJECT_TYPE_MO_TRANSPORT) return m_stationaryPosition.GetOrientation(); return GetOrientation(); } void UpdateModelPosition(); @@ -870,7 +870,7 @@ class GameObject : public WorldObject, public GridObject, public Map void SwitchDoorOrButton(bool activate, bool alternative = false); //! Object distance/size - overridden from Object::_IsWithinDist. Needs to take in account proper GO size. - bool _IsWithinDist(WorldObject const* obj, float dist2compare, bool /*is3D*/) const OVERRIDE + bool _IsWithinDist(WorldObject const* obj, float dist2compare, bool /*is3D*/) const override { //! Following check does check 3d distance return IsInRange(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), dist2compare); diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h index 63dcee3608c..d14c8c6318c 100644 --- a/src/server/game/Entities/Item/Container/Bag.h +++ b/src/server/game/Entities/Item/Container/Bag.h @@ -33,10 +33,10 @@ class Bag : public Item Bag(); ~Bag(); - void AddToWorld() OVERRIDE; - void RemoveFromWorld() OVERRIDE; + void AddToWorld() override; + void RemoveFromWorld() override; - bool Create(uint32 guidlow, uint32 itemid, Player const* owner) OVERRIDE; + bool Create(uint32 guidlow, uint32 itemid, Player const* owner) override; void StoreItem(uint8 slot, Item* pItem, bool update); void RemoveItem(uint8 slot, bool update); @@ -52,13 +52,13 @@ class Bag : public Item // DB operations // overwrite virtual Item::SaveToDB - void SaveToDB(SQLTransaction& trans) OVERRIDE; + void SaveToDB(SQLTransaction& trans) override; // overwrite virtual Item::LoadFromDB - bool LoadFromDB(uint32 guid, uint64 owner_guid, Field* fields, uint32 entry) OVERRIDE; + bool LoadFromDB(uint32 guid, uint64 owner_guid, Field* fields, uint32 entry) override; // overwrite virtual Item::DeleteFromDB - void DeleteFromDB(SQLTransaction& trans) OVERRIDE; + void DeleteFromDB(SQLTransaction& trans) override; - void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const OVERRIDE; + void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override; protected: diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index ec8d00423b3..b629ad8deda 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1969,7 +1969,7 @@ class Player : public Unit, public GridObject Unit* GetSelectedUnit() const; Player* GetSelectedPlayer() const; - void SetTarget(uint64 /*guid*/) OVERRIDE { } /// Used for serverside target changes, does not apply to players + void SetTarget(uint64 /*guid*/) override { } /// Used for serverside target changes, does not apply to players void SetSelection(uint64 guid) { SetUInt64Value(UNIT_FIELD_TARGET, guid); diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h index 9be9ae89f7c..7c0d77afcdb 100644 --- a/src/server/game/Entities/Totem/Totem.h +++ b/src/server/game/Entities/Totem/Totem.h @@ -34,25 +34,25 @@ class Totem : public Minion public: Totem(SummonPropertiesEntry const* properties, Unit* owner); virtual ~Totem() { } - void Update(uint32 time) OVERRIDE; - void InitStats(uint32 duration) OVERRIDE; - void InitSummon() OVERRIDE; - void UnSummon(uint32 msTime = 0) OVERRIDE; + void Update(uint32 time) override; + void InitStats(uint32 duration) override; + void InitSummon() override; + void UnSummon(uint32 msTime = 0) override; uint32 GetSpell(uint8 slot = 0) const { return m_spells[slot]; } uint32 GetTotemDuration() const { return m_duration; } void SetTotemDuration(uint32 duration) { m_duration = duration; } TotemType GetTotemType() const { return m_type; } - bool UpdateStats(Stats /*stat*/) OVERRIDE { return true; } - bool UpdateAllStats() OVERRIDE { return true; } - void UpdateResistances(uint32 /*school*/) OVERRIDE { } - void UpdateArmor() OVERRIDE { } - void UpdateMaxHealth() OVERRIDE { } - void UpdateMaxPower(Powers /*power*/) OVERRIDE { } - void UpdateAttackPowerAndDamage(bool /*ranged*/) OVERRIDE { } - void UpdateDamagePhysical(WeaponAttackType /*attType*/) OVERRIDE { } + bool UpdateStats(Stats /*stat*/) override { return true; } + bool UpdateAllStats() override { return true; } + void UpdateResistances(uint32 /*school*/) override { } + void UpdateArmor() override { } + void UpdateMaxHealth() override { } + void UpdateMaxPower(Powers /*power*/) override { } + void UpdateAttackPowerAndDamage(bool /*ranged*/) override { } + void UpdateDamagePhysical(WeaponAttackType /*attType*/) override { } - bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const OVERRIDE; + bool IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) const override; protected: TotemType m_type; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 330edc9efed..4a3e9c07043 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1454,7 +1454,7 @@ class Unit : public WorldObject float GetSpellMaxRangeForTarget(Unit const* target, SpellInfo const* spellInfo) const; float GetSpellMinRangeForTarget(Unit const* target, SpellInfo const* spellInfo) const; - void Update(uint32 time) OVERRIDE; + void Update(uint32 time) override; void setAttackTimer(WeaponAttackType type, uint32 time) { @@ -2468,7 +2468,7 @@ class Unit : public WorldObject bool IsVisible() const; void SetVisible(bool x); void ClearPhases(bool update = false); - bool SetPhased(uint32 id, bool update, bool apply) OVERRIDE; + bool SetPhased(uint32 id, bool update, bool apply) override; // common function for visibility checks for player/creatures with detection code void SetPhaseMask(uint32 newPhaseMask, bool update) override;// overwrite WorldObject::SetPhaseMask void UpdateObjectVisibility(bool forced = true) override; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index f61aa8a9141..a03c5fd8fc9 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -651,23 +651,23 @@ class InstanceMap : public Map public: InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent); ~InstanceMap(); - bool AddPlayerToMap(Player*) OVERRIDE; - void RemovePlayerFromMap(Player*, bool) OVERRIDE; - void Update(const uint32) OVERRIDE; + bool AddPlayerToMap(Player*) override; + void RemovePlayerFromMap(Player*, bool) override; + void Update(const uint32) override; void CreateInstanceData(bool load); bool Reset(InstanceResetMethod method); uint32 GetScriptId() { return i_script_id; } InstanceScript* GetInstanceScript() { return i_data; } void PermBindAllPlayers(Player* source); - void UnloadAll() OVERRIDE; - bool CanEnter(Player* player) OVERRIDE; + void UnloadAll() override; + bool CanEnter(Player* player) override; void SendResetWarnings(uint32 timeLeft) const; void SetResetSchedule(bool on); uint32 GetMaxPlayers() const; uint32 GetMaxResetDelay() const; - virtual void InitVisibilityDistance() OVERRIDE; + virtual void InitVisibilityDistance() override; private: bool m_resetAfterUnload; bool m_unloadWhenEmpty; @@ -681,14 +681,14 @@ class BattlegroundMap : public Map BattlegroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode); ~BattlegroundMap(); - bool AddPlayerToMap(Player*) OVERRIDE; - void RemovePlayerFromMap(Player*, bool) OVERRIDE; - bool CanEnter(Player* player) OVERRIDE; + bool AddPlayerToMap(Player*) override; + void RemovePlayerFromMap(Player*, bool) override; + bool CanEnter(Player* player) override; void SetUnload(); //void UnloadAll(bool pForce); - void RemoveAllPlayers() OVERRIDE; + void RemoveAllPlayers() override; - virtual void InitVisibilityDistance() OVERRIDE; + virtual void InitVisibilityDistance() override; Battleground* GetBG() { return m_bg; } void SetBG(Battleground* bg) { m_bg = bg; } private: diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index ba266217e2d..7a3175ad3e7 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -34,11 +34,11 @@ class MapInstanced : public Map ~MapInstanced() { } // functions overwrite Map versions - void Update(const uint32) OVERRIDE; - void DelayedUpdate(const uint32 diff) OVERRIDE; + void Update(const uint32) override; + void DelayedUpdate(const uint32 diff) override; //void RelocationNotify(); - void UnloadAll() OVERRIDE; - bool CanEnter(Player* player) OVERRIDE; + void UnloadAll() override; + bool CanEnter(Player* player) override; Map* CreateInstanceForPlayer(const uint32 mapId, Player* player); Map* FindInstanceMap(uint32 instanceId) const @@ -62,7 +62,7 @@ class MapInstanced : public Map } InstancedMaps &GetInstancedMaps() { return m_InstancedMaps; } - virtual void InitVisibilityDistance() OVERRIDE; + virtual void InitVisibilityDistance() override; private: InstanceMap* CreateInstance(uint32 InstanceId, InstanceSave* save, DifficultyID difficulty); diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 4fbf445341e..588b7834954 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -57,7 +57,7 @@ enum SpellScriptState class _SpellScript { // internal use classes & functions - // DO NOT OVERRIDE THESE IN SCRIPTS + // DO NOT override THESE IN SCRIPTS protected: virtual bool _Validate(SpellInfo const* entry); @@ -152,7 +152,7 @@ enum SpellScriptHookType class SpellScript : public _SpellScript { // internal use classes & functions - // DO NOT OVERRIDE THESE IN SCRIPTS + // DO NOT override THESE IN SCRIPTS public: #define SPELLSCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ typedef SpellCastResult(CLASSNAME::*SpellCheckCastFnType)(); \ @@ -449,7 +449,7 @@ enum AuraScriptHookType class AuraScript : public _SpellScript { // internal use classes & functions - // DO NOT OVERRIDE THESE IN SCRIPTS + // DO NOT override THESE IN SCRIPTS public: #define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \ diff --git a/src/server/game/Tickets/TicketInfo.h b/src/server/game/Tickets/TicketInfo.h index 66028421a14..91d2dad6350 100644 --- a/src/server/game/Tickets/TicketInfo.h +++ b/src/server/game/Tickets/TicketInfo.h @@ -153,9 +153,9 @@ class GmTicket : public TicketInfo bool IsCompleted() const { return _completed; } bool GetViewed(){ return _viewed; } - void LoadFromDB(Field* fields) OVERRIDE; - void SaveToDB(SQLTransaction& trans) const OVERRIDE; - void DeleteFromDB() OVERRIDE; + void LoadFromDB(Field* fields) override; + void SaveToDB(SQLTransaction& trans) const override; + void DeleteFromDB() override; std::string FormatMessageString(ChatHandler& handler, bool detailed = false) const override; std::string FormatMessageString(ChatHandler& handler, const char* szClosedName, const char* szAssignedToName, const char* szUnassignedName, const char* szDeletedName) const override; @@ -192,12 +192,12 @@ class BugTicket : public TicketInfo void SetOrientation(float Orientation) { _Orientation = Orientation; } void SetNote(std::string const& bugnote) { _bugnote = bugnote; } - void LoadFromDB(Field* fields) OVERRIDE; - void SaveToDB(SQLTransaction& trans) const OVERRIDE; - void DeleteFromDB() OVERRIDE; + void LoadFromDB(Field* fields) override; + void SaveToDB(SQLTransaction& trans) const override; + void DeleteFromDB() override; using TicketInfo::FormatMessageString; - std::string FormatMessageString(ChatHandler& handler, bool detailed = false) const OVERRIDE; + std::string FormatMessageString(ChatHandler& handler, bool detailed = false) const override; private: float _Orientation; @@ -216,12 +216,12 @@ class SuggestTicket : public TicketInfo void SetOrientation(float Orientation) { _Orientation = Orientation; } void SetNote(std::string const& suggestnote) { _suggestnote = suggestnote; } - void LoadFromDB(Field* fields) OVERRIDE; - void SaveToDB(SQLTransaction& trans) const OVERRIDE; - void DeleteFromDB() OVERRIDE; + void LoadFromDB(Field* fields) override; + void SaveToDB(SQLTransaction& trans) const override; + void DeleteFromDB() override; using TicketInfo::FormatMessageString; - std::string FormatMessageString(ChatHandler& handler, bool detailed = false) const OVERRIDE; + std::string FormatMessageString(ChatHandler& handler, bool detailed = false) const override; private: float _Orientation; diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 6ad9076be93..e47a2a42580 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -35,7 +35,7 @@ class account_commandscript : public CommandScript public: account_commandscript() : CommandScript("account_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector accountSetSecTable = { diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index 1a348f10fc3..af7de5f83cc 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -36,7 +36,7 @@ class achievement_commandscript : public CommandScript public: achievement_commandscript() : CommandScript("achievement_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector achievementCommandTable = { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 973bfbd49e3..b8720bb40a7 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -37,7 +37,7 @@ class ban_commandscript : public CommandScript public: ban_commandscript() : CommandScript("ban_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector unbanCommandTable = { diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index 94b3e73c71a..8f8814c9611 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -33,7 +33,7 @@ class bf_commandscript : public CommandScript public: bf_commandscript() : CommandScript("bf_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector battlefieldcommandTable = { diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index 0fa75213dd3..2ffc8da1f86 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -35,7 +35,7 @@ class cast_commandscript : public CommandScript public: cast_commandscript() : CommandScript("cast_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector castCommandTable = { diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index d725b6fc430..c4a6db05fd2 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -37,7 +37,7 @@ class character_commandscript : public CommandScript public: character_commandscript() : CommandScript("character_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector pdumpCommandTable = { diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index 771bcdf118b..f2486db23e3 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -34,7 +34,7 @@ class cheat_commandscript : public CommandScript public: cheat_commandscript() : CommandScript("cheat_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector cheatCommandTable = { diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 3ef2063f7d7..463aec0776e 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -41,7 +41,7 @@ class debug_commandscript : public CommandScript public: debug_commandscript() : CommandScript("debug_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector debugPlayCommandTable = { diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index 70f56519156..0d5f0ae79e9 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -45,7 +45,7 @@ class deserter_commandscript : public CommandScript * @brief Returns the command structure for the system. */ - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector deserterInstanceCommandTable = { diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index b4d30e5f8a1..2368176c940 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -39,7 +39,7 @@ class disable_commandscript : public CommandScript public: disable_commandscript() : CommandScript("disable_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector removeDisableCommandTable = { diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 2663c3385fb..ac3324ac56e 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -35,7 +35,7 @@ class event_commandscript : public CommandScript public: event_commandscript() : CommandScript("event_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector eventCommandTable = { diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index fa6338ed11a..bcb91c8a254 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -38,7 +38,7 @@ class gm_commandscript : public CommandScript public: gm_commandscript() : CommandScript("gm_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector gmCommandTable = { diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 711137212e7..e580a2f7f86 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -37,7 +37,7 @@ class go_commandscript : public CommandScript public: go_commandscript() : CommandScript("go_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector goCommandTable = { diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index 77f6c562322..e0d4e8bf7ce 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -30,7 +30,7 @@ class group_commandscript : public CommandScript public: group_commandscript() : CommandScript("group_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector groupCommandTable = { diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 093dbbc189c..eff08251dae 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -35,7 +35,7 @@ class honor_commandscript : public CommandScript public: honor_commandscript() : CommandScript("honor_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector honorAddCommandTable = { diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index a14fc706806..46de356bd44 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -37,7 +37,7 @@ class instance_commandscript : public CommandScript public: instance_commandscript() : CommandScript("instance_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector instanceCommandTable = { diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 26156ffbe70..0cd6137068a 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -38,7 +38,7 @@ class learn_commandscript : public CommandScript public: learn_commandscript() : CommandScript("learn_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector learnAllMyCommandTable = { diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index 13e619fb85a..ee07e235aa3 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -43,7 +43,7 @@ class lfg_commandscript : public CommandScript public: lfg_commandscript() : CommandScript("lfg_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector lfgCommandTable = { diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 34654437398..8dc5617dfda 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -38,7 +38,7 @@ class list_commandscript : public CommandScript public: list_commandscript() : CommandScript("list_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector listCommandTable = { diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index bbc6a5414ad..ff173147ae6 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -39,7 +39,7 @@ class lookup_commandscript : public CommandScript public: lookup_commandscript() : CommandScript("lookup_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector lookupPlayerCommandTable = { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b0102da05fc..6d6f885687f 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -44,7 +44,7 @@ class misc_commandscript : public CommandScript public: misc_commandscript() : CommandScript("misc_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector commandTable = { diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 7ecc20188d5..0795bc14e2e 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -43,7 +43,7 @@ class mmaps_commandscript : public CommandScript public: mmaps_commandscript() : CommandScript("mmaps_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector mmapCommandTable = { diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 24ec1bbef27..11ad0b89854 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -39,7 +39,7 @@ class modify_commandscript : public CommandScript public: modify_commandscript() : CommandScript("modify_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector modifyspeedCommandTable = { diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 31c9637992d..7bed3d02f71 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -157,7 +157,7 @@ class npc_commandscript : public CommandScript public: npc_commandscript() : CommandScript("npc_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector npcAddCommandTable = { diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index efb0751a4eb..ee5f4e117f1 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -29,7 +29,7 @@ class pet_commandscript : public CommandScript public: pet_commandscript() : CommandScript("pet_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector petCommandTable = { diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index f277c76eb32..260d4b0267d 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -35,7 +35,7 @@ class quest_commandscript : public CommandScript public: quest_commandscript() : CommandScript("quest_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector questCommandTable = { diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index ecbafff42db..6c84b6eb612 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -37,7 +37,7 @@ class reset_commandscript : public CommandScript public: reset_commandscript() : CommandScript("reset_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector resetCommandTable = { diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp index ba204427393..fcff0ae1d09 100644 --- a/src/server/scripts/Commands/cs_send.cpp +++ b/src/server/scripts/Commands/cs_send.cpp @@ -29,7 +29,7 @@ class send_commandscript : public CommandScript public: send_commandscript() : CommandScript("send_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector sendCommandTable = { diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index dbb67c94ba2..f5ba25025a5 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -37,7 +37,7 @@ class server_commandscript : public CommandScript public: server_commandscript() : CommandScript("server_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector serverIdleRestartCommandTable = { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 00063861ff2..061b86080bd 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -37,7 +37,7 @@ class tele_commandscript : public CommandScript public: tele_commandscript() : CommandScript("tele_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector teleCommandTable = { diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 46e0f5979bd..522393ff814 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -35,7 +35,7 @@ class titles_commandscript : public CommandScript public: titles_commandscript() : CommandScript("titles_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector titlesSetCommandTable = { diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index a94975c7afa..dd9efc9a6f5 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -36,7 +36,7 @@ class wp_commandscript : public CommandScript public: wp_commandscript() : CommandScript("wp_commandscript") { } - std::vector GetCommands() const OVERRIDE + std::vector GetCommands() const override { static std::vector wpCommandTable = { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index d4044af1424..657504fc22d 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -89,7 +89,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript { npc_av_marshal_or_warmasterAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_CHARGE_TARGET, urand(2 * IN_MILLISECONDS, 12 * IN_MILLISECONDS)); @@ -102,12 +102,12 @@ class npc_av_marshal_or_warmaster : public CreatureScript _hasAura = false; } - void JustRespawned() OVERRIDE + void JustRespawned() override { Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // I have a feeling this isn't blizzlike, but owell, I'm only passing by and cleaning up. if (!_hasAura) @@ -173,7 +173,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript bool _hasAura; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_av_marshal_or_warmasterAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index c2861d61404..eaf1f928db0 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -59,13 +59,13 @@ class npc_water_elemental : public CreatureScript uint64 balindaGUID; uint32 resetTimer; - void Reset() OVERRIDE + void Reset() override { waterBoltTimer = 3 * IN_MILLISECONDS; resetTimer = 5 * IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -89,7 +89,7 @@ class npc_water_elemental : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_water_elementalAI(creature); } @@ -113,7 +113,7 @@ class boss_balinda : public CreatureScript SummonList summons; - void Reset() OVERRIDE + void Reset() override { arcaneExplosionTimer = urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); coneOfColdTimer = 8 * IN_MILLISECONDS; @@ -125,17 +125,17 @@ class boss_balinda : public CreatureScript summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Reset(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { CAST_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID(); summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); @@ -143,12 +143,12 @@ class boss_balinda : public CreatureScript summons.Summon(summoned); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -199,7 +199,7 @@ class boss_balinda : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_balindaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 86b23ac780d..912bd2f2f10 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -57,7 +57,7 @@ class boss_drekthar : public CreatureScript uint32 YellTimer; uint32 ResetTimer; - void Reset() OVERRIDE + void Reset() override { WhirlwindTimer = urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); Whirlwind2Timer = urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); @@ -67,18 +67,18 @@ class boss_drekthar : public CreatureScript YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); //20 to 30 seconds } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Reset(); Talk(YELL_RESPAWN); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -128,7 +128,7 @@ class boss_drekthar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_drektharAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index c8ea8aa5dc9..9c04461c779 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -52,7 +52,7 @@ class boss_galvangar : public CreatureScript uint32 MortalStrikeTimer; uint32 ResetTimer; - void Reset() OVERRIDE + void Reset() override { CleaveTimer = urand(1 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); FrighteningShoutTimer = urand(2 * IN_MILLISECONDS, 19 * IN_MILLISECONDS); @@ -62,17 +62,17 @@ class boss_galvangar : public CreatureScript ResetTimer = 5 * IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -122,7 +122,7 @@ class boss_galvangar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_galvangarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 4fef716f425..41837782af2 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -53,7 +53,7 @@ class boss_vanndar : public CreatureScript uint32 ResetTimer; uint32 YellTimer; - void Reset() OVERRIDE + void Reset() override { AvatarTimer = 3 * IN_MILLISECONDS; ThunderclapTimer = 4 * IN_MILLISECONDS; @@ -62,12 +62,12 @@ class boss_vanndar : public CreatureScript YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -111,7 +111,7 @@ class boss_vanndar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vanndarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index ff07dfe6714..467f597542c 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -89,14 +89,14 @@ class boss_alizabal : public CreatureScript _intro = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); _hate = false; _skewer = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -104,27 +104,27 @@ class boss_alizabal : public CreatureScript events.ScheduleEvent(EVENT_RANDOM_CAST, 10000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->GetMotionMaster()->MoveTargetedHome(); _DespawnAtEvade(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -138,7 +138,7 @@ class boss_alizabal : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 pointId) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 pointId) override { switch (pointId) { @@ -148,7 +148,7 @@ class boss_alizabal : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -259,7 +259,7 @@ class boss_alizabal : public CreatureScript bool _skewer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBaradinHoldAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index ff2c75a9766..4bac0a74ad2 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -66,7 +66,7 @@ class boss_occuthar : public CreatureScript ASSERT(_vehicle); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); @@ -76,20 +76,20 @@ class boss_occuthar : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 5 * MINUTE * IN_MILLISECONDS); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { BossAI::EnterEvadeMode(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _DespawnAtEvade(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); @@ -105,7 +105,7 @@ class boss_occuthar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -147,7 +147,7 @@ class boss_occuthar : public CreatureScript Vehicle* _vehicle; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBaradinHoldAI(creature); } @@ -166,20 +166,20 @@ class npc_eyestalk : public CreatureScript _damageCount = 0; } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { // player is the spellcaster so register summon manually if (Creature* occuthar = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_OCCUTHAR))) occuthar->AI()->JustSummoned(me); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_FOCUSED_FIRE_FIRST_DAMAGE, 0); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -191,7 +191,7 @@ class npc_eyestalk : public CreatureScript } } - void EnterEvadeMode() OVERRIDE { } // Never evade + void EnterEvadeMode() override { } // Never evade private: InstanceScript* _instance; @@ -199,7 +199,7 @@ class npc_eyestalk : public CreatureScript uint8 _damageCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBaradinHoldAI(creature); } @@ -246,13 +246,13 @@ class spell_occuthar_focused_fire : public SpellScriptLoader targets.push_back(target); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_occuthar_focused_fire_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_occuthar_focused_fire_SpellScript(); } @@ -268,14 +268,14 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader { PrepareSpellScript(spell_occuthar_eyes_of_occuthar_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue())) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -295,14 +295,14 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_occuthar_eyes_of_occuthar_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_occuthar_eyes_of_occuthar_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_occuthar_eyes_of_occuthar_SpellScript(); } @@ -318,7 +318,7 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader { PrepareSpellScript(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetInstanceScript() != NULL; } @@ -335,13 +335,13 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_occuthar_eyes_of_occuthar_vehicle_SpellScript(); } @@ -357,7 +357,7 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader { PrepareAuraScript(spell_occuthar_occuthars_destruction_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -373,13 +373,13 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_occuthar_occuthars_destruction_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_occuthar_occuthars_destruction_AuraScript(); } diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp index b01434c1f3f..5794657c467 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -52,7 +52,7 @@ class boss_pit_lord_argaloth : public CreatureScript { boss_pit_lord_argalothAI(Creature* creature) : BossAI(creature, DATA_ARGALOTH) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); @@ -61,14 +61,14 @@ class boss_pit_lord_argaloth : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 5 * MINUTE * IN_MILLISECONDS); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->GetMotionMaster()->MoveTargetedHome(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _DespawnAtEvade(); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(33, damage) || me->HealthBelowPctDamaged(66, damage)) @@ -77,13 +77,13 @@ class boss_pit_lord_argaloth : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -117,7 +117,7 @@ class boss_pit_lord_argaloth : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetBaradinHoldAI(creature); } @@ -138,13 +138,13 @@ class spell_argaloth_consuming_darkness : public SpellScriptLoader Skyfire::Containers::RandomResizeList(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_consuming_darkness_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_argaloth_consuming_darkness_SpellScript(); } @@ -160,7 +160,7 @@ class spell_argaloth_meteor_slash : public SpellScriptLoader { PrepareSpellScript(spell_argaloth_meteor_slash_SpellScript); - bool Load() OVERRIDE + bool Load() override { _targetCount = 0; return true; @@ -179,7 +179,7 @@ class spell_argaloth_meteor_slash : public SpellScriptLoader SetHitDamage(GetHitDamage() / _targetCount); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_meteor_slash_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104); OnHit += SpellHitFn(spell_argaloth_meteor_slash_SpellScript::SplitDamage); @@ -189,7 +189,7 @@ class spell_argaloth_meteor_slash : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_argaloth_meteor_slash_SpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp index 74b883b232b..31d5a9ed39e 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp @@ -46,7 +46,7 @@ class instance_baradin_hold: public InstanceMapScript AlizabalGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch(creature->GetEntry()) { @@ -62,7 +62,7 @@ class instance_baradin_hold: public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch(go->GetEntry()) { @@ -74,7 +74,7 @@ class instance_baradin_hold: public InstanceMapScript } } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -91,7 +91,7 @@ class instance_baradin_hold: public InstanceMapScript return 0; } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch(go->GetEntry()) { @@ -103,7 +103,7 @@ class instance_baradin_hold: public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -114,7 +114,7 @@ class instance_baradin_hold: public InstanceMapScript return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index 13facc0f17c..cfdf5b2d51d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -32,7 +32,7 @@ class go_shadowforge_brazier : public GameObjectScript public: go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -85,7 +85,7 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -118,7 +118,7 @@ class npc_grimstone : public CreatureScript public: npc_grimstone() : CreatureScript("npc_grimstone") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_grimstoneAI(creature); } @@ -145,7 +145,7 @@ class npc_grimstone : public CreatureScript bool CanWalk; - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -184,7 +184,7 @@ class npc_grimstone : public CreatureScript MobDeath_Timer = 2500; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -225,7 +225,7 @@ class npc_grimstone : public CreatureScript instance->HandleGameObject(instance->GetData64(id), open); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; @@ -355,7 +355,7 @@ class npc_phalanx : public CreatureScript public: npc_phalanx() : CreatureScript("npc_phalanx") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phalanxAI(creature); } @@ -368,14 +368,14 @@ class npc_phalanx : public CreatureScript uint32 FireballVolley_Timer; uint32 MightyBlow_Timer; - void Reset() OVERRIDE + void Reset() override { ThunderClap_Timer = 12000; FireballVolley_Timer = 0; MightyBlow_Timer = 15000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -433,7 +433,7 @@ class npc_kharan_mighthammer : public CreatureScript public: npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -482,7 +482,7 @@ class npc_kharan_mighthammer : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -527,7 +527,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript public: npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -541,7 +541,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -580,7 +580,7 @@ class npc_dughal_stormwing : public CreatureScript public: npc_dughal_stormwing() : CreatureScript("npc_dughal_stormwing") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(creature); @@ -591,7 +591,7 @@ class npc_dughal_stormwing : public CreatureScript return dughal_stormwingAI; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -604,7 +604,7 @@ class npc_dughal_stormwing : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { @@ -618,7 +618,7 @@ class npc_dughal_stormwing : public CreatureScript { npc_dughal_stormwingAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -637,10 +637,10 @@ class npc_dughal_stormwing : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE { } - void Reset() OVERRIDE { } + void EnterCombat(Unit* who) override { } + void Reset() override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (IsBeingEscorted && killer == me) { @@ -651,7 +651,7 @@ class npc_dughal_stormwing : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED) @@ -696,7 +696,7 @@ class npc_marshal_windsor : public CreatureScript public: npc_marshal_windsor() : CreatureScript("npc_marshal_windsor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(creature); @@ -724,7 +724,7 @@ class npc_marshal_windsor : public CreatureScript return marshal_windsorAI; } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == 4322) { @@ -746,7 +746,7 @@ class npc_marshal_windsor : public CreatureScript instance = creature->GetInstanceScript(); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -791,7 +791,7 @@ class npc_marshal_windsor : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { switch (urand(0, 2)) { @@ -807,14 +807,14 @@ class npc_marshal_windsor : public CreatureScript } } - void Reset() OVERRIDE { } + void Reset() override { } - void JustDied(Unit* slayer) OVERRIDE + void JustDied(Unit* slayer) override { instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; @@ -880,7 +880,7 @@ class npc_marshal_reginald_windsor : public CreatureScript public: npc_marshal_reginald_windsor() : CreatureScript("npc_marshal_reginald_windsor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(creature); @@ -929,7 +929,7 @@ class npc_marshal_reginald_windsor : public CreatureScript { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { wp = waypointId; switch (waypointId) @@ -987,7 +987,7 @@ class npc_marshal_reginald_windsor : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) @@ -1007,7 +1007,7 @@ class npc_marshal_reginald_windsor : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { switch (urand(0, 2)) { @@ -1022,14 +1022,14 @@ class npc_marshal_reginald_windsor : public CreatureScript break; } } - void Reset() OVERRIDE { } + void Reset() override { } - void JustDied(Unit* slayer) OVERRIDE + void JustDied(Unit* slayer) override { instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; @@ -1090,7 +1090,7 @@ class npc_tobias_seecher : public CreatureScript public: npc_tobias_seecher() : CreatureScript("npc_tobias_seecher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(creature); @@ -1103,7 +1103,7 @@ class npc_tobias_seecher : public CreatureScript return tobias_seecherAI; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -1116,7 +1116,7 @@ class npc_tobias_seecher : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { @@ -1130,10 +1130,10 @@ class npc_tobias_seecher : public CreatureScript { npc_tobias_seecherAI(Creature* creature) : npc_escortAI(creature) { } - void EnterCombat(Unit* who) OVERRIDE { } - void Reset() OVERRIDE { } + void EnterCombat(Unit* who) override { } + void Reset() override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (IsBeingEscorted && killer == me) { @@ -1144,7 +1144,7 @@ class npc_tobias_seecher : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -1163,7 +1163,7 @@ class npc_tobias_seecher : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; @@ -1208,7 +1208,7 @@ class npc_rocknot : public CreatureScript public: npc_rocknot() : CreatureScript("npc_rocknot") { } - bool OnQuestReward(Player* /*player*/, Creature* creature, Quest const* quest, uint32 /*item*/) OVERRIDE + bool OnQuestReward(Player* /*player*/, Creature* creature, Quest const* quest, uint32 /*item*/) override { InstanceScript* instance = creature->GetInstanceScript(); if (!instance) @@ -1238,7 +1238,7 @@ class npc_rocknot : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_rocknotAI(creature); } @@ -1255,7 +1255,7 @@ class npc_rocknot : public CreatureScript uint32 BreakKeg_Timer; uint32 BreakDoor_Timer; - void Reset() OVERRIDE + void Reset() override { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -1270,7 +1270,7 @@ class npc_rocknot : public CreatureScript go->SetGoState((GOState)state); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (!instance) return; @@ -1296,7 +1296,7 @@ class npc_rocknot : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index fa18b470211..82b46a561e9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -31,7 +31,7 @@ class boss_ambassador_flamelash : public CreatureScript public: boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ambassador_flamelashAI(creature); } @@ -43,13 +43,13 @@ class boss_ambassador_flamelash : public CreatureScript uint32 FireBlast_Timer; uint32 Spirit_Timer; - void Reset() OVERRIDE + void Reset() override { FireBlast_Timer = 2000; Spirit_Timer = 24000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void SummonSpirits(Unit* victim) { @@ -57,7 +57,7 @@ class boss_ambassador_flamelash : public CreatureScript Spirit->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp index 221d14b5c0b..da5b681cf5a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -35,7 +35,7 @@ class boss_anubshiah : public CreatureScript public: boss_anubshiah() : CreatureScript("boss_anubshiah") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_anubshiahAI(creature); } @@ -50,7 +50,7 @@ class boss_anubshiah : public CreatureScript uint32 DemonArmor_Timer; uint32 EnvelopingWeb_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 7000; CurseOfTongues_Timer = 24000; @@ -59,9 +59,9 @@ class boss_anubshiah : public CreatureScript EnvelopingWeb_Timer = 16000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 6161fce2298..c6073de5b2d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -39,7 +39,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript public: boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_draganthaurissanAI(creature); } @@ -56,25 +56,25 @@ class boss_emperor_dagran_thaurissan : public CreatureScript uint32 AvatarOfFlame_Timer; //uint32 Counter; - void Reset() OVERRIDE + void Reset() override { HandOfThaurissan_Timer = 4000; AvatarOfFlame_Timer = 25000; //Counter= 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); me->CallForHelp(VISIBLE_RANGE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Moira = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_MOIRA) : 0)) { @@ -83,7 +83,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index a8ba75c92ad..a5a44079cd8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -33,7 +33,7 @@ class boss_general_angerforge : public CreatureScript public: boss_general_angerforge() : CreatureScript("boss_general_angerforge") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_general_angerforgeAI(creature); } @@ -48,7 +48,7 @@ class boss_general_angerforge : public CreatureScript uint32 Adds_Timer; bool Medics; - void Reset() OVERRIDE + void Reset() override { MightyBlow_Timer = 8000; HamString_Timer = 12000; @@ -57,7 +57,7 @@ class boss_general_angerforge : public CreatureScript Medics = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void SummonAdds(Unit* victim) { @@ -71,7 +71,7 @@ class boss_general_angerforge : public CreatureScript SummonedMedic->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp index a4700533f19..6a46db69dda 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -32,7 +32,7 @@ class boss_gorosh_the_dervish : public CreatureScript public: boss_gorosh_the_dervish() : CreatureScript("boss_gorosh_the_dervish") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gorosh_the_dervishAI(creature); } @@ -44,17 +44,17 @@ class boss_gorosh_the_dervish : public CreatureScript uint32 WhirlWind_Timer; uint32 MortalStrike_Timer; - void Reset() OVERRIDE + void Reset() override { WhirlWind_Timer = 12000; MortalStrike_Timer = 22000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp index 197836545a8..2213fcd2661 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp @@ -33,7 +33,7 @@ class boss_grizzle : public CreatureScript public: boss_grizzle() : CreatureScript("boss_grizzle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_grizzleAI(creature); } @@ -45,15 +45,15 @@ class boss_grizzle : public CreatureScript uint32 GroundTremor_Timer; uint32 Frenzy_Timer; - void Reset() OVERRIDE + void Reset() override { GroundTremor_Timer = 12000; Frenzy_Timer =0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index a80ef4fc1bd..b7725426493 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -34,7 +34,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript public: boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_high_interrogator_gerstahnAI(creature); } @@ -48,7 +48,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript uint32 PsychicScream_Timer; uint32 ShadowShield_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowWordPain_Timer = 4000; ManaBurn_Timer = 14000; @@ -56,9 +56,9 @@ class boss_high_interrogator_gerstahn : public CreatureScript ShadowShield_Timer = 8000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index cb67c46e7a7..e53830a5dc3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -37,7 +37,7 @@ class boss_magmus : public CreatureScript public: boss_magmus() : CreatureScript("boss_magmus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_magmusAI(creature); } @@ -49,15 +49,15 @@ class boss_magmus : public CreatureScript uint32 FieryBurst_Timer; uint32 WarStomp_Timer; - void Reset() OVERRIDE + void Reset() override { FieryBurst_Timer = 5000; WarStomp_Timer =0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -83,7 +83,7 @@ class boss_magmus : public CreatureScript DoMeleeAttackIfReady(); } // When he die open door to last chamber - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (InstanceScript* instance = killer->GetInstanceScript()) instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index e91417c93b4..39d1efc884d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -36,7 +36,7 @@ class boss_moira_bronzebeard : public CreatureScript public: boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_moira_bronzebeardAI(creature); } @@ -50,7 +50,7 @@ class boss_moira_bronzebeard : public CreatureScript uint32 ShadowWordPain_Timer; uint32 Smite_Timer; - void Reset() OVERRIDE + void Reset() override { Heal_Timer = 12000; //These times are probably wrong MindBlast_Timer = 16000; @@ -58,9 +58,9 @@ class boss_moira_bronzebeard : public CreatureScript Smite_Timer = 8000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index 51425b849e8..814e37f4a7e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -50,7 +50,7 @@ class boss_gloomrel : public CreatureScript public: boss_gloomrel() : CreatureScript("boss_gloomrel") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -79,7 +79,7 @@ class boss_gloomrel : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && player->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !player->HasSpell(SPELL_SMELT_DARK_IRON)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -109,7 +109,7 @@ class boss_doomrel : public CreatureScript public: boss_doomrel() : CreatureScript("boss_doomrel") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -132,7 +132,7 @@ class boss_doomrel : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(2601, creature->GetGUID()); @@ -140,7 +140,7 @@ class boss_doomrel : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_doomrelAI(creature); } @@ -159,7 +159,7 @@ class boss_doomrel : public CreatureScript uint32 DemonArmor_Timer; bool Voidwalkers; - void Reset() OVERRIDE + void Reset() override { ShadowVolley_Timer = 10000; Immolate_Timer = 18000; @@ -181,11 +181,11 @@ class boss_doomrel : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->RemoveAllAuras(); me->DeleteThreatList(); @@ -198,13 +198,13 @@ class boss_doomrel : public CreatureScript instance->SetData64(DATA_EVENSTARTER, 0); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_GHOSTKILL, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index afb2e6c3ea5..d9704beb428 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -71,7 +71,7 @@ class instance_blackrock_depths : public InstanceMapScript public: instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths", 230) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blackrock_depths_InstanceMapScript(map); } @@ -117,7 +117,7 @@ class instance_blackrock_depths : public InstanceMapScript uint32 TombTimer; uint32 TombEventCounter; - void Initialize() OVERRIDE + void Initialize() override { memset(&encounter, 0, sizeof(encounter)); @@ -158,7 +158,7 @@ class instance_blackrock_depths : public InstanceMapScript TombBossGUIDs[i] = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -180,7 +180,7 @@ class instance_blackrock_depths : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -214,7 +214,7 @@ class instance_blackrock_depths : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { SF_LOG_DEBUG("scripts", "Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data); @@ -230,7 +230,7 @@ class instance_blackrock_depths : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { SF_LOG_DEBUG("scripts", "Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); @@ -277,7 +277,7 @@ class instance_blackrock_depths : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -302,7 +302,7 @@ class instance_blackrock_depths : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -344,12 +344,12 @@ class instance_blackrock_depths : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -431,7 +431,7 @@ class instance_blackrock_depths : public InstanceMapScript TombEventStarterGUID = 0; SetData(TYPE_TOMB_OF_SEVEN, DONE); } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (TombEventStarterGUID && GhostKillCount < 7) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 8ec7f3b9efb..0dc388070d4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -47,12 +47,12 @@ class boss_drakkisath : public CreatureScript { boss_drakkisathAI(Creature* creature) : BossAI(creature, DATA_GENERAL_DRAKKISATH) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FIRE_NOVA, 6000); @@ -61,12 +61,12 @@ class boss_drakkisath : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCLAP, 17000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -102,7 +102,7 @@ class boss_drakkisath : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_drakkisathAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp index fda25c038af..ea7f5e79586 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -51,29 +51,29 @@ class boss_gizrul_the_slavener : public CreatureScript { boss_gizrul_the_slavenerAI(Creature* creature) : BossAI(creature, DATA_GIZRUL_THE_SLAVENER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { me->GetMotionMaster()->MovePath(GIZRUL_PATH, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000)); events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -103,7 +103,7 @@ class boss_gizrul_the_slavener : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gizrul_the_slavenerAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index c94dd960884..0b075de546e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -60,7 +60,7 @@ class boss_gyth : public CreatureScript bool SummonedRend; - void Reset() OVERRIDE + void Reset() override { SummonedRend = false; if (instance->GetBossState(DATA_GYTH) == IN_PROGRESS) @@ -70,7 +70,7 @@ class boss_gyth : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -80,12 +80,12 @@ class boss_gyth : public CreatureScript events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(12000, 18000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SetBossState(DATA_GYTH, DONE); } - void SetData(uint32 /*type*/, uint32 data) OVERRIDE + void SetData(uint32 /*type*/, uint32 data) override { switch (data) { @@ -97,7 +97,7 @@ class boss_gyth : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!SummonedRend && HealthBelowPct(5)) { @@ -162,7 +162,7 @@ class boss_gyth : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gythAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp index 18394ed1d11..f31473f6492 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp @@ -50,20 +50,20 @@ class boss_halycon : public CreatureScript { boss_halyconAI(Creature* creature) : BossAI(creature, DATA_HALYCON) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); Summoned = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_REND, urand(17000,20000)); events.ScheduleEvent(EVENT_THRASH, urand(10000,12000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SummonCreature(NPC_GIZRUL_THE_SLAVENER, SummonLocation, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 300000); Talk(EMOTE_DEATH); @@ -71,7 +71,7 @@ class boss_halycon : public CreatureScript Summoned = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -102,7 +102,7 @@ class boss_halycon : public CreatureScript bool Summoned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_halyconAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp index f78a69d83d8..e1ba8f6f5e1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp @@ -39,7 +39,7 @@ class boss_highlord_omokk : public CreatureScript public: boss_highlord_omokk() : CreatureScript("boss_highlord_omokk") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_highlordomokkAI(creature); } @@ -48,24 +48,24 @@ class boss_highlord_omokk : public CreatureScript { boss_highlordomokkAI(Creature* creature) : BossAI(creature, DATA_HIGHLORD_OMOKK) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FRENZY, 20000); events.ScheduleEvent(EVENT_KNOCK_AWAY, 18000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp index d1d4a43ab02..fd9e0df244b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp @@ -51,27 +51,27 @@ class boss_lord_valthalak : public CreatureScript { boss_lord_valthalakAI(Creature* creature) : BossAI(creature, DATA_LORD_VALTHALAK) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); frenzy40 = false; frenzy15 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000)); events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_LORD_VALTHALAK, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -129,7 +129,7 @@ class boss_lord_valthalak : public CreatureScript bool frenzy15; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lord_valthalakAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp index b790952646e..4a26cf6d7ac 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp @@ -40,7 +40,7 @@ class boss_mother_smolderweb : public CreatureScript public: boss_mother_smolderweb() : CreatureScript("boss_mother_smolderweb") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mothersmolderwebAI(creature); } @@ -49,30 +49,30 @@ class boss_mother_smolderweb : public CreatureScript { boss_mothersmolderwebAI(Creature* creature) : BossAI(creature, DATA_MOTHER_SMOLDERWEB) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_CRYSTALIZE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (me->GetHealth() <= damage) DoCast(me, SPELL_SUMMON_SPIRE_SPIDERLING, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 1118a1276e9..f10bfe75ded 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -52,7 +52,7 @@ class boss_overlord_wyrmthalak : public CreatureScript public: boss_overlord_wyrmthalak() : CreatureScript("boss_overlord_wyrmthalak") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_overlordwyrmthalakAI(creature); } @@ -63,13 +63,13 @@ class boss_overlord_wyrmthalak : public CreatureScript bool Summoned; - void Reset() OVERRIDE + void Reset() override { _Reset(); Summoned = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS); @@ -78,12 +78,12 @@ class boss_overlord_wyrmthalak : public CreatureScript events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index 4503132ffd2..a3c779bbc6b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -80,7 +80,7 @@ class boss_pyroguard_emberseer : public CreatureScript { boss_pyroguard_emberseerAI(Creature* creature) : BossAI(creature, DATA_PYROGAURD_EMBERSEER) { } - void Reset() OVERRIDE + void Reset() override { if (instance) { @@ -101,7 +101,7 @@ class boss_pyroguard_emberseer : public CreatureScript } } - void SetData(uint32 /*type*/, uint32 data) OVERRIDE + void SetData(uint32 /*type*/, uint32 data) override { switch (data) { @@ -125,7 +125,7 @@ class boss_pyroguard_emberseer : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { // ### TODO Check combat timing ### events.ScheduleEvent(EVENT_FIRENOVA, 6000); @@ -133,7 +133,7 @@ class boss_pyroguard_emberseer : public CreatureScript events.ScheduleEvent(EVENT_PYROBLAST, 14000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -146,7 +146,7 @@ class boss_pyroguard_emberseer : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ENCAGE_EMBERSEER) { @@ -208,7 +208,7 @@ class boss_pyroguard_emberseer : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -317,7 +317,7 @@ class boss_pyroguard_emberseer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_pyroguard_emberseerAI(creature); } @@ -345,19 +345,19 @@ class npc_blackhand_incarcerator : public CreatureScript { npc_blackhand_incarceratorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC); if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) Emberseer->AI()->SetData(1, 3); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(10000); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == 1 && value == 1) { @@ -372,7 +372,7 @@ class npc_blackhand_incarcerator : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { // Used to close doors if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) @@ -391,7 +391,7 @@ class npc_blackhand_incarcerator : public CreatureScript _events.ScheduleEvent(EVENT_ENCAGE, urand(10000, 20000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -440,7 +440,7 @@ class npc_blackhand_incarcerator : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blackhand_incarceratorAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp index 49df84d157a..94c76851446 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -45,24 +45,24 @@ class quartermaster_zigris : public CreatureScript { boss_quatermasterzigrisAI(Creature* creature) : BossAI(creature, DATA_QUARTERMASTER_ZIGRIS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SHOOT, 1000); events.ScheduleEvent(EVENT_STUN_BOMB, 16000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -90,7 +90,7 @@ class quartermaster_zigris : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_quatermasterzigrisAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 4a17be26e8a..67efa01ebf7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -168,14 +168,14 @@ class boss_rend_blackhand : public CreatureScript { boss_rend_blackhandAI(Creature* creature) : BossAI(creature, DATA_WARCHIEF_REND_BLACKHAND) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); gythEvent = false; victorGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_WHIRLWIND, urand(13000, 15000)); @@ -183,14 +183,14 @@ class boss_rend_blackhand : public CreatureScript events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 75.0f, true)) victor->AI()->SetData(1, 2); } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (instance && type == AREATRIGGER && data == AREATRIGGER_BLACKROCK_STADIUM) { @@ -210,7 +210,7 @@ class boss_rend_blackhand : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == WAYPOINT_MOTION_TYPE) { @@ -228,7 +228,7 @@ class boss_rend_blackhand : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (gythEvent) { @@ -437,7 +437,7 @@ class boss_rend_blackhand : public CreatureScript uint64 portcullisGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rend_blackhandAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index c087da974a5..754bbe99c45 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -41,7 +41,7 @@ class boss_shadow_hunter_voshgajin : public CreatureScript public: boss_shadow_hunter_voshgajin() : CreatureScript("boss_shadow_hunter_voshgajin") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shadowvoshAI(creature); } @@ -50,13 +50,13 @@ class boss_shadow_hunter_voshgajin : public CreatureScript { boss_shadowvoshAI(Creature* creature) : BossAI(creature, DATA_SHADOW_HUNTER_VOSHGAJIN) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); //DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS); @@ -64,12 +64,12 @@ class boss_shadow_hunter_voshgajin : public CreatureScript events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index b5b3ac3dfd8..3702ac4d644 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -41,7 +41,7 @@ class boss_the_beast : public CreatureScript public: boss_the_beast() : CreatureScript("boss_the_beast") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_thebeastAI(creature); } @@ -50,12 +50,12 @@ class boss_the_beast : public CreatureScript { boss_thebeastAI(Creature* creature) : BossAI(creature, DATA_THE_BEAST) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FLAME_BREAK, 12 * IN_MILLISECONDS); @@ -63,12 +63,12 @@ class boss_the_beast : public CreatureScript events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp index 5fd233f4632..178d2fa15f6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp @@ -51,12 +51,12 @@ class boss_urok_doomhowl : public CreatureScript { boss_urok_doomhowlAI(Creature* creature) : BossAI(creature, DATA_UROK_DOOMHOWL) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(SPELL_REND, urand(17000,20000)); @@ -64,12 +64,12 @@ class boss_urok_doomhowl : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -99,7 +99,7 @@ class boss_urok_doomhowl : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_urok_doomhowlAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp index 9cd06150b44..046d830f06d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp @@ -47,7 +47,7 @@ class boss_warmaster_voone : public CreatureScript public: boss_warmaster_voone() : CreatureScript("boss_warmaster_voone") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warmastervooneAI(creature); } @@ -56,12 +56,12 @@ class boss_warmaster_voone : public CreatureScript { boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS); @@ -72,12 +72,12 @@ class boss_warmaster_voone : public CreatureScript events.ScheduleEvent(EVENT_THROW_AXE, 1 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index 011fde65db9..cac02c884f7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -78,7 +78,7 @@ class instance_blackrock_spire : public InstanceMapScript go_portcullis_tobossrooms = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -136,7 +136,7 @@ class instance_blackrock_spire : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -243,7 +243,7 @@ class instance_blackrock_spire : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -273,7 +273,7 @@ class instance_blackrock_spire : public InstanceMapScript return true; } - void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE + void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) override { switch (eventId) { @@ -292,7 +292,7 @@ class instance_blackrock_spire : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -307,7 +307,7 @@ class instance_blackrock_spire : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -414,7 +414,7 @@ class instance_blackrock_spire : public InstanceMapScript return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { Events.Update(diff); @@ -531,7 +531,7 @@ class instance_blackrock_spire : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -542,7 +542,7 @@ class instance_blackrock_spire : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { @@ -605,7 +605,7 @@ class instance_blackrock_spire : public InstanceMapScript uint64 go_portcullis_tobossrooms; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blackrock_spireMapScript(map); } @@ -620,7 +620,7 @@ class at_dragonspire_hall : public AreaTriggerScript public: at_dragonspire_hall() : AreaTriggerScript("at_dragonspire_hall") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player && player->IsAlive()) { @@ -644,7 +644,7 @@ class at_blackrock_stadium : public AreaTriggerScript public: at_blackrock_stadium() : AreaTriggerScript("at_blackrock_stadium") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player && player->IsAlive()) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp index 6ca213fa067..134305baa66 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -54,7 +54,7 @@ class boss_broodlord : public CreatureScript { boss_broodlordAI(Creature* creature) : BossAI(creature, BOSS_BROODLORD) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance->GetBossState(BOSS_VAELASTRAZ) != DONE) { @@ -72,7 +72,7 @@ class boss_broodlord : public CreatureScript events.ScheduleEvent(EVENT_CHECK, 1000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -116,7 +116,7 @@ class boss_broodlord : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_broodlordAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index bad9fdbd05e..a62f58decea 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -175,7 +175,7 @@ class boss_chromaggus : public CreatureScript EnterEvadeMode(); } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -183,7 +183,7 @@ class boss_chromaggus : public CreatureScript Enraged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && instance->GetBossState(BOSS_FLAMEGOR) != DONE) { @@ -199,7 +199,7 @@ class boss_chromaggus : public CreatureScript events.ScheduleEvent(EVENT_FRENZY, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -281,7 +281,7 @@ class boss_chromaggus : public CreatureScript bool Enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_chromaggusAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp index 36d07fd5a79..b1a68170eab 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -45,7 +45,7 @@ class boss_ebonroc : public CreatureScript { boss_ebonrocAI(Creature* creature) : BossAI(creature, BOSS_EBONROC) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && instance->GetBossState(BOSS_BROODLORD) != DONE) { @@ -59,7 +59,7 @@ class boss_ebonroc : public CreatureScript events.ScheduleEvent(EVENT_SHADOWOFEBONROC, urand(8000, 10000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -92,7 +92,7 @@ class boss_ebonroc : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ebonrocAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index 4f7156426ea..58c46a39627 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp @@ -45,7 +45,7 @@ class boss_firemaw : public CreatureScript { boss_firemawAI(Creature* creature) : BossAI(creature, BOSS_FIREMAW) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && instance->GetBossState(BOSS_BROODLORD) != DONE) { @@ -59,7 +59,7 @@ class boss_firemaw : public CreatureScript events.ScheduleEvent(EVENT_FLAMEBUFFET, 5000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -94,7 +94,7 @@ class boss_firemaw : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_firemawAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index 58522950133..11aa4964d42 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp @@ -50,7 +50,7 @@ class boss_flamegor : public CreatureScript { boss_flamegorAI(Creature* creature) : BossAI(creature, BOSS_FLAMEGOR) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && instance->GetBossState(BOSS_BROODLORD) != DONE) { @@ -64,7 +64,7 @@ class boss_flamegor : public CreatureScript events.ScheduleEvent(EVENT_FRENZY, 10000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class boss_flamegor : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_flamegorAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index c9e1882702a..d66edbc7f7e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -170,7 +170,7 @@ class boss_victor_nefarius : public CreatureScript { boss_victor_nefariusAI(Creature* creature) : BossAI(creature, BOSS_NEFARIAN) { } - void Reset() OVERRIDE + void Reset() override { if (me->GetMapId() == 469) { @@ -187,7 +187,7 @@ class boss_victor_nefarius : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { Reset(); } @@ -209,7 +209,7 @@ class boss_victor_nefarius : public CreatureScript events.ScheduleEvent(EVENT_SPAWN_ADD, 10000); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override { if (summon->GetEntry() != NPC_NEFARIAN) { @@ -220,9 +220,9 @@ class boss_victor_nefarius : public CreatureScript } } - void JustSummoned(Creature* /*summon*/) OVERRIDE { } + void JustSummoned(Creature* /*summon*/) override { } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (instance && type == 1 && data == 1) { @@ -236,7 +236,7 @@ class boss_victor_nefarius : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -362,7 +362,7 @@ class boss_victor_nefarius : public CreatureScript } } - void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 sender, uint32 action) override { if (sender == GOSSIP_ID && action == GOSSIP_OPTION_ID) { @@ -376,7 +376,7 @@ class boss_victor_nefarius : public CreatureScript uint32 SpawnedAdds; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_victor_nefariusAI(creature); } @@ -391,19 +391,19 @@ class boss_nefarian : public CreatureScript { boss_nefarianAI(Creature* creature) : BossAI(creature, BOSS_NEFARIAN) { } - void Reset() OVERRIDE + void Reset() override { Phase3 = false; canDespawn = false; DespawnTimer = 30000; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { canDespawn = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SHADOWFLAME, 12000); events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000)); @@ -414,13 +414,13 @@ class boss_nefarian : public CreatureScript Talk(SAY_RANDOM); } - void JustDied(Unit* /*Killer*/) OVERRIDE + void JustDied(Unit* /*Killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (rand()%5) return; @@ -428,7 +428,7 @@ class boss_nefarian : public CreatureScript Talk(SAY_SLAY, victim); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -441,7 +441,7 @@ class boss_nefarian : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (canDespawn && DespawnTimer <= diff) { @@ -571,7 +571,7 @@ class boss_nefarian : public CreatureScript bool Phase3; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nefarianAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index 2d5343d5914..c6c729d9a4b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -72,7 +72,7 @@ class boss_razorgore : public CreatureScript { boss_razorgoreAI(Creature* creature) : BossAI(creature, BOSS_RAZORGORE) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -81,7 +81,7 @@ class boss_razorgore : public CreatureScript instance->SetData(DATA_EGG_EVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -102,19 +102,19 @@ class boss_razorgore : public CreatureScript me->SetHealth(me->GetMaxHealth()); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_PHASE_TWO) DoChangePhase(); } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { if (!secondPhase) damage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -156,7 +156,7 @@ class boss_razorgore : public CreatureScript bool secondPhase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_razorgoreAI(creature); } @@ -167,7 +167,7 @@ class go_orb_of_domination : public GameObjectScript public: go_orb_of_domination() : GameObjectScript("go_orb_of_domination") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetData(DATA_EGG_EVENT) != DONE) @@ -195,13 +195,13 @@ class spell_egg_event : public SpellScriptLoader instance->SetData(DATA_EGG_EVENT, SPECIAL); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_egg_eventSpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_egg_eventSpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index be9c2a7cb17..9c79087af09 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -77,7 +77,7 @@ class boss_vaelastrasz : public CreatureScript creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -87,7 +87,7 @@ class boss_vaelastrasz : public CreatureScript HasYelled = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -111,7 +111,7 @@ class boss_vaelastrasz : public CreatureScript events.ScheduleEvent(EVENT_SPEECH_1, 1000); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (rand()%5) return; @@ -119,7 +119,7 @@ class boss_vaelastrasz : public CreatureScript Talk(SAY_KILLTARGET, victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -218,7 +218,7 @@ class boss_vaelastrasz : public CreatureScript DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 sender, uint32 action) override { if (sender == GOSSIP_ID && action == 0) { @@ -232,7 +232,7 @@ class boss_vaelastrasz : public CreatureScript bool HasYelled; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vaelAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index bcba2500f51..ed75d333fba 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -62,7 +62,7 @@ class instance_blackwing_lair : public InstanceMapScript SetBossNumber(EncounterCount); } - void Initialize() OVERRIDE + void Initialize() override { // Razorgore EggCount = 0; @@ -88,7 +88,7 @@ class instance_blackwing_lair : public InstanceMapScript NefarianGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -129,7 +129,7 @@ class instance_blackwing_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -162,13 +162,13 @@ class instance_blackwing_lair : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { if (go->GetEntry() == 177807) // Egg EggList.remove(go->GetGUID()); } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -218,7 +218,7 @@ class instance_blackwing_lair : public InstanceMapScript return true; } - uint64 GetData64(uint32 id) const OVERRIDE + uint64 GetData64(uint32 id) const override { switch (id) { @@ -236,7 +236,7 @@ class instance_blackwing_lair : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_EGG_EVENT) { @@ -271,14 +271,14 @@ class instance_blackwing_lair : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { //! HACK, needed because of buggy CreatureAI after charm if (unit->GetEntry() == NPC_RAZORGORE && GetBossState(BOSS_RAZORGORE) != DONE) SetBossState(BOSS_RAZORGORE, DONE); } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (_events.Empty()) return; @@ -346,7 +346,7 @@ class instance_blackwing_lair : public InstanceMapScript uint64 NefarianGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blackwing_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index 7d5b3eb9453..4b059ffeed4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -61,7 +61,7 @@ class boss_baron_geddon : public CreatureScript { } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_INFERNO, 45000); @@ -69,7 +69,7 @@ class boss_baron_geddon : public CreatureScript events.ScheduleEvent(EVENT_LIVING_BOMB, 35000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -115,7 +115,7 @@ class boss_baron_geddon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_baron_geddonAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index aa66f207b5e..7d9e11a3020 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -59,14 +59,14 @@ class boss_garr : public CreatureScript { } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25000); events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -97,7 +97,7 @@ class boss_garr : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_garrAI(creature); } @@ -114,12 +114,12 @@ class npc_firesworn : public CreatureScript uint32 immolateTimer; - void Reset() OVERRIDE + void Reset() override { immolateTimer = 4000; //These times are probably wrong } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { uint32 const health10pct = me->CountPctFromMaxHealth(10); uint32 health = me->GetHealth(); @@ -131,7 +131,7 @@ class npc_firesworn : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -149,7 +149,7 @@ class npc_firesworn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fireswornAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index dc18c5b63ca..ca7aa6b9cd1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -55,7 +55,7 @@ class boss_gehennas : public CreatureScript { } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000); @@ -63,7 +63,7 @@ class boss_gehennas : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class boss_gehennas : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gehennasAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp index e949e03351c..7e89f182b0d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -65,19 +65,19 @@ class boss_golemagg : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { BossAI::Reset(); DoCast(me, SPELL_MAGMASPLASH, true); } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_PYROBLAST, 7000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!HealthBelowPct(10) || me->HasAura(SPELL_ENRAGE)) return; @@ -86,7 +86,7 @@ class boss_golemagg : public CreatureScript events.ScheduleEvent(EVENT_EARTHQUAKE, 3000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -118,7 +118,7 @@ class boss_golemagg : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_golemaggAI(creature); } @@ -136,12 +136,12 @@ class npc_core_rager : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { mangleTimer = 7*IN_MILLISECONDS; // These times are probably wrong } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (HealthAbovePct(50) || !instance) return; @@ -157,7 +157,7 @@ class npc_core_rager : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -179,7 +179,7 @@ class npc_core_rager : public CreatureScript uint32 mangleTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_core_ragerAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp index 1cc0aa048c2..cba66d071bb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp @@ -55,7 +55,7 @@ class boss_lucifron : public CreatureScript { } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10000); @@ -63,7 +63,7 @@ class boss_lucifron : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_lucifron : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lucifronAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 6def498d544..427ea45834d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -61,13 +61,13 @@ class boss_magmadar : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { BossAI::Reset(); DoCast(me, SPELL_MAGMA_SPIT, true); } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_FRENZY, 30000); @@ -75,7 +75,7 @@ class boss_magmadar : public CreatureScript events.ScheduleEvent(EVENT_LAVA_BOMB, 12000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -112,7 +112,7 @@ class boss_magmadar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_magmadarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index 3d930228d19..557acff8bd1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -80,13 +80,13 @@ class boss_majordomo : public CreatureScript { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (urand(0, 99) < 25) Talk(SAY_SLAY); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { BossAI::EnterCombat(who); Talk(SAY_AGGRO); @@ -96,7 +96,7 @@ class boss_majordomo : public CreatureScript events.ScheduleEvent(EVENT_TELEPORT, 20000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance && instance->GetBossState(BOSS_MAJORDOMO_EXECUTUS) != DONE) { @@ -176,7 +176,7 @@ class boss_majordomo : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_START_RAGNAROS) { @@ -193,21 +193,21 @@ class boss_majordomo : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(GOSSIP_HELLO, creature->GetGUID()); return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); creature->AI()->DoAction(ACTION_START_RAGNAROS); return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_majordomoAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index 56c5f9d49c4..e4bf78c239f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -89,7 +89,7 @@ class boss_ragnaros : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void Reset() OVERRIDE + void Reset() override { BossAI::Reset(); _emergeTimer = 90000; @@ -99,7 +99,7 @@ class boss_ragnaros : public CreatureScript me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, 0); } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_ERUPTION, 15000); @@ -111,13 +111,13 @@ class boss_ragnaros : public CreatureScript events.ScheduleEvent(EVENT_SUBMERGE, 180000); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (urand(0, 99) < 25) Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_introState != 2) { @@ -305,7 +305,7 @@ class boss_ragnaros : public CreatureScript bool _isBanished; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ragnarosAI(creature); } @@ -323,13 +323,13 @@ class npc_son_of_flame : public CreatureScript instance = me->GetInstanceScript(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_RAGNAROS_ADDS, 1); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -341,7 +341,7 @@ class npc_son_of_flame : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_son_of_flameAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index d48eced9092..4273d8773e6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -58,7 +58,7 @@ class boss_shazzrah : public CreatureScript { } - void EnterCombat(Unit* target) OVERRIDE + void EnterCombat(Unit* target) override { BossAI::EnterCombat(target); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6000); @@ -68,7 +68,7 @@ class boss_shazzrah : public CreatureScript events.ScheduleEvent(EVENT_BLINK, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -119,7 +119,7 @@ class boss_shazzrah : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shazzrahAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index 8d161eeb3bc..5e01978a979 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -69,7 +69,7 @@ class boss_sulfuron : public CreatureScript { } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_DARK_STRIKE, 10000); @@ -79,7 +79,7 @@ class boss_sulfuron : public CreatureScript events.ScheduleEvent(EVENT_FLAMESPEAR, 2000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -129,7 +129,7 @@ class boss_sulfuron : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sulfuronAI(creature); } @@ -146,17 +146,17 @@ class npc_flamewaker_priest : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { events.Reset(); } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { ScriptedAI::EnterCombat(victim); events.ScheduleEvent(EVENT_HEAL, urand(15000, 30000)); @@ -164,7 +164,7 @@ class npc_flamewaker_priest : public CreatureScript events.ScheduleEvent(EVENT_IMMOLATE, 8000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -205,7 +205,7 @@ class npc_flamewaker_priest : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_flamewaker_priestAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp index af10da2d6b7..b2f0b93de0d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -71,7 +71,7 @@ class instance_molten_core : public InstanceMapScript delete _executusSchedule; } - void OnPlayerEnter(Player* /*player*/) OVERRIDE + void OnPlayerEnter(Player* /*player*/) override { if (_executusSchedule) { @@ -81,7 +81,7 @@ class instance_molten_core : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -96,7 +96,7 @@ class instance_molten_core : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -108,7 +108,7 @@ class instance_molten_core : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_RAGNAROS_ADDS) { @@ -119,7 +119,7 @@ class instance_molten_core : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -130,7 +130,7 @@ class instance_molten_core : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -143,7 +143,7 @@ class instance_molten_core : public InstanceMapScript return 0; } - bool SetBossState(uint32 bossId, EncounterState state) OVERRIDE + bool SetBossState(uint32 bossId, EncounterState state) override { if (!InstanceScript::SetBossState(bossId, state)) return false; @@ -185,7 +185,7 @@ class instance_molten_core : public InstanceMapScript summon->AI()->DoAction(ACTION_START_RAGNAROS_ALT); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -196,7 +196,7 @@ class instance_molten_core : public InstanceMapScript return saveStream.str(); } - void Load(char const* data) OVERRIDE + void Load(char const* data) override { if (!data) { @@ -254,7 +254,7 @@ class instance_molten_core : public InstanceMapScript bool _summonedExecutus; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_molten_core_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index ab5d8bf57f9..fd19e25496b 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -91,12 +91,12 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript public: npc_blastmaster_emi_shortfuse() : CreatureScript("npc_blastmaster_emi_shortfuse") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blastmaster_emi_shortfuseAI(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -112,7 +112,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); @@ -141,7 +141,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript std::list SummonList; std::list GoSummonList; - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -267,7 +267,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { //just in case if (GetPlayerForEscort()) @@ -311,7 +311,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript } } - void SetData(uint32 uiI, uint32 uiValue) OVERRIDE + void SetData(uint32 uiI, uint32 uiValue) override { switch (uiI) { @@ -411,7 +411,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript } } - void UpdateEscortAI(const uint32 uiDiff) OVERRIDE + void UpdateEscortAI(const uint32 uiDiff) override { if (uiPhase) { @@ -540,7 +540,7 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { SummonList.push_back(summon->GetGUID()); AggroAllPlayers(summon); @@ -553,7 +553,7 @@ class boss_grubbis : public CreatureScript public: boss_grubbis() : CreatureScript("boss_grubbis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_grubbisAI(creature); } @@ -575,7 +575,7 @@ class boss_grubbis : public CreatureScript creature->AI()->SetData(2, 1); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -583,7 +583,7 @@ class boss_grubbis : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!me->IsSummon()) return; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index aa98644b057..f5ac0466015 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -30,7 +30,7 @@ class instance_gnomeregan : public InstanceMapScript public: instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", 90) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_gnomeregan_InstanceMapScript(map); } @@ -48,7 +48,7 @@ class instance_gnomeregan : public InstanceMapScript uint64 uiBastmasterEmiShortfuseGUID; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -58,7 +58,7 @@ class instance_gnomeregan : public InstanceMapScript uiBastmasterEmiShortfuseGUID = 0; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -80,7 +80,7 @@ class instance_gnomeregan : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -88,7 +88,7 @@ class instance_gnomeregan : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -105,7 +105,7 @@ class instance_gnomeregan : public InstanceMapScript } } - void SetData(uint32 uiType, uint32 uiData) OVERRIDE + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -117,7 +117,7 @@ class instance_gnomeregan : public InstanceMapScript } } - uint32 GetData(uint32 uiType) const OVERRIDE + uint32 GetData(uint32 uiType) const override { switch (uiType) { @@ -126,7 +126,7 @@ class instance_gnomeregan : public InstanceMapScript return 0; } - uint64 GetData64(uint32 uiType) const OVERRIDE + uint64 GetData64(uint32 uiType) const override { switch (uiType) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index b26afcc596f..9d78662b468 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -55,7 +55,7 @@ class boss_curator : public CreatureScript public: boss_curator() : CreatureScript("boss_curator") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_curatorAI(creature); } @@ -71,7 +71,7 @@ class boss_curator : public CreatureScript bool Enraged; bool Evocating; - void Reset() OVERRIDE + void Reset() override { AddTimer = 10000; HatefulBoltTimer = 15000; //This time may be wrong @@ -82,22 +82,22 @@ class boss_curator : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 489a61b13fb..f383c9dcc33 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -47,7 +47,7 @@ class boss_maiden_of_virtue : public CreatureScript public: boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_maiden_of_virtueAI(creature); } @@ -64,7 +64,7 @@ class boss_maiden_of_virtue : public CreatureScript bool Enraged; - void Reset() OVERRIDE + void Reset() override { Repentance_Timer = 25000+(rand()%15000); Holyfire_Timer = 8000+(rand()%17000); @@ -75,23 +75,23 @@ class boss_maiden_of_virtue : public CreatureScript Enraged = false; } - void KilledUnit(Unit* /*Victim*/) OVERRIDE + void KilledUnit(Unit* /*Victim*/) override { if (urand(0, 1) == 0) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 0eb76304955..87089d78eea 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -55,7 +55,7 @@ class boss_attumen : public CreatureScript public: boss_attumen() : CreatureScript("boss_attumen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_attumenAI(creature); } @@ -81,34 +81,34 @@ class boss_attumen : public CreatureScript uint32 ChargeTimer; //only when mounted uint32 ResetTimer; - void Reset() OVERRIDE + void Reset() override { ResetTimer = 0; } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); ResetTimer = 2000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); if (Unit* midnight = Unit::GetUnit(*me, Midnight)) midnight->Kill(midnight); } - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; - void SpellHit(Unit* /*source*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*source*/, const SpellInfo* spell) override { if (spell->Mechanic == MECHANIC_DISARM) Talk(SAY_DISARMED); @@ -121,7 +121,7 @@ class boss_midnight : public CreatureScript public: boss_midnight() : CreatureScript("boss_midnight") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_midnightAI(creature); } @@ -134,7 +134,7 @@ class boss_midnight : public CreatureScript uint8 Phase; uint32 Mount_Timer; - void Reset() OVERRIDE + void Reset() override { Phase = 1; Attumen = 0; @@ -144,9 +144,9 @@ class boss_midnight : public CreatureScript me->SetVisible(true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (Phase == 2) { @@ -155,7 +155,7 @@ class boss_midnight : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 38fa77ee660..aa21858154a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -98,7 +98,7 @@ class boss_moroes : public CreatureScript public: boss_moroes() : CreatureScript("boss_moroes") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_moroesAI(creature); } @@ -127,7 +127,7 @@ class boss_moroes : public CreatureScript bool InVanish; bool Enrage; - void Reset() OVERRIDE + void Reset() override { Vanish_Timer = 30000; Blind_Timer = 35000; @@ -152,7 +152,7 @@ class boss_moroes : public CreatureScript DoZoneInCombat(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { StartEvent(); @@ -161,12 +161,12 @@ class boss_moroes : public CreatureScript DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -253,7 +253,7 @@ class boss_moroes : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -349,7 +349,7 @@ struct boss_moroes_guestAI : public ScriptedAI instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetData(TYPE_MOROES, NOT_STARTED); @@ -379,7 +379,7 @@ struct boss_moroes_guestAI : public ScriptedAI return me; } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (instance && !instance->GetData(TYPE_MOROES)) EnterEvadeMode(); @@ -393,7 +393,7 @@ class boss_baroness_dorothea_millstipe : public CreatureScript public: boss_baroness_dorothea_millstipe() : CreatureScript("boss_baroness_dorothea_millstipe") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_baroness_dorothea_millstipeAI(creature); } @@ -407,7 +407,7 @@ class boss_baroness_dorothea_millstipe : public CreatureScript uint32 MindFlay_Timer; uint32 ShadowWordPain_Timer; - void Reset() OVERRIDE + void Reset() override { ManaBurn_Timer = 7000; MindFlay_Timer = 1000; @@ -418,7 +418,7 @@ class boss_baroness_dorothea_millstipe : public CreatureScript boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -456,7 +456,7 @@ class boss_baron_rafe_dreuger : public CreatureScript public: boss_baron_rafe_dreuger() : CreatureScript("boss_baron_rafe_dreuger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_baron_rafe_dreugerAI(creature); } @@ -470,7 +470,7 @@ class boss_baron_rafe_dreuger : public CreatureScript uint32 SealOfCommand_Timer; uint32 JudgementOfCommand_Timer; - void Reset() OVERRIDE + void Reset() override { HammerOfJustice_Timer = 1000; SealOfCommand_Timer = 7000; @@ -479,7 +479,7 @@ class boss_baron_rafe_dreuger : public CreatureScript boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -513,7 +513,7 @@ class boss_lady_catriona_von_indi : public CreatureScript public: boss_lady_catriona_von_indi() : CreatureScript("boss_lady_catriona_von_indi") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lady_catriona_von_indiAI(creature); } @@ -528,7 +528,7 @@ class boss_lady_catriona_von_indi : public CreatureScript uint32 HolyFire_Timer; uint32 PowerWordShield_Timer; - void Reset() OVERRIDE + void Reset() override { DispelMagic_Timer = 11000; GreaterHeal_Timer = 1500; @@ -540,7 +540,7 @@ class boss_lady_catriona_von_indi : public CreatureScript boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -583,7 +583,7 @@ class boss_lady_keira_berrybuck : public CreatureScript public: boss_lady_keira_berrybuck() : CreatureScript("boss_lady_keira_berrybuck") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lady_keira_berrybuckAI(creature); } @@ -598,7 +598,7 @@ class boss_lady_keira_berrybuck : public CreatureScript uint32 HolyLight_Timer; uint32 DivineShield_Timer; - void Reset() OVERRIDE + void Reset() override { Cleanse_Timer = 13000; GreaterBless_Timer = 1000; @@ -610,7 +610,7 @@ class boss_lady_keira_berrybuck : public CreatureScript boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -657,7 +657,7 @@ class boss_lord_robin_daris : public CreatureScript public: boss_lord_robin_daris() : CreatureScript("boss_lord_robin_daris") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lord_robin_darisAI(creature); } @@ -671,7 +671,7 @@ class boss_lord_robin_daris : public CreatureScript uint32 MortalStrike_Timer; uint32 WhirlWind_Timer; - void Reset() OVERRIDE + void Reset() override { Hamstring_Timer = 7000; MortalStrike_Timer = 10000; @@ -680,7 +680,7 @@ class boss_lord_robin_daris : public CreatureScript boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -713,7 +713,7 @@ class boss_lord_crispin_ference : public CreatureScript public: boss_lord_crispin_ference() : CreatureScript("boss_lord_crispin_ference") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lord_crispin_ferenceAI(creature); } @@ -728,7 +728,7 @@ class boss_lord_crispin_ference : public CreatureScript uint32 ShieldBash_Timer; uint32 ShieldWall_Timer; - void Reset() OVERRIDE + void Reset() override { Disarm_Timer = 6000; HeroicStrike_Timer = 10000; @@ -738,7 +738,7 @@ class boss_lord_crispin_ference : public CreatureScript boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 0ef2d93de62..bc064cb391a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -71,7 +71,7 @@ class boss_netherspite : public CreatureScript public: boss_netherspite() : CreatureScript("boss_netherspite") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_netherspiteAI(creature); } @@ -129,7 +129,7 @@ class boss_netherspite : public CreatureScript return sqrt((xa-xb)*(xa-xb) + (ya-yb)*(ya-yb)); } - void Reset() OVERRIDE + void Reset() override { Berserk = false; NetherInfusionTimer = 540000; @@ -259,19 +259,19 @@ class boss_netherspite : public CreatureScript Door->SetGoState(open ? GOState::GO_STATE_ACTIVE : GOState::GO_STATE_READY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { HandleDoors(false); SwitchToPortalPhase(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { HandleDoors(true); DestroyPortals(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index ba2a360b349..6aef1d56e1f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -71,7 +71,7 @@ class boss_nightbane : public CreatureScript public: boss_nightbane() : CreatureScript("boss_nightbane") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nightbaneAI(creature); } @@ -111,7 +111,7 @@ class boss_nightbane : public CreatureScript uint32 WaitTimer; uint32 MovePhase; - void Reset() OVERRIDE + void Reset() override { BellowingRoarTimer = 30000; CharredEarthTimer = 15000; @@ -162,7 +162,7 @@ class boss_nightbane : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); @@ -171,13 +171,13 @@ class boss_nightbane : public CreatureScript Talk(YELL_AGGRO); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!Intro && !Flying) ScriptedAI::AttackStart(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_NIGHTBANE, DONE); @@ -185,14 +185,14 @@ class boss_nightbane : public CreatureScript HandleTerraceDoors(true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro && !Flying) ScriptedAI::MoveInLineOfSight(who); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -238,7 +238,7 @@ class boss_nightbane : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me->GetVictim()); } @@ -263,7 +263,7 @@ class boss_nightbane : public CreatureScript Skeletons = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { /* The timer for this was never setup apparently, not sure if the code works properly: if (WaitTimer <= diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 72a06e3a6f7..ae8b4f9893a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -104,7 +104,7 @@ class netherspite_infernal : public CreatureScript public: netherspite_infernal() : CreatureScript("netherspite_infernal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new netherspite_infernalAI(creature); } @@ -119,12 +119,12 @@ class netherspite_infernal : public CreatureScript uint64 malchezaar; InfernalPoint *point; - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (HellfireTimer) { @@ -146,14 +146,14 @@ class netherspite_infernal : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (Unit* unit = Unit::GetUnit(*me, malchezaar)) if (Creature* creature = unit->ToCreature()) creature->AI()->KilledUnit(who); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*who*/, const SpellInfo* spell) override { if (spell->Id == SPELL_INFERNAL_RELAY) { @@ -164,7 +164,7 @@ class netherspite_infernal : public CreatureScript } } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != malchezaar) damage = 0; @@ -179,7 +179,7 @@ class boss_malchezaar : public CreatureScript public: boss_malchezaar() : CreatureScript("boss_malchezaar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_malchezaarAI(creature); } @@ -213,7 +213,7 @@ class boss_malchezaar : public CreatureScript uint32 phase; - void Reset() OVERRIDE + void Reset() override { AxesCleanup(); ClearWeapons(); @@ -245,12 +245,12 @@ class boss_malchezaar : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -266,7 +266,7 @@ class boss_malchezaar : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -387,7 +387,7 @@ class boss_malchezaar : public CreatureScript Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 3d92a122005..376bc40bf3d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -86,7 +86,7 @@ class boss_shade_of_aran : public CreatureScript public: boss_shade_of_aran() : CreatureScript("boss_shade_of_aran") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_aranAI(creature); } @@ -125,7 +125,7 @@ class boss_shade_of_aran : public CreatureScript bool Drinking; bool DrinkInturrupted; - void Reset() OVERRIDE + void Reset() override { SecondarySpellTimer = 5000; NormalCastTimer = 0; @@ -157,12 +157,12 @@ class boss_shade_of_aran : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -173,7 +173,7 @@ class boss_shade_of_aran : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -219,7 +219,7 @@ class boss_shade_of_aran : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -480,13 +480,13 @@ class boss_shade_of_aran : public CreatureScript DoMeleeAttackIfReady(); } - void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) override { if (!DrinkInturrupted && Drinking && damage) DrinkInturrupted = true; } - void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell) override { //We only care about interrupt effects and only if they are durring a spell currently being casted if ((Spell->Effects[0].Effect != SPELL_EFFECT_INTERRUPT_CAST && @@ -515,7 +515,7 @@ class npc_aran_elemental : public CreatureScript public: npc_aran_elemental() : CreatureScript("npc_aran_elemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new water_elementalAI(creature); } @@ -526,14 +526,14 @@ class npc_aran_elemental : public CreatureScript uint32 CastTimer; - void Reset() OVERRIDE + void Reset() override { CastTimer = 2000 + (rand()%3000); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index ab82bf7d15f..c2c9d4e7059 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -71,7 +71,7 @@ class npc_kilrek : public CreatureScript public: npc_kilrek() : CreatureScript("npc_kilrek") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kilrekAI(creature); } @@ -89,13 +89,13 @@ class npc_kilrek : public CreatureScript uint32 AmplifyTimer; - void Reset() OVERRIDE + void Reset() override { TerestianGUID = 0; AmplifyTimer = 2000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!instance) { @@ -104,7 +104,7 @@ class npc_kilrek : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -118,7 +118,7 @@ class npc_kilrek : public CreatureScript } else ERROR_INST_DATA(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -142,7 +142,7 @@ class npc_demon_chain : public CreatureScript public: npc_demon_chain() : CreatureScript("npc_demon_chain") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_demon_chainAI(creature); } @@ -153,17 +153,17 @@ class npc_demon_chain : public CreatureScript uint64 SacrificeGUID; - void Reset() OVERRIDE + void Reset() override { SacrificeGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (SacrificeGUID) { @@ -180,7 +180,7 @@ class npc_fiendish_portal : public CreatureScript public: npc_fiendish_portal() : CreatureScript("npc_fiendish_portal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fiendish_portalAI(creature); } @@ -191,12 +191,12 @@ class npc_fiendish_portal : public CreatureScript SummonList summons; - void Reset() OVERRIDE + void Reset() override { DespawnAllImp(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); DoZoneInCombat(summon); @@ -214,7 +214,7 @@ class npc_fiendish_imp : public CreatureScript public: npc_fiendish_imp() : CreatureScript("npc_fiendish_imp") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fiendish_impAI(creature); } @@ -225,16 +225,16 @@ class npc_fiendish_imp : public CreatureScript uint32 FireboltTimer; - void Reset() OVERRIDE + void Reset() override { FireboltTimer = 2000; me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -256,7 +256,7 @@ class boss_terestian_illhoof : public CreatureScript public: boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_terestianAI(creature); } @@ -283,7 +283,7 @@ class boss_terestian_illhoof : public CreatureScript bool SummonedPortals; bool Berserk; - void Reset() OVERRIDE + void Reset() override { for (uint8 i = 0; i < 2; ++i) { @@ -324,12 +324,12 @@ class boss_terestian_illhoof : public CreatureScript else DoCast(me, SPELL_SUMMON_IMP, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_PORTAL) { @@ -344,12 +344,12 @@ class boss_terestian_illhoof : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (uint8 i = 0; i < 2; ++i) { @@ -368,7 +368,7 @@ class boss_terestian_illhoof : public CreatureScript instance->SetData(TYPE_TERESTIAN, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 2e981c1a381..32bbbd7d2c6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -118,7 +118,7 @@ class boss_dorothee : public CreatureScript public: boss_dorothee() : CreatureScript("boss_dorothee") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_dorotheeAI(creature); } @@ -141,7 +141,7 @@ class boss_dorothee : public CreatureScript bool SummonedTito; bool TitoDied; - void Reset() OVERRIDE + void Reset() override { AggroTimer = 500; @@ -153,19 +153,19 @@ class boss_dorothee : public CreatureScript TitoDied = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_DOROTHEE_AGGRO); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } void SummonTito(); - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DOROTHEE_DEATH); @@ -173,7 +173,7 @@ class boss_dorothee : public CreatureScript SummonCroneIfReady(instance, me); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -181,7 +181,7 @@ class boss_dorothee : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -190,7 +190,7 @@ class boss_dorothee : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AggroTimer) { @@ -233,7 +233,7 @@ class npc_tito : public CreatureScript public: npc_tito() : CreatureScript("npc_tito") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_titoAI(creature); } @@ -245,15 +245,15 @@ class npc_tito : public CreatureScript uint64 DorotheeGUID; uint32 YipTimer; - void Reset() OVERRIDE + void Reset() override { DorotheeGUID = 0; YipTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (DorotheeGUID) { @@ -266,7 +266,7 @@ class npc_tito : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -299,7 +299,7 @@ class boss_strawman : public CreatureScript public: boss_strawman() : CreatureScript("boss_strawman") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_strawmanAI(creature); } @@ -317,14 +317,14 @@ class boss_strawman : public CreatureScript uint32 BrainBashTimer; uint32 BrainWipeTimer; - void Reset() OVERRIDE + void Reset() override { AggroTimer = 13000; BrainBashTimer = 5000; BrainWipeTimer = 7000; } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -332,7 +332,7 @@ class boss_strawman : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -341,17 +341,17 @@ class boss_strawman : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_STRAWMAN_AGGRO); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override { if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10))) { @@ -364,7 +364,7 @@ class boss_strawman : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_STRAWMAN_DEATH); @@ -372,12 +372,12 @@ class boss_strawman : public CreatureScript SummonCroneIfReady(instance, me); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_STRAWMAN_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AggroTimer) { @@ -414,7 +414,7 @@ class boss_tinhead : public CreatureScript public: boss_tinhead() : CreatureScript("boss_tinhead") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_tinheadAI(creature); } @@ -434,7 +434,7 @@ class boss_tinhead : public CreatureScript uint8 RustCount; - void Reset() OVERRIDE + void Reset() override { AggroTimer = 15000; CleaveTimer = 5000; @@ -443,17 +443,17 @@ class boss_tinhead : public CreatureScript RustCount = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_TINHEAD_AGGRO); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -461,7 +461,7 @@ class boss_tinhead : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -470,7 +470,7 @@ class boss_tinhead : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_TINHEAD_DEATH); @@ -478,12 +478,12 @@ class boss_tinhead : public CreatureScript SummonCroneIfReady(instance, me); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_TINHEAD_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AggroTimer) { @@ -524,7 +524,7 @@ class boss_roar : public CreatureScript public: boss_roar() : CreatureScript("boss_roar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_roarAI(creature); } @@ -543,7 +543,7 @@ class boss_roar : public CreatureScript uint32 ShredTimer; uint32 ScreamTimer; - void Reset() OVERRIDE + void Reset() override { AggroTimer = 20000; MangleTimer = 5000; @@ -551,7 +551,7 @@ class boss_roar : public CreatureScript ScreamTimer = 15000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -560,7 +560,7 @@ class boss_roar : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -568,17 +568,17 @@ class boss_roar : public CreatureScript ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_ROAR_AGGRO); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_ROAR_DEATH); @@ -586,12 +586,12 @@ class boss_roar : public CreatureScript SummonCroneIfReady(instance, me); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ROAR_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AggroTimer) { @@ -633,7 +633,7 @@ class boss_crone : public CreatureScript public: boss_crone() : CreatureScript("boss_crone") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_croneAI(creature); } @@ -650,30 +650,30 @@ class boss_crone : public CreatureScript uint32 CycloneTimer; uint32 ChainLightningTimer; - void Reset() OVERRIDE + void Reset() override { CycloneTimer = 30000; ChainLightningTimer = 10000; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_CRONE_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_CRONE_AGGRO); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_CRONE_DEATH); @@ -688,7 +688,7 @@ class boss_crone : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -719,7 +719,7 @@ class npc_cyclone : public CreatureScript public: npc_cyclone() : CreatureScript("npc_cyclone") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_cycloneAI(creature); } @@ -730,19 +730,19 @@ class npc_cyclone : public CreatureScript uint32 MoveTimer; - void Reset() OVERRIDE + void Reset() override { MoveTimer = 1000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->HasAura(SPELL_KNOCKBACK)) DoCast(me, SPELL_KNOCKBACK, true); @@ -785,7 +785,7 @@ class npc_grandmother : public CreatureScript public: npc_grandmother() : CreatureScript("npc_grandmother") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -799,7 +799,7 @@ class npc_grandmother : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->SEND_GOSSIP_MENU(8990, creature->GetGUID()); @@ -813,7 +813,7 @@ class boss_bigbadwolf : public CreatureScript public: boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_bigbadwolfAI(creature); } @@ -836,7 +836,7 @@ class boss_bigbadwolf : public CreatureScript bool IsChasing; - void Reset() OVERRIDE + void Reset() override { ChaseTimer = 30000; FearTimer = urand(25000, 35000); @@ -848,22 +848,22 @@ class boss_bigbadwolf : public CreatureScript IsChasing = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_WOLF_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_WOLF_SLAY); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoPlaySoundToSet(me, SOUND_WOLF_DEATH); @@ -878,7 +878,7 @@ class boss_bigbadwolf : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1015,7 +1015,7 @@ class boss_julianne : public CreatureScript public: boss_julianne() : CreatureScript("boss_julianne") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_julianneAI(creature); } @@ -1052,7 +1052,7 @@ class boss_julianne : public CreatureScript bool SummonedRomulo; bool RomuloDead; - void Reset() OVERRIDE + void Reset() override { RomuloGUID = 0; Phase = PHASE_JULIANNE; @@ -1075,9 +1075,9 @@ class boss_julianne : public CreatureScript RomuloDead = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1085,7 +1085,7 @@ class boss_julianne : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -1094,12 +1094,12 @@ class boss_julianne : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override { if (Spell->Id == SPELL_DRINK_POISON) { @@ -1108,9 +1108,9 @@ class boss_julianne : public CreatureScript } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE; + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_JULIANNE_DEATH02); @@ -1124,12 +1124,12 @@ class boss_julianne : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_JULIANNE_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; }; }; @@ -1138,7 +1138,7 @@ class boss_romulo : public CreatureScript public: boss_romulo() : CreatureScript("boss_romulo") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_romuloAI(creature); } @@ -1168,7 +1168,7 @@ class boss_romulo : public CreatureScript bool IsFakingDeath; bool JulianneDead; - void Reset() OVERRIDE + void Reset() override { JulianneGUID = 0; Phase = PHASE_ROMULO; @@ -1183,12 +1183,12 @@ class boss_romulo : public CreatureScript JulianneDead = false; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->DespawnOrUnsummon(); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage < me->GetHealth()) return; @@ -1242,7 +1242,7 @@ class boss_romulo : public CreatureScript SF_LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen."); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_ROMULO_AGGRO); if (JulianneGUID) @@ -1256,7 +1256,7 @@ class boss_romulo : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -1265,7 +1265,7 @@ class boss_romulo : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_ROMULO_DEATH); @@ -1280,12 +1280,12 @@ class boss_romulo : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ROMULO_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || IsFakingDeath) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 338278b2621..e4d18ad5c78 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -51,7 +51,7 @@ class instance_karazhan : public InstanceMapScript public: instance_karazhan() : InstanceMapScript("instance_karazhan", 532) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_karazhan_InstanceMapScript(map); } @@ -82,7 +82,7 @@ class instance_karazhan : public InstanceMapScript uint64 ImageGUID; uint64 DustCoveredChest; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -110,7 +110,7 @@ class instance_karazhan : public InstanceMapScript DustCoveredChest = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -119,7 +119,7 @@ class instance_karazhan : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -129,7 +129,7 @@ class instance_karazhan : public InstanceMapScript } } - void SetData(uint32 type, uint32 uiData) OVERRIDE + void SetData(uint32 type, uint32 uiData) override { switch (type) { @@ -184,7 +184,7 @@ class instance_karazhan : public InstanceMapScript } } - void SetData64(uint32 identifier, uint64 data) OVERRIDE + void SetData64(uint32 identifier, uint64 data) override { switch (identifier) { @@ -192,7 +192,7 @@ class instance_karazhan : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -238,12 +238,12 @@ class instance_karazhan : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { return strSaveData; } - uint32 GetData(uint32 uiData) const OVERRIDE + uint32 GetData(uint32 uiData) const override { switch (uiData) { @@ -266,7 +266,7 @@ class instance_karazhan : public InstanceMapScript return 0; } - uint64 GetData64(uint32 uiData) const OVERRIDE + uint64 GetData64(uint32 uiData) const override { switch (uiData) { @@ -290,7 +290,7 @@ class instance_karazhan : public InstanceMapScript return 0; } - void Load(char const* chrIn) OVERRIDE + void Load(char const* chrIn) override { if (!chrIn) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index bfdbac807ee..a5aba70dabc 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -150,7 +150,7 @@ class npc_barnes : public CreatureScript bool PerformanceReady; bool RaidWiped; - void Reset() OVERRIDE + void Reset() override { m_uiSpotlightGUID = 0; @@ -178,9 +178,9 @@ class npc_barnes : public CreatureScript Start(false, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (!instance) return; @@ -285,7 +285,7 @@ class npc_barnes : public CreatureScript RaidWiped = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -345,7 +345,7 @@ class npc_barnes : public CreatureScript } }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); @@ -380,7 +380,7 @@ class npc_barnes : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -412,7 +412,7 @@ class npc_barnes : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_barnesAI(creature); } @@ -429,7 +429,7 @@ class npc_berthold : public CreatureScript public: npc_berthold() : CreatureScript("npc_berthold") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -439,7 +439,7 @@ class npc_berthold : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -476,7 +476,7 @@ class npc_image_of_medivh : public CreatureScript public: npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_image_of_medivhAI(creature); } @@ -499,7 +499,7 @@ class npc_image_of_medivh : public CreatureScript bool EventStarted; - void Reset() OVERRIDE + void Reset() override { ArcanagosGUID = 0; @@ -514,9 +514,9 @@ class npc_image_of_medivh : public CreatureScript me->RemoveCorpse(); } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -622,7 +622,7 @@ class npc_image_of_medivh : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (YellTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index bd60ef61f53..6aa7a551d4e 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -96,7 +96,7 @@ class boss_felblood_kaelthas : public CreatureScript public: boss_felblood_kaelthas() : CreatureScript("boss_felblood_kaelthas") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new boss_felblood_kaelthasAI(c); } @@ -134,7 +134,7 @@ class boss_felblood_kaelthas : public CreatureScript // 1 = Fireball; Summon Phoenix; Flamestrike // 2 = Gravity Lapses - void Reset() OVERRIDE + void Reset() override { /// @todo Timers FireballTimer = 0; @@ -156,7 +156,7 @@ class boss_felblood_kaelthas : public CreatureScript instance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -170,13 +170,13 @@ class boss_felblood_kaelthas : public CreatureScript escapeOrb->RemoveFlag(GAMEOBJECT_FIELD_FLAGS, GO_FLAG_NOT_SELECTABLE); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage > me->GetHealth()) RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!instance) return; @@ -184,7 +184,7 @@ class boss_felblood_kaelthas : public CreatureScript instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f)) @@ -283,7 +283,7 @@ class boss_felblood_kaelthas : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -440,7 +440,7 @@ class npc_felkael_flamestrike : public CreatureScript public: npc_felkael_flamestrike() : CreatureScript("npc_felkael_flamestrike") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_felkael_flamestrikeAI(c); } @@ -453,7 +453,7 @@ class npc_felkael_flamestrike : public CreatureScript uint32 FlameStrikeTimer; - void Reset() OVERRIDE + void Reset() override { FlameStrikeTimer = 5000; @@ -463,10 +463,10 @@ class npc_felkael_flamestrike : public CreatureScript DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (FlameStrikeTimer <= diff) { @@ -482,7 +482,7 @@ class npc_felkael_phoenix : public CreatureScript public: npc_felkael_phoenix() : CreatureScript("npc_felkael_phoenix") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_felkael_phoenixAI(c); } @@ -500,7 +500,7 @@ class npc_felkael_phoenix : public CreatureScript bool Rebirth; bool FakeDeath; - void Reset() OVERRIDE + void Reset() override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); me->SetDisableGravity(true); @@ -511,9 +511,9 @@ class npc_felkael_phoenix : public CreatureScript FakeDeath = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (damage < me->GetHealth()) return; @@ -547,12 +547,12 @@ class npc_felkael_phoenix : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TempSummonType::TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //If we are fake death, we cast revbirth and after that we kill the phoenix to spawn the egg. if (FakeDeath) @@ -595,7 +595,7 @@ class npc_felkael_phoenix_egg : public CreatureScript public: npc_felkael_phoenix_egg() : CreatureScript("npc_felkael_phoenix_egg") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_felkael_phoenix_eggAI(c); } @@ -606,16 +606,16 @@ class npc_felkael_phoenix_egg : public CreatureScript uint32 HatchTimer; - void Reset() OVERRIDE + void Reset() override { HatchTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (HatchTimer <= diff) { @@ -631,7 +631,7 @@ class npc_arcane_sphere : public CreatureScript public: npc_arcane_sphere() : CreatureScript("npc_arcane_sphere") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_arcane_sphereAI(c); } @@ -643,7 +643,7 @@ class npc_arcane_sphere : public CreatureScript uint32 DespawnTimer; uint32 ChangeTargetTimer; - void Reset() OVERRIDE + void Reset() override { DespawnTimer = 30000; ChangeTargetTimer = urand(6000, 12000); @@ -654,9 +654,9 @@ class npc_arcane_sphere : public CreatureScript DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (DespawnTimer <= diff) me->Kill(me); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 1423e7ca74d..441d4e7b70d 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -110,7 +110,7 @@ class boss_priestess_delrissa : public CreatureScript public: boss_priestess_delrissa() : CreatureScript("boss_priestess_delrissa") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_priestess_delrissaAI(creature); } @@ -138,7 +138,7 @@ class boss_priestess_delrissa : public CreatureScript uint32 DispelTimer; uint32 ResetTimer; - void Reset() OVERRIDE + void Reset() override { PlayersKilled = 0; @@ -153,13 +153,13 @@ class boss_priestess_delrissa : public CreatureScript } //this mean she at some point evaded - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->SetData(DATA_DELRISSA_EVENT, FAIL); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_AGGRO); @@ -228,7 +228,7 @@ class boss_priestess_delrissa : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -239,7 +239,7 @@ class boss_priestess_delrissa : public CreatureScript ++PlayersKilled; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -255,7 +255,7 @@ class boss_priestess_delrissa : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -372,7 +372,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI bool UsedPotion; - void Reset() OVERRIDE + void Reset() override { UsedPotion = false; @@ -390,7 +390,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!who) return; @@ -420,7 +420,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!instance) return; @@ -452,7 +452,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (!instance) return; @@ -473,7 +473,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UsedPotion && HealthBelowPct(25)) { @@ -504,7 +504,7 @@ class boss_kagani_nightstrike : public CreatureScript public: boss_kagani_nightstrike() : CreatureScript("boss_kagani_nightstrike") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kagani_nightstrikeAI(creature); } @@ -521,7 +521,7 @@ class boss_kagani_nightstrike : public CreatureScript uint32 Wait_Timer; bool InVanish; - void Reset() OVERRIDE + void Reset() override { Gouge_Timer = 5500; Kick_Timer = 7000; @@ -534,7 +534,7 @@ class boss_kagani_nightstrike : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -608,7 +608,7 @@ class boss_ellris_duskhallow : public CreatureScript public: boss_ellris_duskhallow() : CreatureScript("boss_ellris_duskhallow") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ellris_duskhallowAI(creature); } @@ -624,7 +624,7 @@ class boss_ellris_duskhallow : public CreatureScript uint32 Curse_of_Agony_Timer; uint32 Fear_Timer; - void Reset() OVERRIDE + void Reset() override { Immolate_Timer = 6000; Shadow_Bolt_Timer = 3000; @@ -635,12 +635,12 @@ class boss_ellris_duskhallow : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_SUMMON_IMP); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -699,7 +699,7 @@ class boss_eramas_brightblaze : public CreatureScript public: boss_eramas_brightblaze() : CreatureScript("boss_eramas_brightblaze") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_eramas_brightblazeAI(creature); } @@ -712,7 +712,7 @@ class boss_eramas_brightblaze : public CreatureScript uint32 Knockdown_Timer; uint32 Snap_Kick_Timer; - void Reset() OVERRIDE + void Reset() override { Knockdown_Timer = 6000; Snap_Kick_Timer = 4500; @@ -720,7 +720,7 @@ class boss_eramas_brightblaze : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -760,7 +760,7 @@ class boss_yazzai : public CreatureScript public: boss_yazzai() : CreatureScript("boss_yazzai") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_yazzaiAI(creature); } @@ -781,7 +781,7 @@ class boss_yazzai : public CreatureScript uint32 Frostbolt_Timer; uint32 Blink_Timer; - void Reset() OVERRIDE + void Reset() override { HasIceBlocked = false; @@ -797,7 +797,7 @@ class boss_yazzai : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -890,7 +890,7 @@ class boss_warlord_salaris : public CreatureScript public: boss_warlord_salaris() : CreatureScript("boss_warlord_salaris") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warlord_salarisAI(creature); } @@ -907,7 +907,7 @@ class boss_warlord_salaris : public CreatureScript uint32 Hamstring_Timer; uint32 Mortal_Strike_Timer; - void Reset() OVERRIDE + void Reset() override { Intercept_Stun_Timer = 500; Disarm_Timer = 6000; @@ -919,12 +919,12 @@ class boss_warlord_salaris : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_BATTLE_SHOUT); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1010,7 +1010,7 @@ class boss_garaxxas : public CreatureScript public: boss_garaxxas() : CreatureScript("boss_garaxxas") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_garaxxasAI(creature); } @@ -1032,7 +1032,7 @@ class boss_garaxxas : public CreatureScript uint32 Wing_Clip_Timer; uint32 Freezing_Trap_Timer; - void Reset() OVERRIDE + void Reset() override { Aimed_Shot_Timer = 6000; Shoot_Timer = 2500; @@ -1048,12 +1048,12 @@ class boss_garaxxas : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { m_uiPetGUID = summoned->GetGUID(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1121,7 +1121,7 @@ class boss_apoko : public CreatureScript public: boss_apoko() : CreatureScript("boss_apoko") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_apokoAI(creature); } @@ -1138,7 +1138,7 @@ class boss_apoko : public CreatureScript uint32 Healing_Wave_Timer; uint32 Frost_Shock_Timer; - void Reset() OVERRIDE + void Reset() override { Totem_Timer = 2000; Totem_Amount = 1; @@ -1150,7 +1150,7 @@ class boss_apoko : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1219,7 +1219,7 @@ class boss_zelfan : public CreatureScript public: boss_zelfan() : CreatureScript("boss_zelfan") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_zelfanAI(creature); } @@ -1235,7 +1235,7 @@ class boss_zelfan : public CreatureScript uint32 High_Explosive_Sheep_Timer; uint32 Fel_Iron_Bomb_Timer; - void Reset() OVERRIDE + void Reset() override { Goblin_Dragon_Gun_Timer = 20000; Rocket_Launch_Timer = 7000; @@ -1246,7 +1246,7 @@ class boss_zelfan : public CreatureScript boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1304,7 +1304,7 @@ class npc_high_explosive_sheep : public CreatureScript public: npc_high_explosive_sheep() : CreatureScript("npc_high_explosive_sheep") { } - //CreatureAI* GetAI(Creature* creature) const OVERRIDE + //CreatureAI* GetAI(Creature* creature) const override //{ // return new npc_high_explosive_sheepAI(creature); //}; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 1bf992e3a79..1ec0aa1f07f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -66,7 +66,7 @@ class boss_selin_fireheart : public CreatureScript public: boss_selin_fireheart() : CreatureScript("boss_selin_fireheart") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_selin_fireheartAI(creature); }; @@ -107,7 +107,7 @@ class boss_selin_fireheart : public CreatureScript uint64 CrystalGUID; // This will help us create a pointer to the crystal we are draining. We store GUIDs, never units in case unit is deleted/offline (offline if player of course). - void Reset() OVERRIDE + void Reset() override { if (instance) { @@ -199,19 +199,19 @@ class boss_selin_fireheart : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_SELIN_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) { @@ -233,7 +233,7 @@ class boss_selin_fireheart : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -244,7 +244,7 @@ class boss_selin_fireheart : public CreatureScript ShatterRemainingCrystals(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -327,7 +327,7 @@ class npc_fel_crystal : public CreatureScript public: npc_fel_crystal() : CreatureScript("npc_fel_crystal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fel_crystalAI(creature); }; @@ -336,14 +336,14 @@ class npc_fel_crystal : public CreatureScript { npc_fel_crystalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index d50e288a210..2d1afe42cfa 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -75,7 +75,7 @@ class boss_vexallus : public CreatureScript public: boss_vexallus() : CreatureScript("boss_vexallus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vexallusAI(creature); }; @@ -95,7 +95,7 @@ class boss_vexallus : public CreatureScript uint32 IntervalHealthAmount; bool Enraged; - void Reset() OVERRIDE + void Reset() override { summons.DespawnAll(); ChainLightningTimer = 8000; @@ -108,19 +108,19 @@ class boss_vexallus : public CreatureScript instance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { summons.DespawnAll(); if (instance) instance->SetData(DATA_VEXALLUS_EVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -128,7 +128,7 @@ class boss_vexallus : public CreatureScript instance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); @@ -137,7 +137,7 @@ class boss_vexallus : public CreatureScript summoned->CastSpell(summoned, SPELL_ENERGY_BOLT, false, 0, 0, me->GetGUID()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ class npc_pure_energy : public CreatureScript public: npc_pure_energy() : CreatureScript("npc_pure_energy") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pure_energyAI(creature); }; @@ -223,9 +223,9 @@ class npc_pure_energy : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() OVERRIDE { } + void Reset() override { } - void JustDied(Unit* slayer) OVERRIDE + void JustDied(Unit* slayer) override { if (Unit* temp = me->GetOwner()) { @@ -234,10 +234,10 @@ class npc_pure_energy : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } }; }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index d3fe1a25d4d..914be4556b7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -83,7 +83,7 @@ class instance_magisters_terrace : public InstanceMapScript uint32 StatuesState; uint8 felCristalIndex; - void Initialize() OVERRIDE + void Initialize() override { memset(&Encounter, 0, sizeof(Encounter)); @@ -105,7 +105,7 @@ class instance_magisters_terrace : public InstanceMapScript felCristalIndex = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (Encounter[i] == IN_PROGRESS) @@ -113,7 +113,7 @@ class instance_magisters_terrace : public InstanceMapScript return false; } - uint32 GetData(uint32 identifier) const OVERRIDE + uint32 GetData(uint32 identifier) const override { switch (identifier) { @@ -133,7 +133,7 @@ class instance_magisters_terrace : public InstanceMapScript return 0; } - void SetData(uint32 identifier, uint32 data) OVERRIDE + void SetData(uint32 identifier, uint32 data) override { switch (identifier) { @@ -185,7 +185,7 @@ class instance_magisters_terrace : public InstanceMapScript SaveToDB(); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -201,7 +201,7 @@ class instance_magisters_terrace : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -232,7 +232,7 @@ class instance_magisters_terrace : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -243,7 +243,7 @@ class instance_magisters_terrace : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -270,7 +270,7 @@ class instance_magisters_terrace : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -302,14 +302,14 @@ class instance_magisters_terrace : public InstanceMapScript return 0; } - void SetData64(uint32 identifier, uint64 value) OVERRIDE + void SetData64(uint32 identifier, uint64 value) override { if (identifier == DATA_FEL_CRYSTAL) felCristalIndex = value; } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_magisters_terrace_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 75576be0d91..06b86d42364 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -70,7 +70,7 @@ class npc_kalecgos : public CreatureScript public: npc_kalecgos() : CreatureScript("npc_kalecgos") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -99,7 +99,7 @@ class npc_kalecgos : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -110,7 +110,7 @@ class npc_kalecgos : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kalecgosAI(creature); } @@ -121,7 +121,7 @@ class npc_kalecgos : public CreatureScript uint32 m_uiTransformTimer; - void Reset() OVERRIDE + void Reset() override { m_uiTransformTimer = 0; @@ -130,7 +130,7 @@ class npc_kalecgos : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_ID_LAND, afKaelLandPoint[0], afKaelLandPoint[1], afKaelLandPoint[2]); } - void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -164,7 +164,7 @@ class npc_kalecgos : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (m_uiTransformTimer) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 86d43e5b5c2..477173c7d21 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -95,7 +95,7 @@ class npc_unworthy_initiate : public CreatureScript public: npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unworthy_initiateAI(creature); } @@ -117,7 +117,7 @@ class npc_unworthy_initiate : public CreatureScript EventMap events; - void Reset() OVERRIDE + void Reset() override { anchorGUID = 0; phase = PHASE_CHAINED; @@ -128,7 +128,7 @@ class npc_unworthy_initiate : public CreatureScript me->LoadEquipment(0, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -136,7 +136,7 @@ class npc_unworthy_initiate : public CreatureScript events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -169,7 +169,7 @@ class npc_unworthy_initiate : public CreatureScript Talk(SAY_EVENT_START); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { switch (phase) { @@ -284,7 +284,7 @@ class npc_unworthy_initiate_anchor : public CreatureScript public: npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unworthy_initiate_anchorAI(creature); } @@ -295,13 +295,13 @@ class npc_unworthy_initiate_anchor : public CreatureScript uint64 prisonerGUID; - void SetGUID(uint64 guid, int32 /*id*/) OVERRIDE + void SetGUID(uint64 guid, int32 /*id*/) override { if (!prisonerGUID) prisonerGUID = guid; } - uint64 GetGUID(int32 /*id*/) const OVERRIDE + uint64 GetGUID(int32 /*id*/) const override { return prisonerGUID; } @@ -313,7 +313,7 @@ class go_acherus_soul_prison : public GameObjectScript public: go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (Creature* anchor = go->FindNearestCreature(29521, 15)) if (uint64 prisonerGUID = anchor->AI()->GetGUID()) @@ -354,7 +354,7 @@ class npc_death_knight_initiate : public CreatureScript public: npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -381,7 +381,7 @@ class npc_death_knight_initiate : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth()) { @@ -397,7 +397,7 @@ class npc_death_knight_initiate : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_death_knight_initiateAI(creature); } @@ -414,7 +414,7 @@ class npc_death_knight_initiate : public CreatureScript uint32 m_uiDuelTimer; bool m_bIsDuelInProgress; - void Reset() OVERRIDE + void Reset() override { lose = false; me->RestoreFaction(); @@ -427,7 +427,7 @@ class npc_death_knight_initiate : public CreatureScript m_bIsDuelInProgress = false; } - void SpellHit(Unit* pCaster, const SpellInfo* pSpell) OVERRIDE + void SpellHit(Unit* pCaster, const SpellInfo* pSpell) override { if (!m_bIsDuelInProgress && pSpell->Id == SPELL_DUEL) { @@ -436,7 +436,7 @@ class npc_death_knight_initiate : public CreatureScript } } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (m_bIsDuelInProgress && pDoneBy->IsControlledByPlayer()) { @@ -459,7 +459,7 @@ class npc_death_knight_initiate : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) { @@ -521,7 +521,7 @@ class npc_dark_rider_of_acherus : public CreatureScript { npc_dark_rider_of_acherusAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { PhaseTimer = 4000; Phase = 0; @@ -529,7 +529,7 @@ class npc_dark_rider_of_acherus : public CreatureScript TargetGUID = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Intro || !TargetGUID) return; @@ -585,7 +585,7 @@ class npc_dark_rider_of_acherus : public CreatureScript uint64 TargetGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_dark_rider_of_acherusAI(creature); } @@ -609,7 +609,7 @@ class npc_salanar_the_horseman : public CreatureScript public: npc_salanar_the_horseman() : CreatureScript("npc_salanar_the_horseman") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_salanar_the_horsemanAI(creature); } @@ -618,7 +618,7 @@ class npc_salanar_the_horseman : public CreatureScript { npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) { } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_DELIVER_STOLEN_HORSE) { @@ -640,7 +640,7 @@ class npc_salanar_the_horseman : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); @@ -680,7 +680,7 @@ class npc_ros_dark_rider : public CreatureScript public: npc_ros_dark_rider() : CreatureScript("npc_ros_dark_rider") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ros_dark_riderAI(creature); } @@ -689,12 +689,12 @@ class npc_ros_dark_rider : public CreatureScript { npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->ExitVehicle(); } - void Reset() OVERRIDE + void Reset() override { Creature* deathcharger = me->FindNearestCreature(28782, 30); if (!deathcharger) @@ -707,7 +707,7 @@ class npc_ros_dark_rider : public CreatureScript me->EnterVehicle(deathcharger); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Creature* deathcharger = me->FindNearestCreature(28782, 30); if (!deathcharger) @@ -734,7 +734,7 @@ class npc_dkc1_gothik : public CreatureScript public: npc_dkc1_gothik() : CreatureScript("npc_dkc1_gothik") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_dkc1_gothikAI(creature); } @@ -743,7 +743,7 @@ class npc_dkc1_gothik : public CreatureScript { npc_dkc1_gothikAI(Creature* creature) : ScriptedAI(creature) { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); @@ -777,7 +777,7 @@ class npc_scarlet_ghoul : public CreatureScript public: npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scarlet_ghoulAI(creature); } @@ -813,7 +813,7 @@ class npc_scarlet_ghoul : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!me->IsInCombat()) { @@ -878,7 +878,7 @@ class npc_scarlet_miner_cart : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid1); // Modelid2 is a horse. } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_MINER) { @@ -887,13 +887,13 @@ class npc_scarlet_miner_cart : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { if (summon->GetEntry() == NPC_MINER) _minerGUID = 0; } - void DoAction(int32 /*param*/) OVERRIDE + void DoAction(int32 /*param*/) override { if (Creature* miner = ObjectAccessor::GetCreature(*me, _minerGUID)) { @@ -907,7 +907,7 @@ class npc_scarlet_miner_cart : public CreatureScript } } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { if (apply) { @@ -927,7 +927,7 @@ class npc_scarlet_miner_cart : public CreatureScript uint64 _playerGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scarlet_miner_cartAI(creature); } @@ -959,14 +959,14 @@ class npc_scarlet_miner : public CreatureScript uint32 IntroPhase; uint64 carGUID; - void Reset() OVERRIDE + void Reset() override { carGUID = 0; IntroTimer = 0; IntroPhase = 0; } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { carGUID = summoner->GetGUID(); } @@ -1004,14 +1004,14 @@ class npc_scarlet_miner : public CreatureScript } } - void SetGUID(uint64 guid, int32 /*id = 0*/) OVERRIDE + void SetGUID(uint64 guid, int32 /*id = 0*/) override { InitWaypoint(); Start(false, false, guid); SetDespawnAtFar(false); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -1038,7 +1038,7 @@ class npc_scarlet_miner : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IntroPhase) { @@ -1065,7 +1065,7 @@ class npc_scarlet_miner : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scarlet_minerAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 16435048575..bb111ccd976 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -47,7 +47,7 @@ class npc_crusade_persuaded : public CreatureScript public: npc_crusade_persuaded() : CreatureScript("npc_crusade_persuaded") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crusade_persuadedAI(creature); } @@ -60,7 +60,7 @@ class npc_crusade_persuaded : public CreatureScript uint32 speechCounter; uint64 playerGUID; - void Reset() OVERRIDE + void Reset() override { speechTimer = 0; speechCounter = 0; @@ -69,7 +69,7 @@ class npc_crusade_persuaded : public CreatureScript me->RestoreFaction(); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TypeID::TYPEID_PLAYER && me->IsAlive() && !speechCounter) { @@ -93,7 +93,7 @@ class npc_crusade_persuaded : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (speechCounter) { @@ -193,7 +193,7 @@ class npc_koltira_deathweaver : public CreatureScript public: npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_BREAKOUT) { @@ -212,7 +212,7 @@ class npc_koltira_deathweaver : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -226,7 +226,7 @@ class npc_koltira_deathweaver : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -260,7 +260,7 @@ class npc_koltira_deathweaver : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (Player* player = GetPlayerForEscort()) summoned->AI()->AttackStart(player); @@ -277,7 +277,7 @@ class npc_koltira_deathweaver : public CreatureScript me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -348,7 +348,7 @@ class npc_koltira_deathweaver : public CreatureScript uint64 valrothGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_koltira_deathweaverAI(creature); } @@ -369,7 +369,7 @@ class npc_scarlet_courier : public CreatureScript public: npc_scarlet_courier() : CreatureScript("npc_scarlet_courier") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scarlet_courierAI(creature); } @@ -381,21 +381,21 @@ class npc_scarlet_courier : public CreatureScript uint32 uiStage; uint32 uiStage_timer; - void Reset() OVERRIDE + void Reset() override { me->Mount(14338); // not sure about this id uiStage = 1; uiStage_timer = 3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_TREE2); me->Dismount(); uiStage = 0; } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -404,7 +404,7 @@ class npc_scarlet_courier : public CreatureScript uiStage = 2; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (uiStage && !me->IsInCombat()) { @@ -460,7 +460,7 @@ class npc_high_inquisitor_valroth : public CreatureScript public: npc_high_inquisitor_valroth() : CreatureScript("npc_high_inquisitor_valroth") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_high_inquisitor_valrothAI(creature); } @@ -473,20 +473,20 @@ class npc_high_inquisitor_valroth : public CreatureScript uint32 uiInquisitor_Penance_timer; uint32 uiValroth_Smite_timer; - void Reset() OVERRIDE + void Reset() override { uiRenew_timer = 1000; uiInquisitor_Penance_timer = 2000; uiValroth_Smite_timer = 1000; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_VALROTH_AGGRO); DoCast(who, SPELL_VALROTH_SMITE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (uiRenew_timer <= diff) { @@ -518,7 +518,7 @@ class npc_high_inquisitor_valroth : public CreatureScript Talk(SAY_VALROTH_RAND); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Talk(SAY_VALROTH_DEATH); killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true); @@ -595,7 +595,7 @@ class npc_a_special_surprise : public CreatureScript public: npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_a_special_surpriseAI(creature); } @@ -608,7 +608,7 @@ class npc_a_special_surprise : public CreatureScript uint32 ExecuteSpeech_Counter; uint64 PlayerGUID; - void Reset() OVERRIDE + void Reset() override { ExecuteSpeech_Timer = 0; ExecuteSpeech_Counter = 0; @@ -666,7 +666,7 @@ class npc_a_special_surprise : public CreatureScript return false; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (PlayerGUID || who->GetTypeId() != TypeID::TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE)) @@ -676,7 +676,7 @@ class npc_a_special_surprise : public CreatureScript PlayerGUID = who->GetGUID(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (PlayerGUID && !me->GetVictim() && me->IsAlive()) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index fcdebf727cc..b27a56d6255 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -278,7 +278,7 @@ class npc_highlord_darion_mograine : public CreatureScript public: npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -292,7 +292,7 @@ class npc_highlord_darion_mograine : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -305,7 +305,7 @@ class npc_highlord_darion_mograine : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_highlord_darion_mograineAI(creature); } @@ -373,7 +373,7 @@ class npc_highlord_darion_mograine : public CreatureScript uint64 uiGhoulGUID[ENCOUNTER_GHOUL_NUMBER]; uint64 uiWarriorGUID[ENCOUNTER_WARRIOR_NUMBER]; - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -473,7 +473,7 @@ class npc_highlord_darion_mograine : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -490,7 +490,7 @@ class npc_highlord_darion_mograine : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who) @@ -506,7 +506,7 @@ class npc_highlord_darion_mograine : public CreatureScript SetEscortPaused(bOnHold); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -621,13 +621,13 @@ class npc_highlord_darion_mograine : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (!bIsBattle)//do not reset self if we are in battle npc_escortAI::EnterEvadeMode(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -1672,7 +1672,7 @@ class npc_the_lich_king_tirion_dawn : public CreatureScript public: npc_the_lich_king_tirion_dawn() : CreatureScript("npc_the_lich_king_tirion_dawn") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_the_lich_king_tirion_dawnAI(creature); } @@ -1680,10 +1680,10 @@ class npc_the_lich_king_tirion_dawn : public CreatureScript struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); } - void Reset() OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } // very sample, just don't make them aggreesive - void UpdateAI(uint32 /*diff*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) OVERRIDE { } + void Reset() override { } + void AttackStart(Unit* /*who*/) override { } // very sample, just don't make them aggreesive + void UpdateAI(uint32 /*diff*/) override { } + void JustDied(Unit* /*killer*/) override { } }; }; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index 7b099480049..06cd542739b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -42,7 +42,7 @@ class npc_valkyr_battle_maiden : public CreatureScript public: npc_valkyr_battle_maiden() : CreatureScript("npc_valkyr_battle_maiden") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_valkyr_battle_maidenAI(creature); } @@ -55,7 +55,7 @@ class npc_valkyr_battle_maiden : public CreatureScript float x, y, z; uint32 phase; - void Reset() OVERRIDE + void Reset() override { me->setActive(true); me->SetVisible(false); @@ -72,7 +72,7 @@ class npc_valkyr_battle_maiden : public CreatureScript me->SetPosition(x, y, z, 0.0f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (FlyBackTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 9e2b8d17926..732bee239db 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -68,7 +68,7 @@ class boss_baron_rivendare : public CreatureScript public: boss_baron_rivendare() : CreatureScript("boss_baron_rivendare") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_baron_rivendareAI(creature); } @@ -88,7 +88,7 @@ class boss_baron_rivendare : public CreatureScript // uint32 RaiseDead_Timer; uint32 SummonSkeletons_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 5000; Cleave_Timer = 8000; @@ -99,26 +99,26 @@ class boss_baron_rivendare : public CreatureScript instance->SetData(TYPE_BARON, NOT_STARTED); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (instance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door instance->SetData(TYPE_BARON, IN_PROGRESS); ScriptedAI::AttackStart(who); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_BARON, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 2534f0ac85c..2f04fccb823 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -42,7 +42,7 @@ class boss_baroness_anastari : public CreatureScript public: boss_baroness_anastari() : CreatureScript("boss_baroness_anastari") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_baroness_anastariAI(creature); } @@ -61,7 +61,7 @@ class boss_baroness_anastari : public CreatureScript uint32 Silence_Timer; //uint32 Possess_Timer; - void Reset() OVERRIDE + void Reset() override { BansheeWail_Timer = 1000; BansheeCurse_Timer = 11000; @@ -69,17 +69,17 @@ class boss_baroness_anastari : public CreatureScript //Possess_Timer = 35000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_BARONESS, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 98856f31f4d..d87ddeaf3d9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -87,7 +87,7 @@ class boss_cannon_master_willey : public CreatureScript public: boss_cannon_master_willey() : CreatureScript("boss_cannon_master_willey") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_cannon_master_willeyAI(creature); } @@ -101,7 +101,7 @@ class boss_cannon_master_willey : public CreatureScript uint32 Shoot_Timer; uint32 SummonRifleman_Timer; - void Reset() OVERRIDE + void Reset() override { Shoot_Timer = 1000; Pummel_Timer = 7000; @@ -109,7 +109,7 @@ class boss_cannon_master_willey : public CreatureScript SummonRifleman_Timer = 15000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 240000); me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 240000); @@ -120,11 +120,11 @@ class boss_cannon_master_willey : public CreatureScript me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 240000); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 9e980519f4f..0c9094c6a75 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -76,7 +76,7 @@ class boss_dathrohan_balnazzar : public CreatureScript public: boss_dathrohan_balnazzar() : CreatureScript("boss_dathrohan_balnazzar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_dathrohan_balnazzarAI(creature); } @@ -95,7 +95,7 @@ class boss_dathrohan_balnazzar : public CreatureScript uint32 m_uiMindControl_Timer; bool m_bTransformed; - void Reset() OVERRIDE + void Reset() override { m_uiCrusadersHammer_Timer = 8000; m_uiCrusaderStrike_Timer = 12000; @@ -111,7 +111,7 @@ class boss_dathrohan_balnazzar : public CreatureScript me->UpdateEntry(NPC_DATHROHAN); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { static uint32 uiCount = sizeof(m_aSummonPoint)/sizeof(SummonDef); @@ -121,11 +121,11 @@ class boss_dathrohan_balnazzar : public CreatureScript TempSummonType::TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index 6dcc8472d8b..9d2512c6b19 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -48,7 +48,7 @@ class boss_magistrate_barthilas : public CreatureScript public: boss_magistrate_barthilas() : CreatureScript("boss_magistrate_barthilas") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_magistrate_barthilasAI(creature); } @@ -63,7 +63,7 @@ class boss_magistrate_barthilas : public CreatureScript uint32 FuriousAnger_Timer; uint32 AngerCount; - void Reset() OVERRIDE + void Reset() override { DrainingBlow_Timer = 20000; CrowdPummel_Timer = 15000; @@ -77,7 +77,7 @@ class boss_magistrate_barthilas : public CreatureScript me->SetDisplayId(MODEL_HUMAN); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //nothing to see here yet @@ -85,16 +85,16 @@ class boss_magistrate_barthilas : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SetDisplayId(MODEL_HUMAN); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 3e2e2f55a48..d5671e74b1a 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -43,7 +43,7 @@ class boss_maleki_the_pallid : public CreatureScript public: boss_maleki_the_pallid() : CreatureScript("boss_maleki_the_pallid") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_maleki_the_pallidAI(creature); } @@ -61,24 +61,24 @@ class boss_maleki_the_pallid : public CreatureScript uint32 IceTomb_Timer; uint32 DrainLife_Timer; - void Reset() OVERRIDE + void Reset() override { Frostbolt_Timer = 1000; IceTomb_Timer = 16000; DrainLife_Timer = 31000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_PALLID, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 54752b3d413..e47e7e2c9f4 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -42,7 +42,7 @@ class boss_nerubenkan : public CreatureScript public: boss_nerubenkan() : CreatureScript("boss_nerubenkan") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nerubenkanAI(creature); } @@ -61,7 +61,7 @@ class boss_nerubenkan : public CreatureScript uint32 CryptScarabs_Timer; uint32 RaiseUndeadScarab_Timer; - void Reset() OVERRIDE + void Reset() override { CryptScarabs_Timer = 3000; EncasingWebs_Timer = 7000; @@ -69,11 +69,11 @@ class boss_nerubenkan : public CreatureScript RaiseUndeadScarab_Timer = 3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_NERUB, IN_PROGRESS); @@ -86,7 +86,7 @@ class boss_nerubenkan : public CreatureScript pUndeadScarab->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index bad981c4668..190a97ba239 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -58,7 +58,7 @@ class boss_silver_hand_bosses : public CreatureScript public: boss_silver_hand_bosses() : CreatureScript("boss_silver_hand_bosses") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_silver_hand_bossesAI(creature); } @@ -75,7 +75,7 @@ class boss_silver_hand_bosses : public CreatureScript uint32 HolyLight_Timer; uint32 DivineShield_Timer; - void Reset() OVERRIDE + void Reset() override { HolyLight_Timer = 20000; DivineShield_Timer = 20000; @@ -103,11 +103,11 @@ class boss_silver_hand_bosses : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (!instance) return; @@ -138,7 +138,7 @@ class boss_silver_hand_bosses : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index fa2b4648c6f..976bb2b130f 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -63,9 +63,9 @@ class boss_postmaster_malown : public CreatureScript { boss_postmaster_malownAI(Creature* creature) : BossAI(creature, TYPE_MALOWN) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_WAILINGDEAD, 19000); // lasts 6 sec events.ScheduleEvent(EVENT_BACKHAND, 8000); // 2 sec stun @@ -74,12 +74,12 @@ class boss_postmaster_malown : public CreatureScript events.ScheduleEvent(EVENT_CALLOFTHEGRAVE, 25000); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -126,7 +126,7 @@ class boss_postmaster_malown : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_postmaster_malownAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 02700bcc45e..78de3bba112 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -45,7 +45,7 @@ class boss_ramstein_the_gorger : public CreatureScript public: boss_ramstein_the_gorger() : CreatureScript("boss_ramstein_the_gorger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ramstein_the_gorgerAI(creature); } @@ -62,17 +62,17 @@ class boss_ramstein_the_gorger : public CreatureScript uint32 Trample_Timer; uint32 Knockout_Timer; - void Reset() OVERRIDE + void Reset() override { Trample_Timer = 3000; Knockout_Timer = 12000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (uint8 i = 0; i < 30; ++i) { @@ -84,7 +84,7 @@ class boss_ramstein_the_gorger : public CreatureScript instance->SetData(TYPE_RAMSTEIN, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index 13fe9f754da..b7016287b0c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -43,7 +43,7 @@ class boss_timmy_the_cruel : public CreatureScript public: boss_timmy_the_cruel() : CreatureScript("boss_timmy_the_cruel") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_timmy_the_cruelAI(creature); } @@ -55,13 +55,13 @@ class boss_timmy_the_cruel : public CreatureScript uint32 RavenousClaw_Timer; bool HasYelled; - void Reset() OVERRIDE + void Reset() override { RavenousClaw_Timer = 10000; HasYelled = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!HasYelled) { @@ -70,7 +70,7 @@ class boss_timmy_the_cruel : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 0c6f3e8e9c0..486ef377175 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -74,7 +74,7 @@ class instance_stratholme : public InstanceMapScript std::set abomnationGUID; EventMap events; - void Initialize() OVERRIDE + void Initialize() override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) EncounterState[i] = NOT_STARTED; @@ -128,7 +128,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -148,7 +148,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { switch (creature->GetEntry()) { @@ -162,7 +162,7 @@ class instance_stratholme : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -215,7 +215,7 @@ class instance_stratholme : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -355,7 +355,7 @@ class instance_stratholme : public InstanceMapScript SaveToDB(); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -367,7 +367,7 @@ class instance_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -392,7 +392,7 @@ class instance_stratholme : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -416,7 +416,7 @@ class instance_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -428,7 +428,7 @@ class instance_stratholme : public InstanceMapScript return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { events.Update(diff); @@ -459,7 +459,7 @@ class instance_stratholme : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_stratholme_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 92939d99a20..43a0de542a8 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -48,7 +48,7 @@ class go_gauntlet_gate : public GameObjectScript public: go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); @@ -94,7 +94,7 @@ class npc_freed_soul : public CreatureScript public: npc_freed_soul() : CreatureScript("npc_freed_soul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_freed_soulAI(creature); } @@ -103,12 +103,12 @@ class npc_freed_soul : public CreatureScript { npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { Talk(SAY_ZAPPED); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; }; @@ -135,7 +135,7 @@ class npc_restless_soul : public CreatureScript public: npc_restless_soul() : CreatureScript("npc_restless_soul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_restless_soulAI(creature); } @@ -148,16 +148,16 @@ class npc_restless_soul : public CreatureScript uint32 Die_Timer; bool Tagged; - void Reset() OVERRIDE + void Reset() override { Tagger = 0; Die_Timer = 5000; Tagged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (Tagged || spell->Id != SPELL_EGAN_BLASTER) return; @@ -170,18 +170,18 @@ class npc_restless_soul : public CreatureScript Tagger = caster->GetGUID(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Tagged) me->SummonCreature(NPC_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 300000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Tagged) { @@ -216,7 +216,7 @@ class npc_spectral_ghostly_citizen : public CreatureScript public: npc_spectral_ghostly_citizen() : CreatureScript("npc_spectral_ghostly_citizen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spectral_ghostly_citizenAI(creature); } @@ -228,21 +228,21 @@ class npc_spectral_ghostly_citizen : public CreatureScript uint32 Die_Timer; bool Tagged; - void Reset() OVERRIDE + void Reset() override { Die_Timer = 5000; Tagged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Tagged) { @@ -255,7 +255,7 @@ class npc_spectral_ghostly_citizen : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Tagged) { @@ -270,7 +270,7 @@ class npc_spectral_ghostly_citizen : public CreatureScript DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* player, uint32 emote) OVERRIDE + void ReceiveEmote(Player* player, uint32 emote) override { switch (emote) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 32d655bd024..5098076a3f2 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -70,7 +70,7 @@ class boss_brutallus : public CreatureScript public: boss_brutallus() : CreatureScript("boss_brutallus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_brutallusAI(creature); } @@ -98,7 +98,7 @@ class boss_brutallus : public CreatureScript bool IsIntro; bool Enraged; - void Reset() OVERRIDE + void Reset() override { SlashTimer = 11000; StompTimer = 30000; @@ -118,7 +118,7 @@ class boss_brutallus : public CreatureScript instance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); @@ -126,12 +126,12 @@ class boss_brutallus : public CreatureScript instance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(YELL_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(YELL_DEATH); @@ -144,7 +144,7 @@ class boss_brutallus : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (!Intro) ScriptedAI::EnterEvadeMode(); @@ -181,7 +181,7 @@ class boss_brutallus : public CreatureScript IsIntro = false; } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || Intro || IsIntro) return; @@ -266,7 +266,7 @@ class boss_brutallus : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->IsValidAttackTarget(who)) @@ -280,7 +280,7 @@ class boss_brutallus : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsIntro) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index ad8803af4c6..357b0a8a3f8 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -87,7 +87,7 @@ class boss_sacrolash : public CreatureScript public: boss_sacrolash() : CreatureScript("boss_sacrolash") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sacrolashAI(creature); }; @@ -111,7 +111,7 @@ class boss_sacrolash : public CreatureScript uint32 ConflagrationTimer; uint32 EnrageTimer; - void Reset() OVERRIDE + void Reset() override { Enraged = false; @@ -142,7 +142,7 @@ class boss_sacrolash : public CreatureScript instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoZoneInCombat(); @@ -157,13 +157,13 @@ class boss_sacrolash : public CreatureScript instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%4 == 0) Talk(YELL_SAC_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { // only if ALY death if (SisterDeath) @@ -177,7 +177,7 @@ class boss_sacrolash : public CreatureScript me->RemoveFlag(OBJECT_FIELD_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { switch (spell->Id) { @@ -220,7 +220,7 @@ class boss_sacrolash : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!SisterDeath) { @@ -343,7 +343,7 @@ class boss_alythess : public CreatureScript public: boss_alythess() : CreatureScript("boss_alythess") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_alythessAI(creature); }; @@ -373,7 +373,7 @@ class boss_alythess : public CreatureScript uint32 FlamesearTimer; uint32 EnrageTimer; - void Reset() OVERRIDE + void Reset() override { Enraged = false; @@ -405,7 +405,7 @@ class boss_alythess : public CreatureScript instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoZoneInCombat(); @@ -420,13 +420,13 @@ class boss_alythess : public CreatureScript instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!me->IsInCombat()) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -449,7 +449,7 @@ class boss_alythess : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%4 == 0) { @@ -457,7 +457,7 @@ class boss_alythess : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (SisterDeath) { @@ -470,7 +470,7 @@ class boss_alythess : public CreatureScript me->RemoveFlag(OBJECT_FIELD_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { switch (spell->Id) { @@ -547,7 +547,7 @@ class boss_alythess : public CreatureScript return 10000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IntroStepCounter < 9) { @@ -671,7 +671,7 @@ class npc_shadow_image : public CreatureScript public: npc_shadow_image() : CreatureScript("npc_shadow_image") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadow_imageAI(creature); }; @@ -684,7 +684,7 @@ class npc_shadow_image : public CreatureScript uint32 KillTimer; uint32 DarkstrikeTimer; - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); ShadowfuryTimer = 5000 + (rand()%15000); @@ -692,9 +692,9 @@ class npc_shadow_image : public CreatureScript KillTimer = 15000; } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { switch (spell->Id) { @@ -712,7 +712,7 @@ class npc_shadow_image : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->HasAura(SPELL_IMAGE_VISUAL)) DoCast(me, SPELL_IMAGE_VISUAL); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 1c819c78420..f3b20e96edb 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -115,7 +115,7 @@ class boss_felmyst : public CreatureScript public: boss_felmyst() : CreatureScript("boss_felmyst") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_felmystAI(creature); } @@ -136,7 +136,7 @@ class boss_felmyst : public CreatureScript float breathX, breathY; - void Reset() OVERRIDE + void Reset() override { phase = PHASE_NONE; @@ -155,7 +155,7 @@ class boss_felmyst : public CreatureScript instance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_BERSERK, 600000); @@ -169,30 +169,30 @@ class boss_felmyst : public CreatureScript instance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (phase != PHASE_FLIGHT) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (phase != PHASE_FLIGHT) ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(YELL_KILL); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Talk(YELL_BIRTH); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(YELL_DEATH); @@ -200,7 +200,7 @@ class boss_felmyst : public CreatureScript instance->SetData(DATA_FELMYST_EVENT, DONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { // workaround for linked aura /*if (spell->Id == SPELL_VAPOR_FORCE) @@ -223,7 +223,7 @@ class boss_felmyst : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_DEAD) { @@ -233,13 +233,13 @@ class boss_felmyst : public CreatureScript } } - void MovementInform(uint32, uint32) OVERRIDE + void MovementInform(uint32, uint32) override { if (phase == PHASE_FLIGHT) events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); } - void DamageTaken(Unit*, uint32 &damage) OVERRIDE + void DamageTaken(Unit*, uint32 &damage) override { if (phase != PHASE_GROUND && damage >= me->GetHealth()) damage = 0; @@ -408,7 +408,7 @@ class boss_felmyst : public CreatureScript ++uiFlightCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -522,7 +522,7 @@ class npc_felmyst_vapor : public CreatureScript public: npc_felmyst_vapor() : CreatureScript("npc_felmyst_vapor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_felmyst_vaporAI(creature); } @@ -534,13 +534,13 @@ class npc_felmyst_vapor : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetSpeed(MOVE_RUN, 0.8f); } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); //DoCast(me, SPELL_VAPOR_FORCE, true); core bug } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!me->GetVictim()) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -554,7 +554,7 @@ class npc_felmyst_trail : public CreatureScript public: npc_felmyst_trail() : CreatureScript("npc_felmyst_trail") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_felmyst_trailAI(creature); } @@ -568,12 +568,12 @@ class npc_felmyst_trail : public CreatureScript me->SetTarget(me->GetGUID()); me->SetFloatValue(UNIT_FIELD_BOUNDING_RADIUS, 0.01f); // core bug } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index a06bf5b450f..e1ebc623ecc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -105,7 +105,7 @@ class boss_kalecgos : public CreatureScript public: boss_kalecgos() : CreatureScript("boss_kalecgos") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kalecgosAI(creature); } @@ -141,7 +141,7 @@ class boss_kalecgos : public CreatureScript uint64 SathGUID; uint64 DoorGUID; - void Reset() OVERRIDE + void Reset() override { if (instance) { @@ -176,7 +176,7 @@ class boss_kalecgos : public CreatureScript isBanished = false; } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { bJustReset = true; me->SetVisible(false); @@ -184,7 +184,7 @@ class boss_kalecgos : public CreatureScript ScriptedAI::EnterEvadeMode(); } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { switch (param) { @@ -199,7 +199,7 @@ class boss_kalecgos : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (TalkTimer) { @@ -332,7 +332,7 @@ class boss_kalecgos : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (bJustReset)//boss is invisible, don't attack @@ -346,13 +346,13 @@ class boss_kalecgos : public CreatureScript } } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage >= me->GetHealth() && done_by != me) damage = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->SetStandState(UNIT_STAND_STATE_STAND); Talk(SAY_EVIL_AGGRO); @@ -362,12 +362,12 @@ class boss_kalecgos : public CreatureScript instance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_EVIL_SLAY); } - void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*id*/) override { if (type != POINT_MOTION_TYPE) return; @@ -444,7 +444,7 @@ class boss_kalec : public CreatureScript public: boss_kalec() : CreatureScript("boss_kalec") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kalecAI(creature); } @@ -467,7 +467,7 @@ class boss_kalec : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { if (instance) SathGUID = instance->GetData64(DATA_SATHROVARR); @@ -480,7 +480,7 @@ class boss_kalec : public CreatureScript isEnraged = false; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != SathGUID) damage = 0; @@ -488,7 +488,7 @@ class boss_kalec : public CreatureScript damage *= 3; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->HasAura(AURA_SPECTRAL_INVISIBILITY)) me->CastSpell(me, AURA_SPECTRAL_INVISIBILITY, true); @@ -545,7 +545,7 @@ class kalecgos_teleporter : public GameObjectScript public: kalecgos_teleporter() : GameObjectScript("kalecgos_teleporter") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { Map* map = go->GetMap(); if (!map->IsRaid()) @@ -577,7 +577,7 @@ class boss_sathrovarr : public CreatureScript public: boss_sathrovarr() : CreatureScript("boss_sathrovarr") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sathrovarrAI(creature); } @@ -605,7 +605,7 @@ class boss_sathrovarr : public CreatureScript bool isEnraged; bool isBanished; - void Reset() OVERRIDE + void Reset() override { me->SetFullHealth();//dunno why it does not resets health at evade.. me->setActive(true); @@ -633,7 +633,7 @@ class boss_sathrovarr : public CreatureScript TeleportAllPlayersBack(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Creature* Kalec = me->SummonCreature(NPC_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) { @@ -645,13 +645,13 @@ class boss_sathrovarr : public CreatureScript Talk(SAY_SATH_AGGRO); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage >= me->GetHealth() && done_by != me) damage = 0; } - void KilledUnit(Unit* target) OVERRIDE + void KilledUnit(Unit* target) override { if (target->GetGUID() == KalecGUID) { @@ -667,7 +667,7 @@ class boss_sathrovarr : public CreatureScript Talk(SAY_SATH_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_SATH_DEATH); me->SetPosition(me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); @@ -699,7 +699,7 @@ class boss_sathrovarr : public CreatureScript } } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { switch (param) { @@ -714,7 +714,7 @@ class boss_sathrovarr : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->HasAura(AURA_SPECTRAL_INVISIBILITY)) me->CastSpell(me, AURA_SPECTRAL_INVISIBILITY, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 07514a48bee..42175c50518 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -237,7 +237,7 @@ class boss_kalecgos_kj : public CreatureScript public: boss_kalecgos_kj() : CreatureScript("boss_kalecgos_kj") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kalecgos_kjAI(creature); } @@ -253,7 +253,7 @@ class boss_kalecgos_kj : public CreatureScript uint8 OrbsEmpowered; uint8 EmpowerCount; - void Reset() OVERRIDE + void Reset() override { OrbsEmpowered = 0; EmpowerCount = 0; @@ -338,7 +338,7 @@ class boss_kalecgos_kj : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { } @@ -366,7 +366,7 @@ class go_orb_of_the_blue_flight : public GameObjectScript public: go_orb_of_the_blue_flight() : GameObjectScript("go_orb_of_the_blue_flight") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetUInt32Value(GAMEOBJECT_FIELD_FACTION_TEMPLATE) == 35) { @@ -390,7 +390,7 @@ class npc_kiljaeden_controller : public CreatureScript public: npc_kiljaeden_controller() : CreatureScript("npc_kiljaeden_controller") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kiljaeden_controllerAI(creature); } @@ -414,7 +414,7 @@ class npc_kiljaeden_controller : public CreatureScript uint32 phase; uint8 deceiverDeathCount; - void InitializeAI() OVERRIDE + void InitializeAI() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -423,7 +423,7 @@ class npc_kiljaeden_controller : public CreatureScript ScriptedAI::InitializeAI(); } - void Reset() OVERRIDE + void Reset() override { phase = PHASE_DECEIVERS; @@ -437,7 +437,7 @@ class npc_kiljaeden_controller : public CreatureScript summons.DespawnAll(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -457,7 +457,7 @@ class npc_kiljaeden_controller : public CreatureScript summons.Summon(summoned); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (uiRandomSayTimer < diff) { @@ -492,7 +492,7 @@ class boss_kiljaeden : public CreatureScript public: boss_kiljaeden() : CreatureScript("boss_kiljaeden") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kiljaedenAI(creature); } @@ -525,12 +525,12 @@ class boss_kiljaeden : public CreatureScript bool OrbActivated; bool SpeechBegins; - void InitializeAI() OVERRIDE + void InitializeAI() override { // Scripted_NoMovementAI::InitializeAI(); } - void Reset() OVERRIDE + void Reset() override { TimerIsDeactivated[TIMER_SPEECH] = false; Timer[TIMER_SPEECH] = 0; @@ -591,7 +591,7 @@ class boss_kiljaeden : public CreatureScript TimerIsDeactivated[TIMER_SUMMON_SHILEDORB] = true; } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == CREATURE_ARMAGEDDON_TARGET) { @@ -606,7 +606,7 @@ class boss_kiljaeden : public CreatureScript summons.Summon(summoned); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_KJ_DEATH); summons.DespawnAll(); @@ -615,12 +615,12 @@ class boss_kiljaeden : public CreatureScript instance->SetData(DATA_KILJAEDEN_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KJ_SLAY); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); @@ -634,7 +634,7 @@ class boss_kiljaeden : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -669,7 +669,7 @@ class boss_kiljaeden : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || Phase < PHASE_NORMAL) return; @@ -904,7 +904,7 @@ class npc_hand_of_the_deceiver : public CreatureScript public: npc_hand_of_the_deceiver() : CreatureScript("npc_hand_of_the_deceiver") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hand_of_the_deceiverAI(creature); } @@ -921,7 +921,7 @@ class npc_hand_of_the_deceiver : public CreatureScript uint32 ShadowBoltVolleyTimer; uint32 FelfirePortalTimer; - void Reset() OVERRIDE + void Reset() override { /// @todo Timers! ShadowBoltVolleyTimer = urand(8000, 14000); // So they don't all cast it in the same moment. @@ -930,13 +930,13 @@ class npc_hand_of_the_deceiver : public CreatureScript instance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -947,7 +947,7 @@ class npc_hand_of_the_deceiver : public CreatureScript me->InterruptNonMeleeSpells(true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!instance) return; @@ -956,7 +956,7 @@ class npc_hand_of_the_deceiver : public CreatureScript ++(CAST_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) DoCast(me, SPELL_SHADOW_CHANNELING); @@ -1004,7 +1004,7 @@ class npc_felfire_portal : public CreatureScript public: npc_felfire_portal() : CreatureScript("npc_felfire_portal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_felfire_portalAI(creature); } @@ -1018,19 +1018,19 @@ class npc_felfire_portal : public CreatureScript uint32 uiSpawnFiendTimer; - void Reset() OVERRIDE + void Reset() override { uiSpawnFiendTimer = 5000; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1051,7 +1051,7 @@ class npc_volatile_felfire_fiend : public CreatureScript public: npc_volatile_felfire_fiend() : CreatureScript("npc_volatile_felfire_fiend") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_volatile_felfire_fiendAI(creature); } @@ -1064,19 +1064,19 @@ class npc_volatile_felfire_fiend : public CreatureScript bool bLockedTarget; - void Reset() OVERRIDE + void Reset() override { uiExplodeTimer = 2000; bLockedTarget = false; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage > me->GetHealth()) DoCast(me, SPELL_FELFIRE_FISSION, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1108,7 +1108,7 @@ class npc_armageddon : public CreatureScript public: npc_armageddon() : CreatureScript("npc_armageddon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_armageddonAI(creature); } @@ -1123,13 +1123,13 @@ class npc_armageddon : public CreatureScript uint8 spell; uint32 uiTimer; - void Reset() OVERRIDE + void Reset() override { spell = 0; uiTimer = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (uiTimer <= diff) { @@ -1165,7 +1165,7 @@ class npc_shield_orb : public CreatureScript public: npc_shield_orb() : CreatureScript("npc_shield_orb") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shield_orbAI(creature); } @@ -1185,7 +1185,7 @@ class npc_shield_orb : public CreatureScript uint32 uiCheckTimer; float x, y, r, c, mx, my; - void Reset() OVERRIDE + void Reset() override { me->SetDisableGravity(true); bPointReached = true; @@ -1198,7 +1198,7 @@ class npc_shield_orb : public CreatureScript bClockwise = urand(0, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bPointReached) { @@ -1236,7 +1236,7 @@ class npc_shield_orb : public CreatureScript } else uiTimer -= diff; } - void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*id*/) override { if (type != POINT_MOTION_TYPE) return; @@ -1252,7 +1252,7 @@ class npc_sinster_reflection : public CreatureScript public: npc_sinster_reflection() : CreatureScript("npc_sinster_reflection") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sinster_reflectionAI(creature); } @@ -1264,7 +1264,7 @@ class npc_sinster_reflection : public CreatureScript uint8 victimClass; uint32 uiTimer[3]; - void Reset() OVERRIDE + void Reset() override { uiTimer[0] = 0; uiTimer[1] = 0; @@ -1272,7 +1272,7 @@ class npc_sinster_reflection : public CreatureScript victimClass = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 87baaa7963f..5fafb75e969 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -112,7 +112,7 @@ class boss_entropius : public CreatureScript public: boss_entropius() : CreatureScript("boss_entropius") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_entropiusAI(creature); } @@ -129,7 +129,7 @@ class boss_entropius : public CreatureScript uint32 BlackHoleSummonTimer; - void Reset() OVERRIDE + void Reset() override { BlackHoleSummonTimer = 15000; DoCastAOE(SPELL_NEGATIVE_ENERGY_E, false); @@ -140,7 +140,7 @@ class boss_entropius : public CreatureScript instance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true); DoCast(me, SPELL_ENTROPIUS_SPAWN, false); @@ -149,7 +149,7 @@ class boss_entropius : public CreatureScript instance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -167,7 +167,7 @@ class boss_entropius : public CreatureScript Summons.Summon(summoned); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Summons.DespawnAll(); @@ -175,7 +175,7 @@ class boss_entropius : public CreatureScript instance->SetData(DATA_MURU_EVENT, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ class boss_muru : public CreatureScript public: boss_muru() : CreatureScript("boss_muru") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_muruAI(creature); } @@ -232,7 +232,7 @@ class boss_muru : public CreatureScript bool DarkFiend; - void Reset() OVERRIDE + void Reset() override { DarkFiend = false; Phase = 1; @@ -252,7 +252,7 @@ class boss_muru : public CreatureScript instance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCastAOE(SPELL_NEGATIVE_ENERGY, false); @@ -260,7 +260,7 @@ class boss_muru : public CreatureScript instance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage > me->GetHealth() && Phase == 1) { @@ -274,7 +274,7 @@ class boss_muru : public CreatureScript damage = 0; } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -289,7 +289,7 @@ class boss_muru : public CreatureScript Summons.Summon(summoned); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -376,7 +376,7 @@ class npc_muru_portal : public CreatureScript public: npc_muru_portal() : CreatureScript("npc_muru_portal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_muru_portalAI(creature); } @@ -398,7 +398,7 @@ class npc_muru_portal : public CreatureScript uint32 SummonTimer; - void Reset() OVERRIDE + void Reset() override { SummonTimer = 5000; @@ -410,7 +410,7 @@ class npc_muru_portal : public CreatureScript Summons.DespawnAll(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (instance) if (Player* Target = ObjectAccessor::GetPlayer(*me, instance->GetData64(DATA_PLAYER_GUID))) @@ -419,7 +419,7 @@ class npc_muru_portal : public CreatureScript Summons.Summon(summoned); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override { float x, y, z, o; me->GetHomePosition(x, y, z, o); @@ -437,7 +437,7 @@ class npc_muru_portal : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!SummonSentinel) { @@ -460,7 +460,7 @@ class npc_dark_fiend : public CreatureScript public: npc_dark_fiend() : CreatureScript("npc_dark_fiend") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_dark_fiendAI(creature); } @@ -472,7 +472,7 @@ class npc_dark_fiend : public CreatureScript uint32 WaitTimer; bool InAction; - void Reset() OVERRIDE + void Reset() override { WaitTimer = 2000; InAction = false; @@ -480,14 +480,14 @@ class npc_dark_fiend : public CreatureScript me->AddUnitState(UNIT_STATE_STUNNED); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override { for (uint8 i = 0; i < 3; ++i) if (Spell->Effects[i].Effect == 38) me->DisappearAndDie(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -521,7 +521,7 @@ class npc_void_sentinel : public CreatureScript public: npc_void_sentinel() : CreatureScript("npc_void_sentinel") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_void_sentinelAI(creature); } @@ -533,7 +533,7 @@ class npc_void_sentinel : public CreatureScript uint32 PulseTimer; uint32 VoidBlastTimer; - void Reset() OVERRIDE + void Reset() override { PulseTimer = 3000; VoidBlastTimer = 45000; //is this a correct timer? @@ -543,13 +543,13 @@ class npc_void_sentinel : public CreatureScript DoTeleportTo(x, y, 71); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (uint8 i = 0; i < 8; ++i) me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%6), TempSummonType::TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -576,7 +576,7 @@ class npc_blackhole : public CreatureScript public: npc_blackhole() : CreatureScript("npc_blackhole") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blackholeAI(creature); } @@ -595,7 +595,7 @@ class npc_blackhole : public CreatureScript uint8 Phase; uint8 NeedForAHack; - void Reset() OVERRIDE + void Reset() override { DespawnTimer = 15000; SpellTimer = 5000; @@ -605,7 +605,7 @@ class npc_blackhole : public CreatureScript DoCastAOE(SPELL_BLACKHOLE_SPAWN, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (SpellTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 966c22698fd..b1876c9d061 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -46,7 +46,7 @@ class instance_sunwell_plateau : public InstanceMapScript public: instance_sunwell_plateau() : InstanceMapScript("instance_sunwell_plateau", 580) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_sunwell_plateau_InstanceMapScript(map); } @@ -83,7 +83,7 @@ class instance_sunwell_plateau : public InstanceMapScript uint32 SpectralRealmTimer; std::vector SpectralRealmList; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -115,7 +115,7 @@ class instance_sunwell_plateau : public InstanceMapScript SpectralRealmTimer = 5000; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -143,7 +143,7 @@ class instance_sunwell_plateau : public InstanceMapScript return NULL; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -163,7 +163,7 @@ class instance_sunwell_plateau : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -184,7 +184,7 @@ class instance_sunwell_plateau : public InstanceMapScript } } - uint32 GetData(uint32 id) const OVERRIDE + uint32 GetData(uint32 id) const override { switch (id) { @@ -198,7 +198,7 @@ class instance_sunwell_plateau : public InstanceMapScript return 0; } - uint64 GetData64(uint32 id) const OVERRIDE + uint64 GetData64(uint32 id) const override { switch (id) { @@ -223,7 +223,7 @@ class instance_sunwell_plateau : public InstanceMapScript return 0; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { switch (id) { @@ -274,7 +274,7 @@ class instance_sunwell_plateau : public InstanceMapScript SaveToDB(); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; std::ostringstream stream; @@ -285,7 +285,7 @@ class instance_sunwell_plateau : public InstanceMapScript return stream.str(); } - void Load(char const* in) OVERRIDE + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 632d8483975..dceb3257f29 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -73,7 +73,7 @@ class npc_professor_phizzlethorpe : public CreatureScript { npc_professor_phizzlethorpeAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -101,17 +101,17 @@ class npc_professor_phizzlethorpe : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { Player* player = GetPlayerForEscort(); if (!player) @@ -143,12 +143,12 @@ class npc_professor_phizzlethorpe : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_professor_phizzlethorpeAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_GOGGLE_BOGGLE) { diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index d94d1ab6d30..19bfec10664 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -52,7 +52,7 @@ class npc_deathly_usher : public CreatureScript public: npc_deathly_usher() : CreatureScript("npc_deathly_usher") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -64,7 +64,7 @@ class npc_deathly_usher : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(10757)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 5d67815fd3f..469e63c419b 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -47,18 +47,18 @@ class npc_ghoul_flayer : public CreatureScript { npc_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer->GetTypeId() == TypeID::TYPEID_PLAYER) me->SummonCreature(11064, 0.0f, 0.0f, 0.0f, 0.0f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 60000); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ghoul_flayerAI(creature); } @@ -73,7 +73,7 @@ class npc_augustus_the_touched : public CreatureScript public: npc_augustus_the_touched() : CreatureScript("npc_augustus_the_touched") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -81,7 +81,7 @@ class npc_augustus_the_touched : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -108,7 +108,7 @@ class npc_darrowshire_spirit : public CreatureScript public: npc_darrowshire_spirit() : CreatureScript("npc_darrowshire_spirit") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { player->SEND_GOSSIP_MENU(3873, creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); @@ -116,7 +116,7 @@ class npc_darrowshire_spirit : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_darrowshire_spiritAI(creature); } @@ -125,13 +125,13 @@ class npc_darrowshire_spirit : public CreatureScript { npc_darrowshire_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_SPIRIT_SPAWNIN); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; }; @@ -149,7 +149,7 @@ class npc_tirion_fordring : public CreatureScript public: npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -174,7 +174,7 @@ class npc_tirion_fordring : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index d89a2061a19..b7a9e095d15 100644 --- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -123,12 +123,12 @@ class npc_blackrock_spy : public CreatureScript DoCast(me, SPELL_SPYGLASS); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(RAND(SAY_BLACKROCK_COMBAT_1, SAY_BLACKROCK_COMBAT_2, SAY_BLACKROCK_COMBAT_3, SAY_BLACKROCK_COMBAT_4, SAY_BLACKROCK_COMBAT_5), me); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { CastSpyglass(); @@ -158,12 +158,12 @@ class npc_blackrock_invader : public CreatureScript { npc_blackrock_invaderAI(Creature* creature) : ScriptedAI(creature) {} - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(RAND(SAY_BLACKROCK_COMBAT_1, SAY_BLACKROCK_COMBAT_2, SAY_BLACKROCK_COMBAT_3, SAY_BLACKROCK_COMBAT_4, SAY_BLACKROCK_COMBAT_5), me); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -195,12 +195,12 @@ class npc_goblin_assassin : public CreatureScript DoCast(SPELL_SNEAKING); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(RAND(SAY_ASSASSIN_COMBAT_1, SAY_ASSASSIN_COMBAT_2), me); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -230,14 +230,14 @@ class npc_stormwind_infantry : public CreatureScript uint32 tSeek, cYell,tYell; - void Reset() OVERRIDE + void Reset() override { tSeek=urand(1000,2000); cYell=urand(0, 100); tYell=urand(5000, 60000); } - void DamageTaken(Unit* who, uint32& damage) OVERRIDE + void DamageTaken(Unit* who, uint32& damage) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER)//If damage taken from player { @@ -260,7 +260,7 @@ class npc_stormwind_infantry : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -306,14 +306,14 @@ class npc_blackrock_battle_worg : public CreatureScript uint32 tSeek, tGrowl; - void Reset() OVERRIDE + void Reset() override { tSeek=urand(1000,2000); tGrowl=urand(8500,10000); me->setFaction(WORG_FACTION_RESTORE);//Restore our faction on reset } - void DamageTaken(Unit* who, uint32& damage) OVERRIDE + void DamageTaken(Unit* who, uint32& damage) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER)//If damage taken from player { @@ -336,7 +336,7 @@ class npc_blackrock_battle_worg : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (tSeek <= diff) { diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index 91dc557fec0..a26d84de6cd 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -51,7 +51,7 @@ class npc_apprentice_mirveda : public CreatureScript public: npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT) { @@ -61,7 +61,7 @@ class npc_apprentice_mirveda : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_apprentice_mirvedaAI(creature); } @@ -75,7 +75,7 @@ class npc_apprentice_mirveda : public CreatureScript bool Summon; SummonList Summons; - void Reset() OVERRIDE + void Reset() override { KillCount = 0; PlayerGUID = 0; @@ -83,28 +83,28 @@ class npc_apprentice_mirveda : public CreatureScript Summon = false; } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) OVERRIDE + void SummonedCreatureDespawn(Creature* summoned) override { Summons.Despawn(summoned); ++KillCount; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (PlayerGUID) if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID)) player->FailQuest(QUEST_UNEXPECTED_RESULT); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (KillCount >= 3 && PlayerGUID) if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID)) @@ -159,7 +159,7 @@ class npc_infused_crystal : public CreatureScript public: npc_infused_crystal() : CreatureScript("npc_infused_crystal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_infused_crystalAI(creature); } @@ -177,7 +177,7 @@ class npc_infused_crystal : public CreatureScript bool Progress; uint64 PlayerGUID; - void Reset() OVERRIDE + void Reset() override { EndTimer = 0; Completed = false; @@ -186,7 +186,7 @@ class npc_infused_crystal : public CreatureScript WaveTimer = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Progress && who->GetTypeId() == TypeID::TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) @@ -201,19 +201,19 @@ class npc_infused_crystal : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (PlayerGUID && !Completed) if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID)) player->FailQuest(QUEST_POWERING_OUR_DEFENSES); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (EndTimer < diff && Progress) { diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 119ffc33dd2..41042fe2533 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -46,7 +46,7 @@ class npc_rathis_tomber : public CreatureScript public: npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -54,7 +54,7 @@ class npc_rathis_tomber : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -108,7 +108,7 @@ class npc_ranger_lilatha : public CreatureScript { npc_ranger_lilathaAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -165,14 +165,14 @@ class npc_ranger_lilatha : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) Cage->SetGoState(GOState::GO_STATE_READY); } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS) { @@ -184,7 +184,7 @@ class npc_ranger_lilatha : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ranger_lilathaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index c86e2f32bc7..4b505fa5803 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -60,7 +60,7 @@ class npc_00x09hl : public CreatureScript public: npc_00x09hl() : CreatureScript("npc_00x09hl") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_RESQUE_OOX_09) { @@ -79,7 +79,7 @@ class npc_00x09hl : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_00x09hlAI(creature); } @@ -88,9 +88,9 @@ class npc_00x09hl : public CreatureScript { npc_00x09hlAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -108,7 +108,7 @@ class npc_00x09hl : public CreatureScript } } - void WaypointStart(uint32 uiPointId) OVERRIDE + void WaypointStart(uint32 uiPointId) override { switch (uiPointId) { @@ -133,7 +133,7 @@ class npc_00x09hl : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER) return; @@ -141,7 +141,7 @@ class npc_00x09hl : public CreatureScript Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index 9cad9570899..9a1146966dc 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -51,7 +51,7 @@ class npc_converted_sentry : public CreatureScript public: npc_converted_sentry() : CreatureScript("npc_converted_sentry") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_converted_sentryAI(creature); } @@ -63,17 +63,17 @@ class npc_converted_sentry : public CreatureScript bool Credit; uint32 Timer; - void Reset() OVERRIDE + void Reset() override { Credit = false; Timer = 2500; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Credit) { @@ -105,7 +105,7 @@ class npc_greengill_slave : public CreatureScript public: npc_greengill_slave() : CreatureScript("npc_greengill_slave") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_greengill_slaveAI(creature); } @@ -114,9 +114,9 @@ class npc_greengill_slave : public CreatureScript { npc_greengill_slaveAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* caster, SpellInfo const* spellInfo) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { Player* player = caster->ToPlayer(); if (!player) @@ -137,7 +137,7 @@ class npc_greengill_slave : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 9e8c172ca90..27d62a2f57f 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -68,7 +68,7 @@ class npc_deathstalker_erland : public CreatureScript { npc_deathstalker_erlandAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -109,15 +109,15 @@ class npc_deathstalker_erland : public CreatureScript } } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_AGGRO, who); } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCORTING) { @@ -130,7 +130,7 @@ class npc_deathstalker_erland : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_deathstalker_erlandAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 03796cc5014..ec133eb4c34 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -43,7 +43,7 @@ class npc_yenniku : public CreatureScript public: npc_yenniku() : CreatureScript("npc_yenniku") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_yennikuAI(creature); } @@ -58,13 +58,13 @@ class npc_yenniku : public CreatureScript uint32 Reset_Timer; bool bReset; - void Reset() OVERRIDE + void Reset() override { Reset_Timer = 0; me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, EMOTE_STATE_NONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (bReset || spell->Id != 3607) return; @@ -84,9 +84,9 @@ class npc_yenniku : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bReset) { diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 8281271717b..5f926f9c1d2 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -79,7 +79,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript public: npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") { } - bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/) OVERRIDE + bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/) override { if (_Quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY) { @@ -94,7 +94,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lady_sylvanas_windrunnerAI(creature); } @@ -113,7 +113,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript uint32 ShotTimer; uint32 MultiShotTimer; - void Reset() OVERRIDE + void Reset() override { LamentEventTimer = 5000; LamentEvent = false; @@ -126,9 +126,9 @@ class npc_lady_sylvanas_windrunner : public CreatureScript MultiShotTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { @@ -144,7 +144,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (LamentEvent) { @@ -226,7 +226,7 @@ class npc_highborne_lamenter : public CreatureScript public: npc_highborne_lamenter() : CreatureScript("npc_highborne_lamenter") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_highborne_lamenterAI(creature); } @@ -240,7 +240,7 @@ class npc_highborne_lamenter : public CreatureScript bool EventMove; bool EventCast; - void Reset() OVERRIDE + void Reset() override { EventMoveTimer = 10000; EventCastTimer = 17500; @@ -248,9 +248,9 @@ class npc_highborne_lamenter : public CreatureScript EventCast = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (EventMove) { @@ -292,7 +292,7 @@ class npc_parqual_fintallas : public CreatureScript public: npc_parqual_fintallas() : CreatureScript("npc_parqual_fintallas") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -308,7 +308,7 @@ class npc_parqual_fintallas : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 6a50f9f275b..3be9498948b 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -155,7 +155,7 @@ class npc_winterfin_playmate : public CreatureScript { npc_winterfin_playmateAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { timer = 0; phase = 0; @@ -163,7 +163,7 @@ class npc_winterfin_playmate : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -177,7 +177,7 @@ class npc_winterfin_playmate : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -235,7 +235,7 @@ class npc_winterfin_playmate : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_winterfin_playmateAI(creature); } @@ -253,7 +253,7 @@ class npc_snowfall_glade_playmate : public CreatureScript { npc_snowfall_glade_playmateAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { timer = 0; phase = 0; @@ -261,7 +261,7 @@ class npc_snowfall_glade_playmate : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -275,7 +275,7 @@ class npc_snowfall_glade_playmate : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -354,7 +354,7 @@ class npc_the_biggest_tree : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void Reset() OVERRIDE + void Reset() override { timer = 1000; phase = 0; @@ -362,7 +362,7 @@ class npc_the_biggest_tree : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -376,7 +376,7 @@ class npc_the_biggest_tree : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -422,7 +422,7 @@ class npc_the_biggest_tree : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_the_biggest_treeAI(creature); } @@ -440,7 +440,7 @@ class npc_high_oracle_soo_roo : public CreatureScript { npc_high_oracle_soo_rooAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { timer = 0; phase = 0; @@ -448,7 +448,7 @@ class npc_high_oracle_soo_roo : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -462,7 +462,7 @@ class npc_high_oracle_soo_roo : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -510,7 +510,7 @@ class npc_high_oracle_soo_roo : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_high_oracle_soo_rooAI(creature); } @@ -528,7 +528,7 @@ class npc_elder_kekek : public CreatureScript { npc_elder_kekekAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { timer = 0; phase = 0; @@ -536,7 +536,7 @@ class npc_elder_kekek : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -550,7 +550,7 @@ class npc_elder_kekek : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -597,7 +597,7 @@ class npc_elder_kekek : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_elder_kekekAI(creature); } @@ -616,7 +616,7 @@ class npc_the_etymidian : public CreatureScript { npc_the_etymidianAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { timer = 0; phase = 0; @@ -624,7 +624,7 @@ class npc_the_etymidian : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -638,7 +638,7 @@ class npc_the_etymidian : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -693,7 +693,7 @@ class npc_the_etymidian : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_the_etymidianAI(creature); } @@ -711,7 +711,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript { npc_alexstraza_the_lifebinderAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { timer = 0; phase = 0; @@ -719,7 +719,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript orphanGUID = 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { // Existing SmartAI if (type == 0) @@ -736,7 +736,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -759,7 +759,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -853,7 +853,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_alexstraza_the_lifebinderAI(creature); } @@ -930,7 +930,7 @@ class npc_cw_area_trigger : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who && me->GetDistance2d(who) < 20.0f) @@ -1006,7 +1006,7 @@ class npc_cw_area_trigger : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_cw_area_triggerAI(creature); } @@ -1027,7 +1027,7 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who && who->GetDistance2d(me) < 10.0f) @@ -1041,7 +1041,7 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_grizzlemaw_cw_triggerAI(creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 14a5c421f1f..f1df7c09d9e 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -41,7 +41,7 @@ class go_blackfathom_altar : public GameObjectScript public: go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player); @@ -54,7 +54,7 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); @@ -74,7 +74,7 @@ class npc_blackfathom_deeps_event : public CreatureScript public: npc_blackfathom_deeps_event() : CreatureScript("npc_blackfathom_deeps_event") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blackfathom_deeps_eventAI(creature); } @@ -100,7 +100,7 @@ class npc_blackfathom_deeps_event : public CreatureScript bool Flee; - void Reset() OVERRIDE + void Reset() override { Flee = false; @@ -133,7 +133,7 @@ class npc_blackfathom_deeps_event : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -182,7 +182,7 @@ class npc_blackfathom_deeps_event : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (me->IsSummon()) //we are not a normal spawn. if (instance) @@ -211,7 +211,7 @@ class npc_morridune : public CreatureScript Start(false, false, 0); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -224,13 +224,13 @@ class npc_morridune : public CreatureScript } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { DoCast(player, SPELL_TELEPORT_DARNASSUS); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_morriduneAI(creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 9991a886592..7f86867ad56 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -43,24 +43,24 @@ class boss_aku_mai : public CreatureScript { boss_aku_maiAI(Creature* creature) : BossAI(creature, TYPE_AKU_MAI) { } - void Reset() OVERRIDE + void Reset() override { IsEnraged = false; _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -93,7 +93,7 @@ class boss_aku_mai : public CreatureScript bool IsEnraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_aku_maiAI(creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 3e35e0840bf..d8cc214a5b9 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -32,7 +32,7 @@ class boss_gelihast : public CreatureScript public: boss_gelihast() : CreatureScript("boss_gelihast") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gelihastAI(creature); } @@ -48,26 +48,26 @@ class boss_gelihast : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { netTimer = urand(2000, 4000); if (instance) instance->SetData(TYPE_GELIHAST, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(TYPE_GELIHAST, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_GELIHAST, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 492256130d7..1dc82b62c53 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -37,7 +37,7 @@ class boss_kelris : public CreatureScript public: boss_kelris() : CreatureScript("boss_kelris") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kelrisAI(creature); } @@ -54,7 +54,7 @@ class boss_kelris : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { mindBlastTimer = urand(2000, 5000); sleepTimer = urand(9000, 12000); @@ -62,21 +62,21 @@ class boss_kelris : public CreatureScript instance->SetData(TYPE_KELRIS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_KELRIS, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_KELRIS, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 338fe45475c..820c93284f8 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -59,7 +59,7 @@ class instance_blackfathom_deeps : public InstanceMapScript public: instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blackfathom_deeps_InstanceMapScript(map); } @@ -81,7 +81,7 @@ class instance_blackfathom_deeps : public InstanceMapScript uint8 countFires; uint8 deathTimes; - void Initialize() OVERRIDE + void Initialize() override { memset(&encounter, 0, sizeof(encounter)); @@ -97,7 +97,7 @@ class instance_blackfathom_deeps : public InstanceMapScript deathTimes = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -110,7 +110,7 @@ class instance_blackfathom_deeps : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -144,7 +144,7 @@ class instance_blackfathom_deeps : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -214,7 +214,7 @@ class instance_blackfathom_deeps : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -235,7 +235,7 @@ class instance_blackfathom_deeps : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 69794bda74a..b5f779b7f12 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -48,7 +48,7 @@ class boss_anetheron : public CreatureScript public: boss_anetheron() : CreatureScript("boss_anetheron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_anetheronAI(creature); } @@ -67,7 +67,7 @@ class boss_anetheron : public CreatureScript uint32 InfernoTimer; bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; SwarmTimer = 45000; @@ -79,19 +79,19 @@ class boss_anetheron : public CreatureScript instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -101,7 +101,7 @@ class boss_anetheron : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -109,7 +109,7 @@ class boss_anetheron : public CreatureScript Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { @@ -179,7 +179,7 @@ class npc_towering_infernal : public CreatureScript public: npc_towering_infernal() : CreatureScript("npc_towering_infernal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_towering_infernalAI(creature); } @@ -198,33 +198,33 @@ class npc_towering_infernal : public CreatureScript uint64 AnetheronGUID; InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_INFERNO_EFFECT); ImmolationTimer = 5000; CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 137348c9e15..590591ef52d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -83,7 +83,7 @@ class npc_ancient_wisp : public CreatureScript public: npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ancient_wispAI(creature); } @@ -100,7 +100,7 @@ class npc_ancient_wisp : public CreatureScript uint64 ArchimondeGUID; uint32 CheckTimer; - void Reset() OVERRIDE + void Reset() override { CheckTimer = 1000; @@ -110,14 +110,14 @@ class npc_ancient_wisp : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { damage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { @@ -141,7 +141,7 @@ class npc_doomfire : public CreatureScript public: npc_doomfire() : CreatureScript("npc_doomfire") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doomfireAI(creature); } @@ -150,13 +150,13 @@ class npc_doomfire : public CreatureScript { npc_doomfireAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { damage = 0; } @@ -170,7 +170,7 @@ class npc_doomfire_targetting : public CreatureScript public: npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doomfire_targettingAI(creature); } @@ -182,13 +182,13 @@ class npc_doomfire_targetting : public CreatureScript uint64 TargetGUID; uint32 ChangeTargetTimer; - void Reset() OVERRIDE + void Reset() override { TargetGUID = 0; ChangeTargetTimer = 5000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0 @@ -197,14 +197,14 @@ class npc_doomfire_targetting : public CreatureScript TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { damage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (ChangeTargetTimer <= diff) { @@ -239,7 +239,7 @@ class boss_archimonde : public CreatureScript public: boss_archimonde() : CreatureScript("boss_archimonde") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_archimondeAI(creature); } @@ -275,7 +275,7 @@ class boss_archimonde : public CreatureScript bool HasProtected; bool IsChanneling; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); @@ -304,7 +304,7 @@ class boss_archimonde : public CreatureScript IsChanneling = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->InterruptSpell(CURRENT_CHANNELED_SPELL); Talk(SAY_AGGRO); @@ -314,7 +314,7 @@ class boss_archimonde : public CreatureScript instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { Talk(SAY_SLAY); @@ -347,7 +347,7 @@ class boss_archimonde : public CreatureScript ++SoulChargeCount; } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); Talk(SAY_DEATH); @@ -392,7 +392,7 @@ class boss_archimonde : public CreatureScript return false; } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) summoned->AI()->AttackStart(me); @@ -469,7 +469,7 @@ class boss_archimonde : public CreatureScript SoulChargeTimer = urand(2000, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) { @@ -640,7 +640,7 @@ class boss_archimonde : public CreatureScript DoMeleeAttackIfReady(); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } + void WaypointReached(uint32 /*waypointId*/) override { } }; }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 7c2b3af98d3..832a2b4b7b3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -49,7 +49,7 @@ class boss_azgalor : public CreatureScript public: boss_azgalor() : CreatureScript("boss_azgalor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_azgalorAI(creature); } @@ -71,7 +71,7 @@ class boss_azgalor : public CreatureScript bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; RainTimer = 20000; @@ -85,19 +85,19 @@ class boss_azgalor : public CreatureScript instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -107,7 +107,7 @@ class boss_azgalor : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -115,7 +115,7 @@ class boss_azgalor : public CreatureScript Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { @@ -186,7 +186,7 @@ class npc_lesser_doomguard : public CreatureScript public: npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lesser_doomguardAI(creature); } @@ -206,7 +206,7 @@ class npc_lesser_doomguard : public CreatureScript uint64 AzgalorGUID; InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { CrippleTimer = 50000; WarstompTimer = 10000; @@ -214,30 +214,30 @@ class npc_lesser_doomguard : public CreatureScript CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE + void WaypointReached(uint32 /*waypointId*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 6e9ae02b079..d7635995a60 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -50,7 +50,7 @@ class boss_kazrogal : public CreatureScript public: boss_kazrogal() : CreatureScript("boss_kazrogal") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kazrogalAI(creature); } @@ -69,7 +69,7 @@ class boss_kazrogal : public CreatureScript uint32 MarkTimerBase; bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; CleaveTimer = 5000; @@ -81,19 +81,19 @@ class boss_kazrogal : public CreatureScript instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -103,7 +103,7 @@ class boss_kazrogal : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -111,7 +111,7 @@ class boss_kazrogal : public CreatureScript DoPlaySoundToSet(me, SOUND_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { @@ -193,7 +193,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader targets.remove_if(MarkTargetFilter()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } @@ -203,7 +203,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazrogal_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_DAMAGE)) return false; @@ -222,18 +222,18 @@ class spell_mark_of_kazrogal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mark_of_kazrogal_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mark_of_kazrogal_AuraScript(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index e4d317b0f08..eff77f35e4a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -45,7 +45,7 @@ class boss_rage_winterchill : public CreatureScript public: boss_rage_winterchill() : CreatureScript("boss_rage_winterchill") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rage_winterchillAI(creature); } @@ -64,7 +64,7 @@ class boss_rage_winterchill : public CreatureScript uint32 IceboltTimer; bool go; - void Reset() OVERRIDE + void Reset() override { damageTaken = 0; FrostArmorTimer = 37000; @@ -76,19 +76,19 @@ class boss_rage_winterchill : public CreatureScript instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance) { @@ -98,7 +98,7 @@ class boss_rage_winterchill : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -106,7 +106,7 @@ class boss_rage_winterchill : public CreatureScript Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsEvent) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 3386561b7ec..c5ea2ded05b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -54,7 +54,7 @@ class npc_jaina_proudmoore : public CreatureScript public: npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -79,7 +79,7 @@ class npc_jaina_proudmoore : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -101,7 +101,7 @@ class npc_jaina_proudmoore : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { hyjalAI* ai = new hyjalAI(creature); @@ -129,7 +129,7 @@ class npc_thrall : public CreatureScript public: npc_thrall() : CreatureScript("npc_thrall") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -155,7 +155,7 @@ class npc_thrall : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -182,7 +182,7 @@ class npc_thrall : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { hyjalAI* ai = new hyjalAI(creature); @@ -206,7 +206,7 @@ class npc_tyrande_whisperwind : public CreatureScript public: npc_tyrande_whisperwind() : CreatureScript("npc_tyrande_whisperwind") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { hyjalAI* ai = new hyjalAI(creature); ai->Reset(); @@ -214,7 +214,7 @@ class npc_tyrande_whisperwind : public CreatureScript return ai; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -230,7 +230,7 @@ class npc_tyrande_whisperwind : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 881e28b8215..418505c7f5e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -438,16 +438,16 @@ class npc_giant_infernal : public CreatureScript uint32 FlameBuffetTimer; bool imol; - void Reset() OVERRIDE + void Reset() override { spawnTimer = 2000; FlameBuffetTimer= 2000; imol = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 0 && instance && !IsOverrun) { @@ -460,7 +460,7 @@ class npc_giant_infernal : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Delay <= diff) { @@ -537,7 +537,7 @@ class npc_giant_infernal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_giant_infernalAI(creature); } @@ -548,7 +548,7 @@ class npc_abomination : public CreatureScript public: npc_abomination() : CreatureScript("npc_abomination") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_abominationAI(creature); } @@ -564,12 +564,12 @@ class npc_abomination : public CreatureScript bool go; uint32 KnockDownTimer; - void Reset() OVERRIDE + void Reset() override { KnockDownTimer = 10000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance && !IsOverrun) { @@ -596,9 +596,9 @@ class npc_abomination : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -645,7 +645,7 @@ class npc_ghoul : public CreatureScript public: npc_ghoul() : CreatureScript("npc_ghoul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ghoulAI(creature); } @@ -663,14 +663,14 @@ class npc_ghoul : public CreatureScript uint32 FrenzyTimer; uint32 MoveTimer; bool RandomMove; - void Reset() OVERRIDE + void Reset() override { FrenzyTimer = 5000+rand()%5000; MoveTimer = 2000; RandomMove = false; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance && !IsOverrun) { @@ -698,9 +698,9 @@ class npc_ghoul : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -746,7 +746,7 @@ class npc_necromancer : public CreatureScript public: npc_necromancer() : CreatureScript("npc_necromancer") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_necromancerAI(creature); } @@ -764,13 +764,13 @@ class npc_necromancer : public CreatureScript bool go; uint32 ShadowBoltTimer; - void Reset() OVERRIDE + void Reset() override { ShadowBoltTimer = 1000+rand()%5000; summons.DespawnAll(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (target) @@ -778,12 +778,12 @@ class npc_necromancer : public CreatureScript summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance && !IsOverrun) { @@ -802,7 +802,7 @@ class npc_necromancer : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { switch (urand(0, 2)) { @@ -820,9 +820,9 @@ class npc_necromancer : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); @@ -872,7 +872,7 @@ class npc_banshee : public CreatureScript public: npc_banshee() : CreatureScript("npc_banshee") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bansheeAI(creature); } @@ -891,14 +891,14 @@ class npc_banshee : public CreatureScript uint32 WailTimer; uint32 ShellTimer; - void Reset() OVERRIDE + void Reset() override { CourseTimer = 20000+rand()%5000; WailTimer = 15000+rand()%5000; ShellTimer = 50000+rand()%10000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance && !IsOverrun) { @@ -917,9 +917,9 @@ class npc_banshee : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -974,7 +974,7 @@ class npc_crypt_fiend : public CreatureScript public: npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crypt_fiendAI(creature); } @@ -991,12 +991,12 @@ class npc_crypt_fiend : public CreatureScript bool go; uint32 WebTimer; - void Reset() OVERRIDE + void Reset() override { WebTimer = 20000+rand()%5000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance && !IsOverrun) { @@ -1015,9 +1015,9 @@ class npc_crypt_fiend : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1062,7 +1062,7 @@ class npc_fel_stalker : public CreatureScript public: npc_fel_stalker() : CreatureScript("npc_fel_stalker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fel_stalkerAI(creature); } @@ -1079,12 +1079,12 @@ class npc_fel_stalker : public CreatureScript bool go; uint32 ManaBurnTimer; - void Reset() OVERRIDE + void Reset() override { ManaBurnTimer = 9000+rand()%5000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 7 && instance && !IsOverrun) { @@ -1103,9 +1103,9 @@ class npc_fel_stalker : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1150,7 +1150,7 @@ class npc_frost_wyrm : public CreatureScript public: npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frost_wyrmAI(creature); } @@ -1168,14 +1168,14 @@ class npc_frost_wyrm : public CreatureScript uint32 FrostBreathTimer; uint32 MoveTimer; - void Reset() OVERRIDE + void Reset() override { FrostBreathTimer = 5000; MoveTimer = 0; me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 2 && instance && !IsOverrun) { @@ -1188,7 +1188,7 @@ class npc_frost_wyrm : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance && IsEvent) instance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1200,9 +1200,9 @@ class npc_frost_wyrm : public CreatureScript me->SetPosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1261,7 +1261,7 @@ class npc_gargoyle : public CreatureScript public: npc_gargoyle() : CreatureScript("npc_gargoyle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_gargoyleAI(creature); } @@ -1282,7 +1282,7 @@ class npc_gargoyle : public CreatureScript float Zpos; bool forcemove; - void Reset() OVERRIDE + void Reset() override { forcemove = true; Zpos = 10.0f; @@ -1291,7 +1291,7 @@ class npc_gargoyle : public CreatureScript me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 2 && instance && !IsOverrun) { @@ -1304,7 +1304,7 @@ class npc_gargoyle : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { float x, y, z; me->GetPosition(x, y, z); @@ -1314,7 +1314,7 @@ class npc_gargoyle : public CreatureScript hyjal_trashAI::JustDied(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1395,7 +1395,7 @@ class alliance_rifleman : public CreatureScript public: alliance_rifleman() : CreatureScript("alliance_rifleman") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new alliance_riflemanAI(creature); } @@ -1409,16 +1409,16 @@ class alliance_rifleman : public CreatureScript uint32 ExplodeTimer; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void Reset() OVERRIDE + void Reset() override { ExplodeTimer = 5000+rand()%5000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -1432,11 +1432,11 @@ class alliance_rifleman : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index cc0d22350ea..baf108267db 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -50,7 +50,7 @@ class instance_hyjal : public InstanceMapScript public: instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_mount_hyjal_InstanceMapScript(map); } @@ -59,7 +59,7 @@ class instance_hyjal : public InstanceMapScript { instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -83,7 +83,7 @@ class instance_hyjal : public InstanceMapScript ArchiYell = false; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < EncounterCount; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -92,7 +92,7 @@ class instance_hyjal : public InstanceMapScript return false; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -116,7 +116,7 @@ class instance_hyjal : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -131,7 +131,7 @@ class instance_hyjal : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -148,7 +148,7 @@ class instance_hyjal : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -285,7 +285,7 @@ class instance_hyjal : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -302,12 +302,12 @@ class instance_hyjal : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index 67ca9962f65..d30fd79937e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -53,7 +53,7 @@ class boss_epoch : public CreatureScript public: boss_epoch() : CreatureScript("boss_epoch") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_epochAI(creature); } @@ -75,7 +75,7 @@ class boss_epoch : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiStep = 1; uiStepTimer = 26000; @@ -88,7 +88,7 @@ class boss_epoch : public CreatureScript instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -96,7 +96,7 @@ class boss_epoch : public CreatureScript instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -131,7 +131,7 @@ class boss_epoch : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -139,7 +139,7 @@ class boss_epoch : public CreatureScript instance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index 959ded27c32..2f72f6d1cae 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -40,7 +40,7 @@ class boss_infinite_corruptor : public CreatureScript public: boss_infinite_corruptor() : CreatureScript("boss_infinite_corruptor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_infinite_corruptorAI(creature); } @@ -54,20 +54,20 @@ class boss_infinite_corruptor : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { //Return since we have no target if (!UpdateVictim()) @@ -76,7 +76,7 @@ class boss_infinite_corruptor : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); if (instance) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index fbfa16ea5d4..f1c6d5baf74 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -67,7 +67,7 @@ class boss_mal_ganis : public CreatureScript public: boss_mal_ganis() : CreatureScript("boss_mal_ganis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mal_ganisAI(creature); } @@ -94,7 +94,7 @@ class boss_mal_ganis : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { bYelled = false; bYelled2 = false; @@ -109,20 +109,20 @@ class boss_mal_ganis : public CreatureScript instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage >= me->GetHealth() && done_by != me) damage = me->GetHealth()-1; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { switch (Phase) { @@ -228,7 +228,7 @@ class boss_mal_ganis : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -239,7 +239,7 @@ class boss_mal_ganis : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 24b5b792bf8..08293a64e28 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -52,7 +52,7 @@ class boss_meathook : public CreatureScript public: boss_meathook() : CreatureScript("boss_meathook") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_meathookAI(creature); } @@ -72,7 +72,7 @@ class boss_meathook : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 uiDiseaseTimer = urand(2000, 4000); //approx 3s @@ -82,7 +82,7 @@ class boss_meathook : public CreatureScript instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -90,7 +90,7 @@ class boss_meathook : public CreatureScript instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -118,7 +118,7 @@ class boss_meathook : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -126,7 +126,7 @@ class boss_meathook : public CreatureScript instance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index ace1c5d1389..16d29cc351d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -57,7 +57,7 @@ class boss_salramm : public CreatureScript public: boss_salramm() : CreatureScript("boss_salramm") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_salrammAI(creature); } @@ -79,7 +79,7 @@ class boss_salramm : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiCurseFleshTimer = 30000; //30s DBM uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls @@ -91,7 +91,7 @@ class boss_salramm : public CreatureScript instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -99,7 +99,7 @@ class boss_salramm : public CreatureScript instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -141,7 +141,7 @@ class boss_salramm : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -149,7 +149,7 @@ class boss_salramm : public CreatureScript instance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index a584c0a052e..c62dba063f2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -258,7 +258,7 @@ class npc_arthas : public CreatureScript public: npc_arthas() : CreatureScript("npc_arthas") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -301,7 +301,7 @@ class npc_arthas : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -345,7 +345,7 @@ class npc_arthas : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_arthasAI(creature); } @@ -382,7 +382,7 @@ class npc_arthas : public CreatureScript uint32 exorcismTimer; - void Reset() OVERRIDE + void Reset() override { utherGUID = 0; jainaGUID = 0; @@ -420,12 +420,12 @@ class npc_arthas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_ARTHAS_EVENT, FAIL); @@ -473,7 +473,7 @@ class npc_arthas : public CreatureScript ++step; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -592,7 +592,7 @@ class npc_arthas : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -1244,7 +1244,7 @@ class npc_crate_helper : public CreatureScript _marked = false; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked) { @@ -1263,7 +1263,7 @@ class npc_crate_helper : public CreatureScript bool _marked; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crate_helperAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 98c05f90e61..c16b2d22379 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -48,7 +48,7 @@ class instance_culling_of_stratholme : public InstanceMapScript public: instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_culling_of_stratholme_InstanceMapScript(map); } @@ -73,7 +73,7 @@ class instance_culling_of_stratholme : public InstanceMapScript _crateCount = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (_encounterState[i] == IN_PROGRESS) @@ -82,7 +82,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return false; } - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE + void FillInitialWorldStates(WorldStateBuilder& builder) override { builder.AppendState(WORLDSTATE_SHOW_CRATES, 1); builder.AppendState(WORLDSTATE_CRATES_REVEALED, _crateCount); @@ -91,7 +91,7 @@ class instance_culling_of_stratholme : public InstanceMapScript builder.AppendState(WORLDSTATE_TIME_GUARDIAN_SHOW, 0); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -119,7 +119,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -146,7 +146,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -201,7 +201,7 @@ class instance_culling_of_stratholme : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -221,7 +221,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -251,7 +251,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -263,7 +263,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 6645ceec37a..434ae2111fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -54,7 +54,7 @@ class boss_captain_skarloc : public CreatureScript public: boss_captain_skarloc() : CreatureScript("boss_captain_skarloc") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_captain_skarlocAI(creature); } @@ -75,7 +75,7 @@ class boss_captain_skarloc : public CreatureScript uint32 DevotionAura_Timer; uint32 Consecration_Timer; - void Reset() OVERRIDE + void Reset() override { Holy_Light_Timer = urand(20000, 30000); Cleanse_Timer = 10000; @@ -85,19 +85,19 @@ class boss_captain_skarloc : public CreatureScript Consecration_Timer = 8000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { //This is not correct. Should taunt Thrall before engage in combat Talk(SAY_TAUNT1); Talk(SAY_TAUNT2); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -105,7 +105,7 @@ class boss_captain_skarloc : public CreatureScript instance->SetData(TYPE_THRALL_PART1, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index a5761588299..5895f1614f8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -52,7 +52,7 @@ class boss_epoch_hunter : public CreatureScript public: boss_epoch_hunter() : CreatureScript("boss_epoch_hunter") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_epoch_hunterAI(creature); } @@ -71,7 +71,7 @@ class boss_epoch_hunter : public CreatureScript uint32 WingBuffet_Timer; uint32 Mda_Timer; - void Reset() OVERRIDE + void Reset() override { SandBreath_Timer = urand(8000, 16000); ImpendingDeath_Timer = urand(25000, 30000); @@ -79,17 +79,17 @@ class boss_epoch_hunter : public CreatureScript Mda_Timer = 40000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -97,7 +97,7 @@ class boss_epoch_hunter : public CreatureScript instance->SetData(TYPE_THRALL_PART4, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 173f48c8d72..5c914893c52 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -39,7 +39,7 @@ class go_barrel_old_hillsbrad : public GameObjectScript public: go_barrel_old_hillsbrad() : GameObjectScript("go_barrel_old_hillsbrad") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -108,7 +108,7 @@ class boss_lieutenant_drake : public CreatureScript public: boss_lieutenant_drake() : CreatureScript("boss_lieutenant_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lieutenant_drakeAI(creature); } @@ -125,7 +125,7 @@ class boss_lieutenant_drake : public CreatureScript uint32 MortalStrike_Timer; uint32 ExplodingShout_Timer; - void Reset() OVERRIDE + void Reset() override { CanPatrol = true; wpId = 0; @@ -136,22 +136,22 @@ class boss_lieutenant_drake : public CreatureScript ExplodingShout_Timer = 25000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { /// @todo make this work if (CanPatrol && wpId == 0) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index e3af6aaa0dc..4e2002942ae 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -47,7 +47,7 @@ class instance_old_hillsbrad : public InstanceMapScript public: instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_old_hillsbrad_InstanceMapScript(map); } @@ -64,7 +64,7 @@ class instance_old_hillsbrad : public InstanceMapScript uint64 TarethaGUID; uint64 EpochGUID; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -106,7 +106,7 @@ class instance_old_hillsbrad : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -122,7 +122,7 @@ class instance_old_hillsbrad : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { Player* player = GetPlayerInMap(); @@ -205,7 +205,7 @@ class instance_old_hillsbrad : public InstanceMapScript } } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { switch (data) { @@ -225,7 +225,7 @@ class instance_old_hillsbrad : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 16f48739c31..84c5bce8af7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -58,7 +58,7 @@ class npc_erozion : public CreatureScript public: npc_erozion() : CreatureScript("npc_erozion") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -78,7 +78,7 @@ class npc_erozion : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -187,12 +187,12 @@ class npc_thrall_old_hillsbrad : public CreatureScript public: npc_thrall_old_hillsbrad() : CreatureScript("npc_thrall_old_hillsbrad") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_thrall_old_hillsbradAI(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -242,7 +242,7 @@ class npc_thrall_old_hillsbrad : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) { @@ -290,7 +290,7 @@ class npc_thrall_old_hillsbrad : public CreatureScript bool LowHp; bool HadMount; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (!instance) return; @@ -459,7 +459,7 @@ class npc_thrall_old_hillsbrad : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { LowHp = false; @@ -494,7 +494,7 @@ class npc_thrall_old_hillsbrad : public CreatureScript me->Dismount(); me->SetSpeed(MOVE_RUN, SPEED_RUN); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) @@ -504,7 +504,7 @@ class npc_thrall_old_hillsbrad : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -521,11 +521,11 @@ class npc_thrall_old_hillsbrad : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_TH_RANDOM_KILL); } - void JustDied(Unit* slayer) OVERRIDE + void JustDied(Unit* slayer) override { if (instance) instance->SetData(TYPE_THRALL_EVENT, FAIL); @@ -537,7 +537,7 @@ class npc_thrall_old_hillsbrad : public CreatureScript Talk(SAY_TH_RANDOM_DIE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -571,12 +571,12 @@ class npc_taretha : public CreatureScript public: npc_taretha() : CreatureScript("npc_taretha") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tarethaAI(creature); } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -606,7 +606,7 @@ class npc_taretha : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetData(TYPE_THRALL_PART3) == DONE && instance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) @@ -626,7 +626,7 @@ class npc_taretha : public CreatureScript InstanceScript* instance; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -639,10 +639,10 @@ class npc_taretha : public CreatureScript } } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 574bdcd9c07..28c1d2d7eea 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -61,9 +61,9 @@ class boss_aeonus : public CreatureScript { boss_aeonusAI(Creature* creature) : BossAI(creature, TYPE_AEONUS) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000)); events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000)); @@ -72,7 +72,7 @@ class boss_aeonus : public CreatureScript Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //Despawn Time Keeper @@ -88,7 +88,7 @@ class boss_aeonus : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -99,12 +99,12 @@ class boss_aeonus : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -140,7 +140,7 @@ class boss_aeonus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_aeonusAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 42ce0c46d7d..ec1e3944e30 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -62,9 +62,9 @@ class boss_chrono_lord_deja : public CreatureScript { boss_chrono_lord_dejaAI(Creature* creature) : BossAI(creature, TYPE_CRONO_LORD_DEJA) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000)); events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000)); @@ -75,7 +75,7 @@ class boss_chrono_lord_deja : public CreatureScript Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //Despawn Time Keeper @@ -91,12 +91,12 @@ class boss_chrono_lord_deja : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -104,7 +104,7 @@ class boss_chrono_lord_deja : public CreatureScript instance->SetData(TYPE_RIFT, SPECIAL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -145,7 +145,7 @@ class boss_chrono_lord_deja : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_chrono_lord_dejaAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 7977637db07..c4b490da674 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -61,9 +61,9 @@ class boss_temporus : public CreatureScript { boss_temporusAI(Creature* creature) : BossAI(creature, TYPE_TEMPORUS) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000)); events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); @@ -74,12 +74,12 @@ class boss_temporus : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -87,7 +87,7 @@ class boss_temporus : public CreatureScript instance->SetData(TYPE_RIFT, SPECIAL); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { //Despawn Time Keeper @@ -104,7 +104,7 @@ class boss_temporus : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -143,7 +143,7 @@ class boss_temporus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_temporusAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 4e379802946..dabffbe866a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -75,7 +75,7 @@ class instance_the_black_morass : public InstanceMapScript public: instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", 269) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_black_morass_InstanceMapScript(map); } @@ -94,7 +94,7 @@ class instance_the_black_morass : public InstanceMapScript uint64 _medivhGUID; uint8 _currentRiftId; - void Initialize() OVERRIDE + void Initialize() override { _medivhGUID = 0; Clear(); @@ -119,7 +119,7 @@ class instance_the_black_morass : public InstanceMapScript DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return true; @@ -127,7 +127,7 @@ class instance_the_black_morass : public InstanceMapScript return false; } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return; @@ -135,7 +135,7 @@ class instance_the_black_morass : public InstanceMapScript player->SendUpdateWorldState(WORLD_STATE_BM, 0); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (creature->GetEntry() == NPC_MEDIVH) _medivhGUID = creature->GetGUID(); @@ -167,7 +167,7 @@ class instance_the_black_morass : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -238,7 +238,7 @@ class instance_the_black_morass : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -254,7 +254,7 @@ class instance_the_black_morass : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { if (data == DATA_MEDIVH) return _medivhGUID; @@ -319,7 +319,7 @@ class instance_the_black_morass : public InstanceMapScript } } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (m_auiEncounter[1] != IN_PROGRESS) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 5d13400dd44..39a6c9b7ad2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -70,7 +70,7 @@ class npc_medivh_bm : public CreatureScript public: npc_medivh_bm() : CreatureScript("npc_medivh_bm") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_medivh_bmAI(creature); } @@ -91,7 +91,7 @@ class npc_medivh_bm : public CreatureScript bool Life50; bool Life25; - void Reset() OVERRIDE + void Reset() override { SpellCorrupt_Timer = 0; Check_Timer = 0; @@ -110,7 +110,7 @@ class npc_medivh_bm : public CreatureScript DoCast(me, SPELL_PORTAL_RUNE, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!instance) @@ -145,7 +145,7 @@ class npc_medivh_bm : public CreatureScript } } - void AttackStart(Unit* /*who*/) OVERRIDE + void AttackStart(Unit* /*who*/) override { //if (instance && instance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; @@ -153,9 +153,9 @@ class npc_medivh_bm : public CreatureScript //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (SpellCorrupt_Timer) return; @@ -167,7 +167,7 @@ class npc_medivh_bm : public CreatureScript SpellCorrupt_Timer = 3000; } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer->GetEntry() == me->GetEntry()) return; @@ -175,7 +175,7 @@ class npc_medivh_bm : public CreatureScript Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; @@ -267,7 +267,7 @@ class npc_time_rift : public CreatureScript public: npc_time_rift() : CreatureScript("npc_time_rift") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_time_riftAI(creature); } @@ -286,7 +286,7 @@ class npc_time_rift : public CreatureScript uint8 mPortalCount; uint8 mWaveId; - void Reset() OVERRIDE + void Reset() override { TimeRiftWave_Timer = 15000; mRiftWaveCount = 0; @@ -303,7 +303,7 @@ class npc_time_rift : public CreatureScript else mWaveId = 1; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void DoSummonAtRift(uint32 creature_entry) { @@ -347,7 +347,7 @@ class npc_time_rift : public CreatureScript } else DoSummonAtRift(entry); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; @@ -383,7 +383,7 @@ class npc_saat : public CreatureScript public: npc_saat() : CreatureScript("npc_saat") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -394,7 +394,7 @@ class npc_saat : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index a19a7c2c414..d525fb83a6d 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -33,7 +33,7 @@ class instance_dire_maul : public InstanceMapScript public: instance_dire_maul() : InstanceMapScript("instance_dire_maul", 429) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_dire_maul_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 26887815ac3..bbabb34b0b9 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -180,7 +180,7 @@ class npc_harbinger_of_flame : public CreatureScript { } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { if (Creature* bird = ObjectAccessor::GetCreature(*me, me->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))) DoZoneInCombat(bird, 200.0f); @@ -191,12 +191,12 @@ class npc_harbinger_of_flame : public CreatureScript _events.ScheduleEvent(EVENT_FIEROCLAST_BARRAGE, 6000); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { AlysrazorTrashEvaded(me); } - void MoveInLineOfSight(Unit* unit) OVERRIDE + void MoveInLineOfSight(Unit* unit) override { if (me->IsInCombat()) return; @@ -207,7 +207,7 @@ class npc_harbinger_of_flame : public CreatureScript ScriptedAI::MoveInLineOfSight(unit); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) if (!me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) @@ -245,7 +245,7 @@ class npc_harbinger_of_flame : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_harbinger_of_flameAI(creature); } @@ -262,25 +262,25 @@ class npc_blazing_monstrosity : public CreatureScript { } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { _summons.DespawnAll(); _events.Reset(); PassiveAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _summons.DespawnAll(); _events.Reset(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { AlysrazorTrashEvaded(me); } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { DoZoneInCombat(); me->RemoveAurasDueToSpell(SPELL_SLEEP_ULTRA_HIGH_PRIORITY); @@ -290,7 +290,7 @@ class npc_blazing_monstrosity : public CreatureScript _events.ScheduleEvent(EVENT_CONTINUE_SPITTING, 9000); } - void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) override { if (!apply) return; @@ -308,17 +308,17 @@ class npc_blazing_monstrosity : public CreatureScript init.Launch(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { _summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { _summons.Despawn(summon); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -347,7 +347,7 @@ class npc_blazing_monstrosity : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blazing_monstrosityAI(creature); } @@ -364,20 +364,20 @@ class npc_molten_barrage : public CreatureScript { } - void AttackStart(Unit* target) OVERRIDE + void AttackStart(Unit* target) override { if (target) me->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f, MOTION_SLOT_IDLE); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCastAOE(SPELL_AGGRO_CLOSEST, true); DoCast(me, SPELL_MOLTEN_BARRAGE_VISUAL); DoCast(me, SPELL_INVISIBILITY_AND_STEALTH_DETECTION, true); } - void MovementInform(uint32 movementType, uint32 /*pointId*/) OVERRIDE + void MovementInform(uint32 movementType, uint32 /*pointId*/) override { if (movementType != EFFECT_MOTION_TYPE) return; @@ -387,7 +387,7 @@ class npc_molten_barrage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_molten_barrageAI(creature); } @@ -404,16 +404,16 @@ class npc_egg_pile : public CreatureScript { } - void AttackStart(Unit* /*target*/) OVERRIDE { } + void AttackStart(Unit* /*target*/) override { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); _events.Reset(); _callHatchlingSpell = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _events.Reset(); std::list eggs; @@ -424,12 +424,12 @@ class npc_egg_pile : public CreatureScript DoCast(me, SPELL_ALYSRAZOR_COSMETIC_EGG_XPLOSION, true); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { AlysrazorTrashEvaded(me); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != NPC_BLAZING_MONSTROSITY_LEFT && action != NPC_BLAZING_MONSTROSITY_RIGHT) @@ -444,7 +444,7 @@ class npc_egg_pile : public CreatureScript _events.ScheduleEvent(EVENT_SUMMON_SMOULDERING_HATCHLING, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -490,7 +490,7 @@ class npc_egg_pile : public CreatureScript uint32 _callHatchlingSpell; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_egg_pileAI(creature); } @@ -505,7 +505,7 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_cosmetic_egg_xplosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(MODEL_INVISIBLE_STALKER)) return false; @@ -520,13 +520,13 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader creature->DespawnOrUnsummon(4000); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_cosmetic_egg_xplosion_SpellScript(); } @@ -541,7 +541,7 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_turn_monstrosity_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GENERIC_DUMMY_CAST)) return false; @@ -608,14 +608,14 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader GetHitUnit()->PlayOneShotAnimKit(ANIM_KIT_BIRD_TURN); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_turn_monstrosity_SpellScript(); } @@ -630,7 +630,7 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_aggro_closest_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -648,14 +648,14 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader GetCaster()->GetAI()->AttackStart(GetCaster()->ToCreature()->SelectVictim()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); AfterCast += SpellCastFn(spell_alysrazor_aggro_closest_SpellScript::UpdateThreat); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_aggro_closest_SpellScript(); } @@ -670,7 +670,7 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader { PrepareSpellScript(spell_alysrazor_fieroblast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FIRE_IT_UP)) return false; @@ -682,13 +682,13 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_FIRE_IT_UP, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_alysrazor_fieroblast_SpellScript::FireItUp); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alysrazor_fieroblast_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index 7f51c65588a..5e773edc663 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -33,12 +33,12 @@ class instance_firelands : public InstanceMapScript { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -50,7 +50,7 @@ class instance_firelands : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_firelands_InstanceScript(map); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index 8fd5b32e197..b646338f20f 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -144,7 +144,7 @@ class boss_anraphet : public CreatureScript events.ScheduleEvent(EVENT_ANRAPHET_OMEGA_STANCE, 35000, 0, PHASE_COMBAT); } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetWalk(false); @@ -159,14 +159,14 @@ class boss_anraphet : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(ANRAPHET_SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(ANRAPHET_SAY_DEATH); @@ -177,26 +177,26 @@ class boss_anraphet : public CreatureScript _JustDied(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(ANRAPHET_SAY_KILL); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_ANRAPHET, FAIL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_ANRAPHET_INTRO) events.ScheduleEvent(EVENT_ANRAPHET_APPEAR, 6000, 0, PHASE_INTRO); } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != POINT_MOTION_TYPE) return; @@ -208,7 +208,7 @@ class boss_anraphet : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((events.GetPhaseMask() & PHASE_MASK_COMBAT) && (!UpdateVictim() || !CheckInRoom())) return; @@ -267,7 +267,7 @@ class boss_anraphet : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI(creature); } @@ -282,15 +282,15 @@ class npc_omega_stance : public CreatureScript { npc_omega_stanceAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*who*/) OVERRIDE + void IsSummonedBy(Unit* /*who*/) override { DoCast(me, SPELL_OMEGA_STANCE_SPIDER_TRIGGER, true); } - void EnterEvadeMode() OVERRIDE { } + void EnterEvadeMode() override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_omega_stanceAI(creature); } @@ -305,19 +305,19 @@ class npc_alpha_beam : public CreatureScript { npc_alpha_beamAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* anraphet = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_ANRAPHET_GUID))) anraphet->CastSpell(me, SPELL_ALPHA_BEAMS_BACK_CAST); } - void EnterEvadeMode() OVERRIDE { } // Never evade + void EnterEvadeMode() override { } // Never evade private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI(creature); } @@ -332,7 +332,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript { npc_brann_bronzebeard_anraphetAI(Creature* creature) : CreatureAI(creature), _currentPoint(0), _instance(creature->GetInstanceScript()) { } - void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) override { if (_instance->GetBossState(DATA_VAULT_OF_LIGHTS) == DONE) return; @@ -349,7 +349,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -372,7 +372,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -422,7 +422,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript } } - void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE + void MovementInform(uint32 movementType, uint32 pointId) override { if (movementType != POINT_MOTION_TYPE) return; @@ -460,7 +460,7 @@ class npc_brann_bronzebeard_anraphet : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI(creature); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index fd16bca40c6..2b09e35bbb2 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -136,7 +136,7 @@ class boss_earthrager_ptah : public CreatureScript player->GetSession()->SendPacket(data); } - void Reset() OVERRIDE + void Reset() override { _summonDeaths = 0; _hasDispersed = false; @@ -148,7 +148,7 @@ class boss_earthrager_ptah : public CreatureScript events.ScheduleEvent(EVENT_EARTH_SPIKE, urand(16000, 21000), 0, PHASE_NORMAL); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(50, damage) && (events.GetPhaseMask() & PHASE_MASK_NORMAL) && !_hasDispersed) { @@ -182,7 +182,7 @@ class boss_earthrager_ptah : public CreatureScript } } - void SetData(uint32 index, uint32 /*value*/) OVERRIDE + void SetData(uint32 index, uint32 /*value*/) override { if (index == DATA_SUMMON_DEATHS) { @@ -199,14 +199,14 @@ class boss_earthrager_ptah : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(SAY_DEATH); @@ -214,14 +214,14 @@ class boss_earthrager_ptah : public CreatureScript Cleanup(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_EARTHRAGER_PTAH, FAIL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -270,7 +270,7 @@ class boss_earthrager_ptah : public CreatureScript bool _hasDispersed; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI(creature); } @@ -290,13 +290,13 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader Skyfire::Containers::RandomResizeList(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_flame_bolt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_earthrager_ptah_flame_bolt_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 1d19663df46..3afa1b5c0d8 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -96,7 +96,7 @@ class boss_temple_guardian_anhuur : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { _phase = PHASE_FIRST_SHIELD; _oldPhase = PHASE_FIRST_SHIELD; @@ -108,7 +108,7 @@ class boss_temple_guardian_anhuur : public CreatureScript events.ScheduleEvent(EVENT_BURNING_LIGHT, 12000); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if ((me->HealthBelowPctDamaged(66, damage) && _phase == PHASE_FIRST_SHIELD) || (me->HealthBelowPctDamaged(33, damage) && _phase == PHASE_SECOND_SHIELD)) @@ -154,7 +154,7 @@ class boss_temple_guardian_anhuur : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_DISABLE_BEACON) { @@ -168,34 +168,34 @@ class boss_temple_guardian_anhuur : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); instance->SetBossState(DATA_TEMPLE_GUARDIAN_ANHUUR, FAIL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom() || me->GetCurrentSpell(CURRENT_CHANNELED_SPELL) || _phase == PHASE_SHIELDED) return; @@ -260,7 +260,7 @@ class boss_temple_guardian_anhuur : public CreatureScript uint8 _beacons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfOriginationAI(creature); } @@ -292,13 +292,13 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_shield_of_light_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_anhuur_shield_of_light_SpellScript(); } @@ -326,14 +326,14 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader anhuur->AI()->DoAction(ACTION_DISABLE_BEACON); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHit += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_anhuur_disable_beacon_beams_SpellScript(); } @@ -354,13 +354,13 @@ class spell_anhuur_activate_beacons : public SpellScriptLoader GetHitGObj()->RemoveFlag(GAMEOBJECT_FIELD_FLAGS, GO_FLAG_NOT_SELECTABLE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_anhuur_activate_beacons_SpellScript::Activate, EFFECT_0, SPELL_EFFECT_ACTIVATE_OBJECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_anhuur_activate_beacons_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index eb2d35e1376..eee5b6cdae6 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -70,7 +70,7 @@ class instance_halls_of_origination : public InstanceMapScript _deadElementals = 0; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -107,7 +107,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -128,7 +128,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -144,7 +144,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { switch (data) { @@ -157,7 +157,7 @@ class instance_halls_of_origination : public InstanceMapScript return 0; } - uint64 GetData64(uint32 index) const OVERRIDE + uint64 GetData64(uint32 index) const override { switch (index) { @@ -192,7 +192,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -214,7 +214,7 @@ class instance_halls_of_origination : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -225,7 +225,7 @@ class instance_halls_of_origination : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -273,7 +273,7 @@ class instance_halls_of_origination : public InstanceMapScript uint32 _deadElementals; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_halls_of_origination_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 40d88254689..44aba1a32de 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -136,7 +136,7 @@ class boss_onyxia : public CreatureScript Reset(); } - void Reset() OVERRIDE + void Reset() override { if (!IsCombatMovementAllowed()) SetCombatMovement(true); @@ -156,7 +156,7 @@ class boss_onyxia : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); me->SetInCombatWithZone(); @@ -173,7 +173,7 @@ class boss_onyxia : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_ONYXIA, DONE); @@ -181,7 +181,7 @@ class boss_onyxia : public CreatureScript Summons.DespawnAll(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -199,17 +199,17 @@ class boss_onyxia : public CreatureScript Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { Summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) override { if (Spell->Id == SPELL_BREATH_EAST_TO_WEST || Spell->Id == SPELL_BREATH_WEST_TO_EAST || @@ -226,7 +226,7 @@ class boss_onyxia : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) { @@ -267,7 +267,7 @@ class boss_onyxia : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* Spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* Spell) override { //Workaround - Couldn't find a way to group this spells (All Eruption) if (((Spell->Id >= 17086 && Spell->Id <= 17095) || @@ -315,7 +315,7 @@ class boss_onyxia : public CreatureScript MovePoint = iTemp; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -470,7 +470,7 @@ class boss_onyxia : public CreatureScript bool IsMoving; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_onyxiaAI(creature); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 2e3577daab9..bfa175bfc76 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -39,7 +39,7 @@ class instance_onyxias_lair : public InstanceMapScript public: instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", 249) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_onyxias_lair_InstanceMapScript(map); } @@ -51,7 +51,7 @@ class instance_onyxias_lair : public InstanceMapScript //Eruption is a BFS graph problem //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); @@ -64,7 +64,7 @@ class instance_onyxias_lair : public InstanceMapScript achievSheDeepBreathMore = true; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -74,7 +74,7 @@ class instance_onyxias_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { @@ -96,7 +96,7 @@ class instance_onyxias_lair : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { @@ -136,7 +136,7 @@ class instance_onyxias_lair : public InstanceMapScript FloorEruptionGUID[1].erase(floorEruptedGUID); } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -151,7 +151,7 @@ class instance_onyxias_lair : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -176,7 +176,7 @@ class instance_onyxias_lair : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { switch (type) { @@ -188,7 +188,7 @@ class instance_onyxias_lair : public InstanceMapScript } } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -199,7 +199,7 @@ class instance_onyxias_lair : public InstanceMapScript return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (GetBossState(DATA_ONYXIA) == IN_PROGRESS) { @@ -229,7 +229,7 @@ class instance_onyxias_lair : public InstanceMapScript } } - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscValue1 = 0*/) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscValue1 = 0*/) override { switch (criteriaId) { @@ -243,7 +243,7 @@ class instance_onyxias_lair : public InstanceMapScript return false; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -254,7 +254,7 @@ class instance_onyxias_lair : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 8df59765679..83985bec222 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -47,7 +47,7 @@ class boss_amnennar_the_coldbringer : public CreatureScript public: boss_amnennar_the_coldbringer() : CreatureScript("boss_amnennar_the_coldbringer") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_amnennar_the_coldbringerAI(creature); } @@ -63,7 +63,7 @@ class boss_amnennar_the_coldbringer : public CreatureScript bool Spectrals30; bool Hp; - void Reset() OVERRIDE + void Reset() override { AmnenarsWrath_Timer = 8000; FrostBolt_Timer = 1000; @@ -73,17 +73,17 @@ class boss_amnennar_the_coldbringer : public CreatureScript Hp = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 7f98e8cdb97..59c064aa552 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -31,7 +31,7 @@ class instance_razorfen_downs : public InstanceMapScript public: instance_razorfen_downs() : InstanceMapScript("instance_razorfen_downs", 129) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_razorfen_downs_InstanceMapScript(map); } @@ -50,7 +50,7 @@ class instance_razorfen_downs : public InstanceMapScript std::string str_data; - void Initialize() OVERRIDE + void Initialize() override { uiGongGUID = 0; @@ -59,7 +59,7 @@ class instance_razorfen_downs : public InstanceMapScript memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -74,7 +74,7 @@ class instance_razorfen_downs : public InstanceMapScript return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -104,7 +104,7 @@ class instance_razorfen_downs : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -118,7 +118,7 @@ class instance_razorfen_downs : public InstanceMapScript } } - void SetData(uint32 uiType, uint32 uiData) OVERRIDE + void SetData(uint32 uiType, uint32 uiData) override { if (uiType == DATA_GONG_WAVES) { @@ -190,7 +190,7 @@ class instance_razorfen_downs : public InstanceMapScript } } - uint32 GetData(uint32 uiType) const OVERRIDE + uint32 GetData(uint32 uiType) const override { switch (uiType) { @@ -201,7 +201,7 @@ class instance_razorfen_downs : public InstanceMapScript return 0; } - uint64 GetData64(uint32 uiType) const OVERRIDE + uint64 GetData64(uint32 uiType) const override { switch (uiType) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 43d8a81982f..d8846a623f0 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -62,7 +62,7 @@ class npc_henry_stern : public CreatureScript { npc_henry_sternAI(Creature* creature) : ScriptedAI(creature) { } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { if (action == 0) { @@ -96,7 +96,7 @@ class npc_henry_stern : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_henry_sternAI(creature); } @@ -111,7 +111,7 @@ class go_gong : public GameObjectScript public: go_gong() : GameObjectScript("go_gong") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { //basic support, not blizzlike data is missing... InstanceScript* instance = go->GetInstanceScript(); @@ -136,7 +136,7 @@ class npc_tomb_creature : public CreatureScript public: npc_tomb_creature() : CreatureScript("npc_tomb_creature") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tomb_creatureAI(creature); } @@ -152,12 +152,12 @@ class npc_tomb_creature : public CreatureScript uint32 uiWebTimer; - void Reset() OVERRIDE + void Reset() override { uiWebTimer = urand(5000, 8000); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -175,7 +175,7 @@ class npc_tomb_creature : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_GONG_WAVES, instance->GetData(DATA_GONG_WAVES)+1); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index ccaf80d78d4..94246d1c2e4 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -37,7 +37,7 @@ class instance_razorfen_kraul : public InstanceMapScript public: instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", 47) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_razorfen_kraul_InstanceMapScript(map); } @@ -49,7 +49,7 @@ class instance_razorfen_kraul : public InstanceMapScript uint64 DoorWardGUID; int WardKeeperDeath; - void Initialize() OVERRIDE + void Initialize() override { WardKeeperDeath = 0; DoorWardGUID = 0; @@ -71,7 +71,7 @@ class instance_razorfen_kraul : public InstanceMapScript return NULL; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -80,7 +80,7 @@ class instance_razorfen_kraul : public InstanceMapScript } } - void Update(uint32 /*diff*/) OVERRIDE + void Update(uint32 /*diff*/) override { if (WardKeeperDeath == WARD_KEEPERS_NR) if (GameObject* go = instance->GetGameObject(DoorWardGUID)) @@ -90,7 +90,7 @@ class instance_razorfen_kraul : public InstanceMapScript } } - void SetData(uint32 type, uint32 /*data*/) OVERRIDE + void SetData(uint32 type, uint32 /*data*/) override { switch (type) { diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 3f21fd8314a..5fbe0ccfe51 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -49,7 +49,7 @@ class npc_willix : public CreatureScript public: npc_willix() : CreatureScript("npc_willix") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { @@ -61,7 +61,7 @@ class npc_willix : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_willixAI(creature); } @@ -70,7 +70,7 @@ class npc_willix : public CreatureScript { npc_willixAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -120,19 +120,19 @@ class npc_willix : public CreatureScript } } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO1); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_WILLIX_THE_IMPORTER); @@ -165,7 +165,7 @@ struct npc_snufflenose_gopher : public CreatureScript public: npc_snufflenose_gopher() : CreatureScript("npc_snufflenose_gopher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_snufflenose_gopherAI(creature); } @@ -174,12 +174,12 @@ struct npc_snufflenose_gopher : public CreatureScript { npc_snufflenose_gopherAI(Creature* creature) : PetAI(creature) { } - void Reset() OVERRIDE + void Reset() override { IsMovementActive = false; } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == POINT_TUBBER) { @@ -228,13 +228,13 @@ struct npc_snufflenose_gopher : public CreatureScript IsMovementActive = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!IsMovementActive) PetAI::UpdateAI(diff); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_FIND_NEW_TUBBER) DoFindNewTubber(); @@ -255,7 +255,7 @@ class spell_snufflenose_command : public SpellScriptLoader { PrepareSpellScript(spell_snufflenose_commandSpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -267,13 +267,13 @@ class spell_snufflenose_command : public SpellScriptLoader target->ToCreature()->AI()->DoAction(ACTION_FIND_NEW_TUBBER); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_snufflenose_commandSpellScript::HandleAfterCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_snufflenose_commandSpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 40953aef0b8..4e487f66e71 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -84,7 +84,7 @@ class boss_ayamiss : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase = PHASE_AIR; @@ -92,7 +92,7 @@ class boss_ayamiss : public CreatureScript SetCombatMovement(false); } - void JustSummoned(Creature* who) OVERRIDE + void JustSummoned(Creature* who) override { switch (who->GetEntry()) { @@ -109,7 +109,7 @@ class boss_ayamiss : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) { @@ -125,13 +125,13 @@ class boss_ayamiss : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->ClearUnitState(UNIT_STATE_ROOT); BossAI::EnterEvadeMode(); } - void EnterCombat(Unit* attacker) OVERRIDE + void EnterCombat(Unit* attacker) override { BossAI::EnterCombat(attacker); @@ -146,7 +146,7 @@ class boss_ayamiss : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -232,7 +232,7 @@ class boss_ayamiss : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ayamissAI(creature); } @@ -250,7 +250,7 @@ class npc_hive_zara_larva : public CreatureScript _instance = me->GetInstanceScript(); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) if (id == POINT_PARALYZE) @@ -258,7 +258,7 @@ class npc_hive_zara_larva : public CreatureScript DoCast(target, SPELL_FEED); // Omnomnom } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) @@ -267,7 +267,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -275,7 +275,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::AttackStart(victim); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -286,7 +286,7 @@ class npc_hive_zara_larva : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hive_zara_larvaAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index a78f754d476..d4a9cbb4a9a 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -72,7 +72,7 @@ class boss_buru : public CreatureScript { } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { BossAI::EnterEvadeMode(); @@ -83,7 +83,7 @@ class boss_buru : public CreatureScript Eggs.clear(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); Talk(EMOTE_TARGET, who); @@ -96,14 +96,14 @@ class boss_buru : public CreatureScript _phase = PHASE_EGG; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_EXPLODE) if (_phase == PHASE_EGG) me->DealDamage(me, 45000); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) ChaseNewVictim(); @@ -134,7 +134,7 @@ class boss_buru : public CreatureScript events.ScheduleEvent(EVENT_RESPAWN_EGG, 100000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -187,7 +187,7 @@ class boss_buru : public CreatureScript std::list Eggs; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_buruAI(creature); } @@ -206,14 +206,14 @@ class npc_buru_egg : public CreatureScript SetCombatMovement(false); } - void EnterCombat(Unit* attacker) OVERRIDE + void EnterCombat(Unit* attacker) override { if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) if (!buru->IsInCombat()) buru->AI()->AttackStart(attacker); } - void JustSummoned(Creature* who) OVERRIDE + void JustSummoned(Creature* who) override { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) @@ -221,7 +221,7 @@ class npc_buru_egg : public CreatureScript who->AI()->AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCastAOE(SPELL_EXPLODE, true); DoCastAOE(SPELL_EXPLODE_2, true); // Unknown purpose @@ -235,7 +235,7 @@ class npc_buru_egg : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_buru_eggAI(creature); } @@ -262,14 +262,14 @@ class spell_egg_explosion : public SpellScriptLoader GetCaster()->DealDamage(target, -16 * GetCaster()->GetDistance(target) + 500); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_egg_explosion_SpellScript::HandleAfterCast); OnEffectHitTarget += SpellEffectFn(spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_egg_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 501e5ac05d2..8f7e725d5ae 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -58,7 +58,7 @@ class boss_kurinnaxx : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _enraged = false; @@ -68,7 +68,7 @@ class boss_kurinnaxx : public CreatureScript events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!_enraged && HealthBelowPct(30)) { @@ -77,14 +77,14 @@ class boss_kurinnaxx : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); if (Creature* Ossirian = me->GetMap()->GetCreature(instance->GetData64(DATA_OSSIRIAN))) sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, 0, ChatMsg::CHAT_MSG_ADDON, Language::LANG_ADDON, TEXT_RANGE_ZONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -128,7 +128,7 @@ class boss_kurinnaxx : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kurinnaxxAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 40fd51fb45c..127166b4f96 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -65,7 +65,7 @@ class boss_moam : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetPower(POWER_MANA, 0); @@ -74,7 +74,7 @@ class boss_moam : public CreatureScript //events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!_isStonePhase && HealthBelowPct(45)) { @@ -83,7 +83,7 @@ class boss_moam : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -108,7 +108,7 @@ class boss_moam : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -178,7 +178,7 @@ class boss_moam : public CreatureScript bool _isStonePhase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_moamAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index dcfc70e9441..8e72aa29750 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -99,7 +99,7 @@ class boss_ossirian : public CreatureScript uint8 CrystalIterator; bool SaidIntro; - void Reset() OVERRIDE + void Reset() override { _Reset(); CrystalIterator = 0; @@ -107,7 +107,7 @@ class boss_ossirian : public CreatureScript CrystalGUID = 0; } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { for (uint8 i = 0; i < NUM_WEAKNESS; ++i) { @@ -120,7 +120,7 @@ class boss_ossirian : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_TRIGGER_WEAKNESS) if (Creature* Trigger = me->GetMap()->GetCreature(TriggerGUID)) @@ -128,7 +128,7 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -164,19 +164,19 @@ class boss_ossirian : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { Cleanup(); summons.DespawnAll(); BossAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Cleanup(); _JustDied(); @@ -208,7 +208,7 @@ class boss_ossirian : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!SaidIntro) @@ -219,7 +219,7 @@ class boss_ossirian : public CreatureScript BossAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -277,7 +277,7 @@ class boss_ossirian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ossirianAI(creature); } @@ -288,7 +288,7 @@ class go_ossirian_crystal : public GameObjectScript public: go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { InstanceScript* Instance = player->GetInstanceScript(); if (!Instance) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 3c8fec01499..785726ea2ef 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -70,7 +70,7 @@ class boss_rajaxx : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); enraged = false; @@ -78,18 +78,18 @@ class boss_rajaxx : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCRASH, 12000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //SAY_DEATH _JustDied(); } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { _EnterCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -122,7 +122,7 @@ class boss_rajaxx : public CreatureScript bool enraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rajaxxAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 517f68f2bf8..a9e56c49451 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -42,7 +42,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript _paralyzedGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -67,7 +67,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript } } - bool SetBossState(uint32 bossId, EncounterState state) OVERRIDE + bool SetBossState(uint32 bossId, EncounterState state) override { if (!InstanceScript::SetBossState(bossId, state)) return false; @@ -75,13 +75,13 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return true; } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { if (type == DATA_PARALYZED) _paralyzedGUID = data; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -104,7 +104,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -115,7 +115,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return saveStream.str(); } - void Load(char const* data) OVERRIDE + void Load(char const* data) override { if (!data) { @@ -157,7 +157,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript uint64 _paralyzedGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ruins_of_ahnqiraj_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 21d0845679b..7c988357dfd 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -48,7 +48,7 @@ class boss_kri : public CreatureScript public: boss_kri() : CreatureScript("boss_kri") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kriAI(creature); } @@ -69,7 +69,7 @@ class boss_kri : public CreatureScript bool VemDead; bool Death; - void Reset() OVERRIDE + void Reset() override { Cleave_Timer = urand(4000, 8000); ToxicVolley_Timer = urand(6000, 12000); @@ -79,11 +79,11 @@ class boss_kri : public CreatureScript Death = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -94,7 +94,7 @@ class boss_kri : public CreatureScript instance->SetData(DATA_BUG_TRIO_DEATH, 1); } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -144,7 +144,7 @@ class boss_vem : public CreatureScript public: boss_vem() : CreatureScript("boss_vem") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vemAI(creature); } @@ -164,7 +164,7 @@ class boss_vem : public CreatureScript bool Enraged; - void Reset() OVERRIDE + void Reset() override { Charge_Timer = urand(15000, 27000); KnockBack_Timer = urand(8000, 20000); @@ -173,7 +173,7 @@ class boss_vem : public CreatureScript Enraged = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -185,11 +185,11 @@ class boss_vem : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -236,7 +236,7 @@ class boss_yauj : public CreatureScript public: boss_yauj() : CreatureScript("boss_yauj") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_yaujAI(creature); } @@ -256,7 +256,7 @@ class boss_yauj : public CreatureScript bool VemDead; - void Reset() OVERRIDE + void Reset() override { Heal_Timer = urand(25000, 40000); Fear_Timer = urand(12000, 24000); @@ -265,7 +265,7 @@ class boss_yauj : public CreatureScript VemDead = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -285,11 +285,11 @@ class boss_yauj : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index f7b0b6c17df..888c1ba7c31 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -153,7 +153,7 @@ class boss_eye_of_cthun : public CreatureScript public: boss_eye_of_cthun() : CreatureScript("boss_eye_of_cthun") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new eye_of_cthunAI(creature); } @@ -185,7 +185,7 @@ class boss_eye_of_cthun : public CreatureScript float DarkGlareAngle; bool ClockWise; - void Reset() OVERRIDE + void Reset() override { //Phase information PhaseTimer = 50000; //First dark glare in 50 seconds @@ -217,7 +217,7 @@ class boss_eye_of_cthun : public CreatureScript pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); if (instance) @@ -232,7 +232,7 @@ class boss_eye_of_cthun : public CreatureScript Spawned->AI()->AttackStart(target); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -404,7 +404,7 @@ class boss_eye_of_cthun : public CreatureScript } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { //No instance if (!instance) @@ -458,7 +458,7 @@ class boss_cthun : public CreatureScript public: boss_cthun() : CreatureScript("boss_cthun") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new cthunAI(creature); } @@ -500,7 +500,7 @@ class boss_cthun : public CreatureScript //Stomach map, bool = true then in stomach UNORDERED_MAP Stomach_Map; - void Reset() OVERRIDE + void Reset() override { //One random wisper every 90 - 300 seconds WisperTimer = 90000; @@ -533,7 +533,7 @@ class boss_cthun : public CreatureScript instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -582,7 +582,7 @@ class boss_cthun : public CreatureScript return (*j); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -860,13 +860,13 @@ class boss_cthun : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { //No instance if (!instance) @@ -896,7 +896,7 @@ class boss_cthun : public CreatureScript } } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { switch (param) { @@ -913,7 +913,7 @@ class npc_eye_tentacle : public CreatureScript public: npc_eye_tentacle() : CreatureScript("npc_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new eye_tentacleAI(creature); } @@ -935,13 +935,13 @@ class npc_eye_tentacle : public CreatureScript uint32 KillSelfTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //Mind flay half a second after we spawn MindflayTimer = 500; @@ -950,12 +950,12 @@ class npc_eye_tentacle : public CreatureScript KillSelfTimer = 35000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -987,7 +987,7 @@ class npc_claw_tentacle : public CreatureScript public: npc_claw_tentacle() : CreatureScript("npc_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new claw_tentacleAI(creature); } @@ -1010,13 +1010,13 @@ class npc_claw_tentacle : public CreatureScript uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1024,12 +1024,12 @@ class npc_claw_tentacle : public CreatureScript EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -1096,7 +1096,7 @@ class npc_giant_claw_tentacle : public CreatureScript public: npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new giant_claw_tentacleAI(creature); } @@ -1120,13 +1120,13 @@ class npc_giant_claw_tentacle : public CreatureScript uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1135,12 +1135,12 @@ class npc_giant_claw_tentacle : public CreatureScript EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -1214,7 +1214,7 @@ class npc_giant_eye_tentacle : public CreatureScript public: npc_giant_eye_tentacle() : CreatureScript("npc_giant_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new giant_eye_tentacleAI(creature); } @@ -1235,24 +1235,24 @@ class npc_giant_eye_tentacle : public CreatureScript uint32 BeamTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() OVERRIDE + void Reset() override { //Green Beam half a second after we spawn BeamTimer = 500; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check if we have a target if (!UpdateVictim()) @@ -1277,7 +1277,7 @@ class npc_giant_flesh_tentacle : public CreatureScript public: npc_giant_flesh_tentacle() : CreatureScript("npc_giant_flesh_tentacle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new flesh_tentacleAI(creature); } @@ -1289,7 +1289,7 @@ class npc_giant_flesh_tentacle : public CreatureScript SetCombatMovement(false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummoner()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index b99dde2eae1..df10cd024c6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -48,7 +48,7 @@ class boss_fankriss : public CreatureScript public: boss_fankriss() : CreatureScript("boss_fankriss") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fankrissAI(creature); } @@ -67,7 +67,7 @@ class boss_fankriss : public CreatureScript Creature* Hatchling; Creature* Spawn; - void Reset() OVERRIDE + void Reset() override { MortalWound_Timer = urand(10000, 15000); SpawnHatchlings_Timer = urand(6000, 12000); @@ -98,11 +98,11 @@ class boss_fankriss : public CreatureScript Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 57d3d548fb1..0121828c8a1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -46,7 +46,7 @@ class boss_huhuran : public CreatureScript public: boss_huhuran() : CreatureScript("boss_huhuran") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_huhuranAI(creature); } @@ -65,7 +65,7 @@ class boss_huhuran : public CreatureScript bool Frenzy; bool Berserk; - void Reset() OVERRIDE + void Reset() override { Frenzy_Timer = urand(25000, 35000); Wyvern_Timer = urand(18000, 28000); @@ -78,11 +78,11 @@ class boss_huhuran : public CreatureScript Berserk = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 176174ab8aa..0e4c54a3fff 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -43,7 +43,7 @@ class boss_ouro : public CreatureScript public: boss_ouro() : CreatureScript("boss_ouro") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ouroAI(creature); } @@ -62,7 +62,7 @@ class boss_ouro : public CreatureScript bool Enrage; bool Submerged; - void Reset() OVERRIDE + void Reset() override { Sweep_Timer = urand(5000, 10000); SandBlast_Timer = urand(20000, 35000); @@ -75,12 +75,12 @@ class boss_ouro : public CreatureScript Submerged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCastVictim(SPELL_BIRTH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index da3c60dfea8..21bc4c16b72 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -48,7 +48,7 @@ class boss_sartura : public CreatureScript public: boss_sartura() : CreatureScript("boss_sartura") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sarturaAI(creature); } @@ -69,7 +69,7 @@ class boss_sartura : public CreatureScript bool WhirlWind; bool AggroReset; - void Reset() OVERRIDE + void Reset() override { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -84,22 +84,22 @@ class boss_sartura : public CreatureScript EnragedHard = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -189,7 +189,7 @@ class npc_sartura_royal_guard : public CreatureScript public: npc_sartura_royal_guard() : CreatureScript("npc_sartura_royal_guard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sartura_royal_guardAI(creature); } @@ -208,7 +208,7 @@ class npc_sartura_royal_guard : public CreatureScript bool WhirlWind; bool AggroReset; - void Reset() OVERRIDE + void Reset() override { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -221,11 +221,11 @@ class npc_sartura_royal_guard : public CreatureScript AggroReset = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 3e630ca85b3..c2f2fa1b6bd 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -59,26 +59,26 @@ class boss_skeram : public CreatureScript { boss_skeramAI(Creature* creature) : BossAI(creature, DATA_SKERAM) { } - void Reset() OVERRIDE + void Reset() override { _flag = 0; _hpct = 75.0f; me->SetVisible(true); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); if (me->IsSummon()) ((TempSummon*)me)->UnSummon(); } - void JustSummoned(Creature* creature) OVERRIDE + void JustSummoned(Creature* creature) override { // Shift the boss and images (Get it? *Shift*?) uint8 rand = 0; @@ -115,7 +115,7 @@ class boss_skeram : public CreatureScript creature->SetHealth(creature->GetMaxHealth() * (me->GetHealthPct() / 100.0f)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!me->IsSummon()) Talk(SAY_DEATH); @@ -123,7 +123,7 @@ class boss_skeram : public CreatureScript me->RemoveCorpse(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -136,7 +136,7 @@ class boss_skeram : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -191,7 +191,7 @@ class boss_skeram : public CreatureScript uint8 _flag; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_skeramAI(creature); } @@ -224,13 +224,13 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader targets.remove_if(PlayerOrPetCheck()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_skeram_arcane_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index fdb5dc1f950..a60c583f895 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -110,7 +110,7 @@ struct boss_twinemperorsAI : public ScriptedAI return NULL; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { Unit* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -127,7 +127,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -141,12 +141,12 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_DEATH : SOUND_VN_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoZoneInCombat(); Creature* pOtherBoss = GetOtherBoss(); @@ -164,7 +164,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* entry) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* entry) override { if (caster == me) return; @@ -293,7 +293,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -393,14 +393,14 @@ class boss_veknilash : public CreatureScript public: boss_veknilash() : CreatureScript("boss_veknilash") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_veknilashAI(creature); } struct boss_veknilashAI : public boss_twinemperorsAI { - bool IAmVeklor() OVERRIDE {return false;} + bool IAmVeklor() override {return false;} boss_veknilashAI(Creature* creature) : boss_twinemperorsAI(creature) { } uint32 UpperCut_Timer; @@ -412,7 +412,7 @@ class boss_veknilash : public CreatureScript Creature* Summoned; - void Reset() OVERRIDE + void Reset() override { TwinReset(); UpperCut_Timer = urand(14000, 29000); @@ -423,7 +423,7 @@ class boss_veknilash : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void CastSpellOnBug(Creature* target) OVERRIDE + void CastSpellOnBug(Creature* target) override { target->setFaction(14); target->AI()->AttackStart(me->getThreatManager().getHostilTarget()); @@ -431,7 +431,7 @@ class boss_veknilash : public CreatureScript target->SetFullHealth(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -478,14 +478,14 @@ class boss_veklor : public CreatureScript public: boss_veklor() : CreatureScript("boss_veklor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_veklorAI(creature); } struct boss_veklorAI : public boss_twinemperorsAI { - bool IAmVeklor() OVERRIDE {return true;} + bool IAmVeklor() override {return true;} boss_veklorAI(Creature* creature) : boss_twinemperorsAI(creature) { } uint32 ShadowBolt_Timer; @@ -498,7 +498,7 @@ class boss_veklor : public CreatureScript Creature* Summoned; - void Reset() OVERRIDE + void Reset() override { TwinReset(); ShadowBolt_Timer = 0; @@ -512,14 +512,14 @@ class boss_veklor : public CreatureScript me->SetBaseWeaponDamage(WeaponAttackType::BASE_ATTACK, WeaponDamageRange::MAXDAMAGE, 0); } - void CastSpellOnBug(Creature* target) OVERRIDE + void CastSpellOnBug(Creature* target) override { target->setFaction(14); target->AddAura(SPELL_EXPLODEBUG, target); target->SetFullHealth(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -580,7 +580,7 @@ class boss_veklor : public CreatureScript //DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index dfcc7b6d5bb..d7a618aa1e1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -96,14 +96,14 @@ class boss_viscidus : public CreatureScript { boss_viscidusAI(Creature* creature) : BossAI(creature, DATA_VISCIDUS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _hitcounter = 0; _phase = PHASE_FROST; } - void DamageTaken(Unit* attacker, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* attacker, uint32& /*damage*/) override { if (_phase != PHASE_MELEE) return; @@ -142,7 +142,7 @@ class boss_viscidus : public CreatureScript Talk(EMOTE_CRACK); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if ((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST) && _phase == PHASE_FROST && me->GetHealthPct() > 5.0f) { @@ -171,7 +171,7 @@ class boss_viscidus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.Reset(); @@ -185,19 +185,19 @@ class boss_viscidus : public CreatureScript events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000)); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_VISCIDUS_SUICIDE); summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -248,7 +248,7 @@ class boss_viscidus : public CreatureScript Phases _phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_viscidusAI(creature); } @@ -263,7 +263,7 @@ class npc_glob_of_viscidus : public CreatureScript { npc_glob_of_viscidusAI(Creature* creature) : ScriptedAI(creature) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { InstanceScript* Instance = me->GetInstanceScript(); if (!Instance) @@ -287,7 +287,7 @@ class npc_glob_of_viscidus : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == ROOM_CENTER) { @@ -297,7 +297,7 @@ class npc_glob_of_viscidus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_glob_of_viscidusAI(creature); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 52aaf8b0faa..3f6bca13ded 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -34,7 +34,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript public: instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_temple_of_ahnqiraj_InstanceMapScript(map); } @@ -58,7 +58,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript uint32 CthunPhase; - void Initialize() OVERRIDE + void Initialize() override { IsBossDied[0] = false; IsBossDied[1] = false; @@ -76,7 +76,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript CthunPhase = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -101,13 +101,13 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript } } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { //not active in AQ40 return false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -135,7 +135,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -155,7 +155,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } // end GetData64 - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 041274e0332..08cbfba6f11 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -66,7 +66,7 @@ class npc_anubisath_sentinel : public CreatureScript public: npc_anubisath_sentinel() : CreatureScript("npc_anubisath_sentinel") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new aqsentinelAI(creature); } @@ -215,7 +215,7 @@ class npc_anubisath_sentinel : public CreatureScript bool gatherOthersWhenAggro; - void Reset() OVERRIDE + void Reset() override { if (!me->isDead()) { @@ -239,7 +239,7 @@ class npc_anubisath_sentinel : public CreatureScript me->AddAura(id, me); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (gatherOthersWhenAggro) GetOtherSentinels(who); @@ -248,7 +248,7 @@ class npc_anubisath_sentinel : public CreatureScript DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (int ni=0; ni<3; ++ni) { diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index debcff7f0df..9ac5d092a42 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -77,7 +77,7 @@ class npc_torek : public CreatureScript uint32 Thunderclap_Timer; bool Completed; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -107,23 +107,23 @@ class npc_torek : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { Rend_Timer = 5000; Thunderclap_Timer = 8000; Completed = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -144,12 +144,12 @@ class npc_torek : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_torekAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOREK_ASSULT) { @@ -199,7 +199,7 @@ class npc_ruul_snowhoof : public CreatureScript { npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -228,31 +228,31 @@ class npc_ruul_snowhoof : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void Reset() OVERRIDE + void Reset() override { if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) Cage->SetGoState(GOState::GO_STATE_READY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ruul_snowhoofAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL) { @@ -324,12 +324,12 @@ class npc_muglash : public CreatureScript uint32 EventTimer; bool IsBrazierExtinguished; - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -361,7 +361,7 @@ class npc_muglash : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Player* player = GetPlayerForEscort()) if (HasEscortState(STATE_ESCORT_PAUSED)) @@ -372,14 +372,14 @@ class npc_muglash : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { EventTimer = 10000; WaveId = 0; IsBrazierExtinguished = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) if (Player* player = GetPlayerForEscort()) @@ -410,7 +410,7 @@ class npc_muglash : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -433,12 +433,12 @@ class npc_muglash : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_muglashAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_VORSHA) { @@ -459,7 +459,7 @@ class go_naga_brazier : public GameObjectScript public: go_naga_brazier() : GameObjectScript("go_naga_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (Creature* creature = GetClosestCreatureWithEntry(go, NPC_MUGLASH, INTERACTION_DISTANCE*2)) { diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index ee039ec1bcc..16fe5c15544 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -62,7 +62,7 @@ class npc_draenei_survivor : public CreatureScript public: npc_draenei_survivor() : CreatureScript("npc_draenei_survivor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_draenei_survivorAI(creature); } @@ -79,7 +79,7 @@ class npc_draenei_survivor : public CreatureScript bool CanSayHelp; - void Reset() OVERRIDE + void Reset() override { pCaster = 0; @@ -97,9 +97,9 @@ class npc_draenei_survivor : public CreatureScript me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (CanSayHelp && who->GetTypeId() == TypeID::TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) @@ -112,7 +112,7 @@ class npc_draenei_survivor : public CreatureScript } } - void SpellHit(Unit* Caster, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* Caster, const SpellInfo* Spell) override { if (Spell->SpellFamilyFlags[2] & 0x080000000) { @@ -127,7 +127,7 @@ class npc_draenei_survivor : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (SayThanksTimer) { @@ -195,7 +195,7 @@ class npc_engineer_spark_overgrind : public CreatureScript public: npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -207,7 +207,7 @@ class npc_engineer_spark_overgrind : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -216,7 +216,7 @@ class npc_engineer_spark_overgrind : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_engineer_spark_overgrindAI(creature); } @@ -240,7 +240,7 @@ class npc_engineer_spark_overgrind : public CreatureScript bool IsTreeEvent; - void Reset() OVERRIDE + void Reset() override { DynamiteTimer = 8000; EmoteTimer = urand(120000, 150000); @@ -251,12 +251,12 @@ class npc_engineer_spark_overgrind : public CreatureScript IsTreeEvent = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(ATTACK_YELL, who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat() && !IsTreeEvent) { @@ -293,7 +293,7 @@ class npc_injured_draenei : public CreatureScript public: npc_injured_draenei() : CreatureScript("npc_injured_draenei") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_injured_draeneiAI(creature); } @@ -302,7 +302,7 @@ class npc_injured_draenei : public CreatureScript { npc_injured_draeneiAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); me->SetHealth(me->CountPctFromMaxHealth(15)); @@ -318,12 +318,12 @@ class npc_injured_draenei : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; }; @@ -348,7 +348,7 @@ class npc_magwin : public CreatureScript public: npc_magwin() : CreatureScript("npc_magwin") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP) { @@ -359,7 +359,7 @@ class npc_magwin : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_magwinAI(creature); } @@ -368,7 +368,7 @@ class npc_magwin : public CreatureScript { npc_magwinAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -392,12 +392,12 @@ class npc_magwin : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_AGGRO, who); } - void Reset() OVERRIDE { } + void Reset() override { } }; }; @@ -432,7 +432,7 @@ class npc_geezle : public CreatureScript public: npc_geezle() : CreatureScript("npc_geezle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_geezleAI(creature); } @@ -448,14 +448,14 @@ class npc_geezle : public CreatureScript bool EventStarted; - void Reset() OVERRIDE + void Reset() override { SparkGUID = 0; Step = 0; StartEvent(); } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } void StartEvent() { @@ -555,7 +555,7 @@ class npc_geezle : public CreatureScript SF_LOG_ERROR("scripts", "SD2 ERROR: FlagList is empty!"); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (SayTimer <= diff) { @@ -583,7 +583,7 @@ class go_ravager_cage : public GameObjectScript public: go_ravager_cage() : GameObjectScript("go_ravager_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) @@ -604,7 +604,7 @@ class npc_death_ravager : public CreatureScript public: npc_death_ravager() : CreatureScript("npc_death_ravager") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_death_ravagerAI(creature); } @@ -616,7 +616,7 @@ class npc_death_ravager : public CreatureScript uint32 RendTimer; uint32 EnragingBiteTimer; - void Reset() OVERRIDE + void Reset() override { RendTimer = 30000; EnragingBiteTimer = 20000; @@ -625,7 +625,7 @@ class npc_death_ravager : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -674,7 +674,7 @@ class npc_stillpine_capitive : public CreatureScript { npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { if (GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f)) { @@ -698,7 +698,7 @@ class npc_stillpine_capitive : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_INIT, pos); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != POINT_INIT) return; @@ -710,7 +710,7 @@ class npc_stillpine_capitive : public CreatureScript _events.ScheduleEvent(EVENT_DESPAWN, 3500); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_movementComplete) return; @@ -727,7 +727,7 @@ class npc_stillpine_capitive : public CreatureScript bool _movementComplete; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stillpine_capitiveAI(creature); } @@ -738,7 +738,7 @@ class go_bristlelimb_cage : public GameObjectScript public: go_bristlelimb_cage() : GameObjectScript("go_bristlelimb_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->SetGoState(GOState::GO_STATE_READY); if (player->GetQuestStatus(QUEST_THE_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 0b298c6df3b..3e0ee80a5f8 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -47,7 +47,7 @@ class npc_webbed_creature : public CreatureScript public: npc_webbed_creature() : CreatureScript("npc_webbed_creature") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_webbed_creatureAI(creature); } @@ -56,11 +56,11 @@ class npc_webbed_creature : public CreatureScript { npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { uint32 spawnCreatureID = 0; @@ -101,7 +101,7 @@ class npc_captured_sunhawk_agent : public CreatureScript public: npc_captured_sunhawk_agent() : CreatureScript("npc_captured_sunhawk_agent") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -134,7 +134,7 @@ class npc_captured_sunhawk_agent : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE) { @@ -166,7 +166,7 @@ class go_princess_stillpines_cage : public GameObjectScript public: go_princess_stillpines_cage() : GameObjectScript("go_princess_stillpines_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->SetGoState(GOState::GO_STATE_READY); if (Creature* stillpine = go->FindNearestCreature(NPC_PRINCESS_STILLPINE, 25, true)) @@ -187,7 +187,7 @@ class npc_princess_stillpine : public CreatureScript { npc_princess_stillpineAI(Creature* creature) : ScriptedAI(creature) { } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) { @@ -197,7 +197,7 @@ class npc_princess_stillpine : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_princess_stillpineAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 671b32d1b97..b411cec05ec 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -60,7 +60,7 @@ class npc_aged_dying_ancient_kodo : public CreatureScript public: npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF)) { @@ -109,7 +109,7 @@ class npc_aged_dying_ancient_kodo : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_aged_dying_ancient_kodoAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index c8685524a87..ab4163e0d98 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -46,7 +46,7 @@ class npc_lazy_peon : public CreatureScript public: npc_lazy_peon() : CreatureScript("npc_lazy_peon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lazy_peonAI(creature); } @@ -60,20 +60,20 @@ class npc_lazy_peon : public CreatureScript uint32 RebuffTimer; bool work; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; RebuffTimer = 0; work = false; } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == 1) work = true; } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id != SPELL_AWAKEN_PEON) return; @@ -89,7 +89,7 @@ class npc_lazy_peon : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (work == true) me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_CHOPWOOD); @@ -128,7 +128,7 @@ class spell_voodoo : public SpellScriptLoader { PrepareSpellScript(spell_voodoo_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BREW) || !sSpellMgr->GetSpellInfo(SPELL_GHOSTLY) || !sSpellMgr->GetSpellInfo(SPELL_HEX1) || !sSpellMgr->GetSpellInfo(SPELL_HEX2) || @@ -145,13 +145,13 @@ class spell_voodoo : public SpellScriptLoader GetCaster()->CastSpell(target, spellid, false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_voodoo_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index a8d5c909a58..e8d5f1dc7bd 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -73,7 +73,7 @@ class npc_risen_husk_spirit : public CreatureScript { npc_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); if (me->GetEntry() == NPC_RISEN_HUSK) @@ -82,7 +82,7 @@ class npc_risen_husk_spirit : public CreatureScript events.ScheduleEvent(EVENT_INTANGIBLE_PRESENCE, 5000); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -94,7 +94,7 @@ class npc_risen_husk_spirit : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -125,7 +125,7 @@ class npc_risen_husk_spirit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_risen_husk_spiritAI(creature); } @@ -156,7 +156,7 @@ class npc_theramore_guard : public CreatureScript public: npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); @@ -166,7 +166,7 @@ class npc_theramore_guard : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); @@ -184,7 +184,7 @@ class npc_theramore_guard : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_theramore_guardAI(creature); } @@ -197,13 +197,13 @@ class npc_theramore_guard : public CreatureScript uint32 Step; bool bYellTimer; - void Reset() OVERRIDE + void Reset() override { bYellTimer = false; Step = 0; } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!me->HasAura(SPELL_PROPAGANDIZED)) me->SetFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -248,7 +248,7 @@ class npc_lady_jaina_proudmoore : public CreatureScript public: npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_SENDER_INFO) @@ -259,7 +259,7 @@ class npc_lady_jaina_proudmoore : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -287,7 +287,7 @@ class npc_nat_pagle : public CreatureScript public: npc_nat_pagle() : CreatureScript("npc_nat_pagle") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -296,7 +296,7 @@ class npc_nat_pagle : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -339,7 +339,7 @@ class npc_private_hendel : public CreatureScript public: npc_private_hendel() : CreatureScript("npc_private_hendel") { } - bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) creature->setFaction(FACTION_HOSTILE); @@ -347,7 +347,7 @@ class npc_private_hendel : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_private_hendelAI(creature); } @@ -356,12 +356,12 @@ class npc_private_hendel : public CreatureScript { npc_private_hendelAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } - void AttackedBy(Unit* pAttacker) OVERRIDE + void AttackedBy(Unit* pAttacker) override { if (me->GetVictim()) return; @@ -372,7 +372,7 @@ class npc_private_hendel : public CreatureScript AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &Damage) OVERRIDE + void DamageTaken(Unit* pDoneBy, uint32 &Damage) override { if (Damage > me->GetHealth() || me->HealthBelowPctDamaged(20, Damage)) { @@ -405,7 +405,7 @@ class npc_zelfrax : public CreatureScript public: npc_zelfrax() : CreatureScript("npc_zelfrax") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_zelfraxAI(creature); } @@ -417,7 +417,7 @@ class npc_zelfrax : public CreatureScript MoveToDock(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -432,7 +432,7 @@ class npc_zelfrax : public CreatureScript } } - void MovementInform(uint32 Type, uint32 /*Id*/) OVERRIDE + void MovementInform(uint32 Type, uint32 /*Id*/) override { if (Type != POINT_MOTION_TYPE) return; @@ -454,7 +454,7 @@ class npc_zelfrax : public CreatureScript Talk(SAY_ZELFRAX2); } - void UpdateAI(uint32 /*Diff*/) OVERRIDE + void UpdateAI(uint32 /*Diff*/) override { if (!UpdateVictim()) return; @@ -489,12 +489,12 @@ class npc_stinky : public CreatureScript public: npc_stinky() : CreatureScript("npc_stinky") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stinkyAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || quest->GetQuestId() == QUEST_STINKYS_ESCAPE_A) { @@ -513,7 +513,7 @@ class npc_stinky : public CreatureScript { npc_stinkyAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -558,14 +558,14 @@ class npc_stinky : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_ATTACKED_1, who); } - void Reset() OVERRIDE { } + void Reset() override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Player* player = GetPlayerForEscort(); if (player && HasEscortState(STATE_ESCORT_ESCORTING)) @@ -578,7 +578,7 @@ class npc_stinky : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -607,7 +607,7 @@ class spell_ooze_zap : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP)) return false; @@ -632,14 +632,14 @@ class spell_ooze_zap : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_ooze_zap_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ooze_zap_SpellScript(); } @@ -654,7 +654,7 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_channel_end_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP_CHANNEL_END)) return false; @@ -669,13 +669,13 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader GetHitUnit()->Kill(GetHitUnit()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_channel_end_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ooze_zap_channel_end_SpellScript(); } @@ -690,7 +690,7 @@ class spell_energize_aoe : public SpellScriptLoader { PrepareSpellScript(spell_energize_aoe_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ENERGIZED)) return false; @@ -715,7 +715,7 @@ class spell_energize_aoe : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_energize_aoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_energize_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); @@ -723,7 +723,7 @@ class spell_energize_aoe : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_energize_aoe_SpellScript(); } @@ -744,7 +744,7 @@ class go_blackhoof_cage : public GameObjectScript public: go_blackhoof_cage() : GameObjectScript("go_blackhoof_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f)) diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 7c4ddcf5b42..8a286346890 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -65,7 +65,7 @@ class npc_omen : public CreatureScript EventMap events; - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE) return; @@ -79,19 +79,19 @@ class npc_omen : public CreatureScript } } - void EnterCombat(Unit* /*attacker*/) OVERRIDE + void EnterCombat(Unit* /*attacker*/) override { events.Reset(); events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000)); events.ScheduleEvent(EVENT_CAST_STARFALL, urand(8000, 10000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_ELUNE_CANDLE) { @@ -102,7 +102,7 @@ class npc_omen : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -126,7 +126,7 @@ class npc_omen : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_omenAI(creature); } @@ -143,13 +143,13 @@ class npc_giant_spotlight : public CreatureScript EventMap events; - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_DESPAWN, 5*MINUTE*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -169,7 +169,7 @@ class npc_giant_spotlight : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_giant_spotlightAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index aa413c3c531..e04aa0f5635 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -55,14 +55,14 @@ class npc_agitated_earth_spirit : public CreatureScript { npc_agitated_earth_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); playerGUID = 0; me->setFaction(190); } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_SOOTHE_EARTH_SPIRIT && me->getFaction() == 190) { @@ -73,7 +73,7 @@ class npc_agitated_earth_spirit : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type == POINT_MOTION_TYPE && pointId == 1) { @@ -100,12 +100,12 @@ class npc_agitated_earth_spirit : public CreatureScript } } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { events.ScheduleEvent(EVENT_ROCK_BARRAGE, urand(4000, 5000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -132,7 +132,7 @@ class npc_agitated_earth_spirit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_agitated_earth_spiritAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 71f7bf9e17c..c6c9c8a7a6f 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -54,7 +54,7 @@ class npc_highlord_demitrian : public CreatureScript public: npc_highlord_demitrian() : CreatureScript("npc_highlord_demitrian") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -95,7 +95,7 @@ class npc_highlord_demitrian : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -140,7 +140,7 @@ class npcs_rutgar_and_frankal : public CreatureScript public: npcs_rutgar_and_frankal() : CreatureScript("npcs_rutgar_and_frankal") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -204,7 +204,7 @@ class npcs_rutgar_and_frankal : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -488,7 +488,7 @@ class npc_anachronos_the_ancient : public CreatureScript public: npc_anachronos_the_ancient() : CreatureScript("npc_anachronos_the_ancient") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anachronos_the_ancientAI(creature); } @@ -508,7 +508,7 @@ class npc_anachronos_the_ancient : public CreatureScript uint64 PlayerGUID; bool eventEnd; - void Reset() OVERRIDE + void Reset() override { AnimationTimer = 1500; AnimationCount = 0; @@ -790,7 +790,7 @@ class npc_anachronos_the_ancient : public CreatureScript } ++AnimationCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AnimationTimer) { @@ -815,7 +815,7 @@ class npc_qiraj_war_spawn : public CreatureScript public: npc_qiraj_war_spawn() : CreatureScript("npc_qiraj_war_spawn") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_qiraj_war_spawnAI(creature); } @@ -830,7 +830,7 @@ class npc_qiraj_war_spawn : public CreatureScript bool Timers; bool hasTarget; - void Reset() OVERRIDE + void Reset() override { MobGUID = 0; PlayerGUID = 0; @@ -838,10 +838,10 @@ class npc_qiraj_war_spawn : public CreatureScript hasTarget = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*slayer*/) OVERRIDE; + void EnterCombat(Unit* /*who*/) override { } + void JustDied(Unit* /*slayer*/) override; - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Timers) { @@ -927,7 +927,7 @@ class npc_anachronos_quest_trigger : public CreatureScript public: npc_anachronos_quest_trigger() : CreatureScript("npc_anachronos_quest_trigger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anachronos_quest_triggerAI(creature); } @@ -948,7 +948,7 @@ class npc_anachronos_quest_trigger : public CreatureScript bool Announced; bool Failed; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; @@ -1041,7 +1041,7 @@ class npc_anachronos_quest_trigger : public CreatureScript Announced = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!PlayerGUID || !EventStarted) return; @@ -1086,7 +1086,7 @@ class go_crystalline_tear : public GameObjectScript public: go_crystalline_tear() : GameObjectScript("go_crystalline_tear") { } - bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) override { if (quest->GetQuestId() == QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) { @@ -1356,7 +1356,7 @@ class go_wind_stone : public GameObjectScript } public: - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { uint8 rank = GetPlayerRank(player); @@ -1434,7 +1434,7 @@ class go_wind_stone : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); player->PlayerTalkClass->SendCloseGossip(); diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index c1308e826ae..8ce463f88e0 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -56,7 +56,7 @@ class npc_aquementas : public CreatureScript public: npc_aquementas() : CreatureScript("npc_aquementas") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_aquementasAI (creature); } @@ -72,7 +72,7 @@ class npc_aquementas : public CreatureScript uint32 FrostShockTimer; uint32 AquaJetTimer; - void Reset() OVERRIDE + void Reset() override { SendItemTimer = 0; SwitchFactionTimer = 10000; @@ -99,12 +99,12 @@ class npc_aquementas : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(AGGRO_YELL_AQUE, who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (isFriendly) { @@ -172,7 +172,7 @@ class npc_custodian_of_time : public CreatureScript public: npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_custodian_of_timeAI(creature); } @@ -181,7 +181,7 @@ class npc_custodian_of_time : public CreatureScript { npc_custodian_of_timeAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -248,7 +248,7 @@ class npc_custodian_of_time : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -266,10 +266,10 @@ class npc_custodian_of_time : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void Reset() OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void Reset() override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } @@ -344,7 +344,7 @@ class npc_OOX17 : public CreatureScript public: npc_OOX17() : CreatureScript("npc_OOX17") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == Q_OOX17) { @@ -360,7 +360,7 @@ class npc_OOX17 : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_OOX17AI(creature); } @@ -369,7 +369,7 @@ class npc_OOX17 : public CreatureScript { npc_OOX17AI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (Player* player = GetPlayerForEscort()) { @@ -397,14 +397,14 @@ class npc_OOX17 : public CreatureScript } } - void Reset()OVERRIDE { } + void Reset()override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -439,7 +439,7 @@ class npc_tooga : public CreatureScript public: npc_tooga() : CreatureScript("npc_tooga") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_TOOGA) { @@ -450,7 +450,7 @@ class npc_tooga : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toogaAI(creature); } @@ -465,7 +465,7 @@ class npc_tooga : public CreatureScript uint64 TortaGUID; - void Reset() OVERRIDE + void Reset() override { CheckSpeechTimer = 2500; PostEventTimer = 1000; @@ -474,7 +474,7 @@ class npc_tooga : public CreatureScript TortaGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { FollowerAI::MoveInLineOfSight(who); @@ -492,7 +492,7 @@ class npc_tooga : public CreatureScript } } - void MovementInform(uint32 MotionType, uint32 PointId) OVERRIDE + void MovementInform(uint32 MotionType, uint32 PointId) override { FollowerAI::MovementInform(MotionType, PointId); @@ -503,7 +503,7 @@ class npc_tooga : public CreatureScript SetFollowComplete(); } - void UpdateFollowerAI(uint32 Diff) OVERRIDE + void UpdateFollowerAI(uint32 Diff) override { if (!UpdateVictim()) { diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index 174d248b51d..a8941ac8aa6 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -52,7 +52,7 @@ class npc_mist : public CreatureScript public: npc_mist() : CreatureScript("npc_mist") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_MIST) if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI())) @@ -61,7 +61,7 @@ class npc_mist : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mistAI(creature); } @@ -70,9 +70,9 @@ class npc_mist : public CreatureScript { npc_mistAI(Creature* creature) : FollowerAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { FollowerAI::MoveInLineOfSight(who); @@ -100,7 +100,7 @@ class npc_mist : public CreatureScript } //call not needed here, no known abilities - /*void UpdateFollowerAI(const uint32 Diff) OVERRIDE + /*void UpdateFollowerAI(const uint32 Diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 664361d271a..6622ac61d86 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -52,7 +52,7 @@ class npc_beaten_corpse : public CreatureScript public: npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF +1) @@ -63,7 +63,7 @@ class npc_beaten_corpse : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -98,7 +98,7 @@ class npc_gilthares : public CreatureScript public: npc_gilthares() : CreatureScript("npc_gilthares") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) { @@ -113,7 +113,7 @@ class npc_gilthares : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_giltharesAI(creature); } @@ -122,9 +122,9 @@ class npc_gilthares : public CreatureScript { npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -154,7 +154,7 @@ class npc_gilthares : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { //not always use if (rand()%4) @@ -186,7 +186,7 @@ class npc_taskmaster_fizzule : public CreatureScript public: npc_taskmaster_fizzule() : CreatureScript("npc_taskmaster_fizzule") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_taskmaster_fizzuleAI(creature); } @@ -203,7 +203,7 @@ class npc_taskmaster_fizzule : public CreatureScript uint32 ResetTimer; uint8 FlareCount; - void Reset() OVERRIDE + void Reset() override { IsFriend = false; ResetTimer = 120000; @@ -224,7 +224,7 @@ class npc_taskmaster_fizzule : public CreatureScript me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -235,9 +235,9 @@ class npc_taskmaster_fizzule : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsFriend) { @@ -254,7 +254,7 @@ class npc_taskmaster_fizzule : public CreatureScript DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* /*player*/, uint32 emote) OVERRIDE + void ReceiveEmote(Player* /*player*/, uint32 emote) override { if (emote == TEXT_EMOTE_SALUTE) { @@ -301,7 +301,7 @@ class npc_twiggy_flathead : public CreatureScript public: npc_twiggy_flathead() : CreatureScript("npc_twiggy_flathead") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_twiggy_flatheadAI(creature); } @@ -321,7 +321,7 @@ class npc_twiggy_flathead : public CreatureScript uint64 AffrayChallenger[6]; uint64 BigWill; - void Reset() OVERRIDE + void Reset() override { EventInProgress = false; EventGrate = false; @@ -339,9 +339,9 @@ class npc_twiggy_flathead : public CreatureScript BigWill = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || !who->IsAlive() || EventInProgress) @@ -356,9 +356,9 @@ class npc_twiggy_flathead : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE { } + void KilledUnit(Unit* /*victim*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (EventInProgress) { @@ -524,7 +524,7 @@ class npc_wizzlecrank_shredder : public CreatureScript uint32 PostEventTimer; uint32 PostEventCount; - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -537,7 +537,7 @@ class npc_wizzlecrank_shredder : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -560,7 +560,7 @@ class npc_wizzlecrank_shredder : public CreatureScript } } - void WaypointStart(uint32 PointId) OVERRIDE + void WaypointStart(uint32 PointId) override { Player* player = GetPlayerForEscort(); @@ -579,7 +579,7 @@ class npc_wizzlecrank_shredder : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_PILOT_WIZZ) me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -588,7 +588,7 @@ class npc_wizzlecrank_shredder : public CreatureScript summoned->AI()->AttackStart(me); } - void UpdateEscortAI(const uint32 Diff) OVERRIDE + void UpdateEscortAI(const uint32 Diff) override { if (!UpdateVictim()) { @@ -630,7 +630,7 @@ class npc_wizzlecrank_shredder : public CreatureScript } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE) { @@ -641,7 +641,7 @@ class npc_wizzlecrank_shredder : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wizzlecrank_shredderAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index e4f193aeb3a..53996774859 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -50,7 +50,7 @@ class npc_cairne_bloodhoof : public CreatureScript public: npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_cairne_bloodhoofAI (creature); } @@ -65,7 +65,7 @@ class npc_cairne_bloodhoof : public CreatureScript uint32 ThunderclapTimer; uint32 UppercutTimer; - void Reset() OVERRIDE + void Reset() override { BerserkerChargeTimer = 30000; CleaveTimer = 5000; @@ -74,9 +74,9 @@ class npc_cairne_bloodhoof : public CreatureScript UppercutTimer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index fc56d68e136..77aea4f6863 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -47,7 +47,7 @@ class npc_rivern_frostwind : public CreatureScript public: npc_rivern_frostwind() : CreatureScript("npc_rivern_frostwind") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -56,7 +56,7 @@ class npc_rivern_frostwind : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -294,7 +294,7 @@ class npc_ranshalla : public CreatureScript { public: npc_ranshalla() : CreatureScript("npc_ranshalla") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_GUARDIANS_ALTAR) { @@ -309,7 +309,7 @@ class npc_ranshalla : public CreatureScript return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ranshallaAI(creature); } @@ -330,7 +330,7 @@ class npc_ranshalla : public CreatureScript uint64 _voiceEluneGUID; uint64 _altarGUID; - void Reset() OVERRIDE + void Reset() override { _delayTimer = 0; } @@ -396,7 +396,7 @@ class npc_ranshalla : public CreatureScript StartNextDialogueText(SAY_PRIESTESS_ALTAR_3); } - void WaypointReached(uint32 pointId) OVERRIDE + void WaypointReached(uint32 pointId) override { switch (pointId) { @@ -448,7 +448,7 @@ class npc_ranshalla : public CreatureScript } } - void JustDidDialogueStep(int32 entry) OVERRIDE + void JustDidDialogueStep(int32 entry) override { switch (entry) { @@ -547,7 +547,7 @@ class npc_ranshalla : public CreatureScript } } - Creature* GetSpeakerByEntry(int32 entry) OVERRIDE + Creature* GetSpeakerByEntry(int32 entry) override { switch (entry) { @@ -564,7 +564,7 @@ class npc_ranshalla : public CreatureScript } } - void UpdateEscortAI(const uint32 diff) OVERRIDE + void UpdateEscortAI(const uint32 diff) override { DialogueUpdate(diff); @@ -597,7 +597,7 @@ class go_elune_fire : public GameObjectScript { public: go_elune_fire() : GameObjectScript("go_elune_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { // Check if we are using the torches or the altar bool isAltar = false; diff --git a/src/server/scripts/Maelstrom/kezan.cpp b/src/server/scripts/Maelstrom/kezan.cpp index f8e64286d7d..fe34ee5896f 100644 --- a/src/server/scripts/Maelstrom/kezan.cpp +++ b/src/server/scripts/Maelstrom/kezan.cpp @@ -42,7 +42,7 @@ class npc_defiant_troll : public CreatureScript public: npc_defiant_troll() : CreatureScript("npc_defiant_troll") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_defiant_trollAI(creature); } @@ -54,14 +54,14 @@ class npc_defiant_troll : public CreatureScript uint32 rebuffTimer; bool work; - void Reset () OVERRIDE + void Reset () override { rebuffTimer = 0; work = false; me->CastSpell(me, SPELL_ENRAGE, true); } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == 1) work = true; @@ -69,7 +69,7 @@ class npc_defiant_troll : public CreatureScript bool IsWorking() const { return work; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsWorking()) me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_MINING); @@ -102,7 +102,7 @@ class npc_defiant_troll : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_GOOD_HELP_IS_HARD_TO_FIND) == QUEST_STATUS_INCOMPLETE && !CAST_AI(npc_defiant_troll::npc_defiant_trollAI, creature->AI())->IsWorking()) { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index d516abad232..6ebd86f2a5a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -60,14 +60,14 @@ class boss_amanitar : public CreatureScript { boss_amanitarAI(Creature* creature) : BossAI(creature, DATA_AMANITAR) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -78,7 +78,7 @@ class boss_amanitar : public CreatureScript events.ScheduleEvent(EVENT_SPAWN, 5 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI); @@ -113,7 +113,7 @@ class boss_amanitar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -155,7 +155,7 @@ class boss_amanitar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetAhnKahetAI(creature); } @@ -172,7 +172,7 @@ class npc_amanitar_mushrooms : public CreatureScript EventMap events; - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_AURA, 1 * IN_MILLISECONDS); @@ -186,16 +186,16 @@ class npc_amanitar_mushrooms : public CreatureScript DoCast(SPELL_POWER_MUSHROOM_VISUAL_AURA); } - void DamageTaken(Unit* /*attacker*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32 &damage) override { if (damage >= me->GetHealth() && me->GetEntry() == NPC_HEALTHY_MUSHROOM) DoCast(me, SPELL_HEALTHY_MUSHROOM_POTENT_FUNGUS, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*victim*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*victim*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -224,7 +224,7 @@ class npc_amanitar_mushrooms : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_amanitar_mushroomsAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index dce60a19b8f..a2c6236f7de 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -63,14 +63,14 @@ class boss_elder_nadox : public CreatureScript { boss_elder_nadoxAI(Creature* creature) : BossAI(creature, DATA_ELDER_NADOX) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); AmountHealthModifier = 1; GuardianDied = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -85,13 +85,13 @@ class boss_elder_nadox : public CreatureScript } } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override { if (summon->GetEntry() == NPC_AHNKAHAR_GUARDIAN) GuardianDied = true; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_RESPECT_YOUR_ELDERS) return !GuardianDied ? 1 : 0; @@ -99,19 +99,19 @@ class boss_elder_nadox : public CreatureScript return 0; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -163,7 +163,7 @@ class boss_elder_nadox : public CreatureScript uint8 AmountHealthModifier; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetAhnKahetAI(creature); } @@ -180,7 +180,7 @@ class npc_ahnkahar_nerubian : public CreatureScript EventMap events; - void Reset() OVERRIDE + void Reset() override { if (me->GetEntry() == NPC_AHNKAHAR_GUARDIAN) DoCast(me, SPELL_GUARDIAN_AURA, true); @@ -188,13 +188,13 @@ class npc_ahnkahar_nerubian : public CreatureScript events.ScheduleEvent(EVENT_SPRINT, 13 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (me->GetEntry() == NPC_AHNKAHAR_GUARDIAN) me->RemoveAurasDueToSpell(SPELL_GUARDIAN_AURA); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -218,7 +218,7 @@ class npc_ahnkahar_nerubian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ahnkahar_nerubianAI(creature); } @@ -238,15 +238,15 @@ class npc_nadox_eggs : public CreatureScript creature->UpdateAllStats(); } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*victim*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*victim*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nadox_eggsAI(creature); } @@ -278,14 +278,14 @@ class spell_elder_nadox_guardian : public SpellScriptLoader targets.remove_if (GuardianCheck()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elder_nadox_guardian_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elder_nadox_guardian_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_elder_nadox_guardian_SpellScript(); } @@ -296,7 +296,7 @@ class achievement_respect_your_elders : public AchievementCriteriaScript public: achievement_respect_your_elders() : AchievementCriteriaScript("achievement_respect_your_elders") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 1d2e87693b9..d6e62ce0cdd 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -85,7 +85,7 @@ class boss_volazj : public CreatureScript return 100*(me->GetHealth()-damage)/me->GetMaxHealth(); } - void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; @@ -98,7 +98,7 @@ class boss_volazj : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { if (spell->Id == SPELL_INSANITY) { @@ -146,7 +146,7 @@ class boss_volazj : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { uiMindFlayTimer = 8*IN_MILLISECONDS; uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS; @@ -171,7 +171,7 @@ class boss_volazj : public CreatureScript me->SetControlled(false, UNIT_STATE_STUNNED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -182,7 +182,7 @@ class boss_volazj : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { Summons.Summon(summon); } @@ -211,7 +211,7 @@ class boss_volazj : public CreatureScript return spell; } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { uint32 phase = summon->GetPhaseMask(); uint32 nextPhase = 0; @@ -255,7 +255,7 @@ class boss_volazj : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -294,7 +294,7 @@ class boss_volazj : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -305,13 +305,13 @@ class boss_volazj : public CreatureScript ResetPlayersPhaseMask(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_volazjAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 0985405dabc..1f60c753dfa 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -90,7 +90,7 @@ class boss_jedoga_shadowseeker : public CreatureScript bool volunteerWork; bool bFirstTime; - void Reset() OVERRIDE + void Reset() override { uiOpFerTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); @@ -118,7 +118,7 @@ class boss_jedoga_shadowseeker : public CreatureScript bFirstTime = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!instance || (who->GetTypeId() == TypeID::TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; @@ -128,7 +128,7 @@ class boss_jedoga_shadowseeker : public CreatureScript instance->SetBossState(DATA_JEDOGA_SHADOWSEEKER, IN_PROGRESS); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || (who->GetTypeId() == TypeID::TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; @@ -136,7 +136,7 @@ class boss_jedoga_shadowseeker : public CreatureScript ScriptedAI::AttackStart(who); } - void KilledUnit(Unit* Victim) OVERRIDE + void KilledUnit(Unit* Victim) override { if (!Victim || Victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -144,20 +144,20 @@ class boss_jedoga_shadowseeker : public CreatureScript Talk(TEXT_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(TEXT_DEATH); if (instance) instance->SetBossState(DATA_JEDOGA_SHADOWSEEKER, DONE); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_INITIAND_KILLED) volunteerWork = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_VOLUNTEER_WORK) return volunteerWork ? 1 : 0; @@ -165,7 +165,7 @@ class boss_jedoga_shadowseeker : public CreatureScript return 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!instance || !who || (who->GetTypeId() == TypeID::TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; @@ -282,7 +282,7 @@ class boss_jedoga_shadowseeker : public CreatureScript bCanDown = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; @@ -338,7 +338,7 @@ class boss_jedoga_shadowseeker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_jedoga_shadowseekerAI(creature); } @@ -362,7 +362,7 @@ class npc_jedoga_initiand : public CreatureScript bool bWalking; - void Reset() OVERRIDE + void Reset() override { if (!instance) return; @@ -386,7 +386,7 @@ class npc_jedoga_initiand : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (!killer || !instance) return; @@ -410,11 +410,11 @@ class npc_jedoga_initiand : public CreatureScript instance->SetData64(DATA_PL_JEDOGA_TARGET, killer->GetGUID()); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { if ((instance && instance->GetBossState(DATA_JEDOGA_SHADOWSEEKER) == IN_PROGRESS) || !victim) return; @@ -422,7 +422,7 @@ class npc_jedoga_initiand : public CreatureScript ScriptedAI::AttackStart(victim); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if ((instance && instance->GetBossState(DATA_JEDOGA_SHADOWSEEKER) == IN_PROGRESS) || !who) @@ -431,7 +431,7 @@ class npc_jedoga_initiand : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE || !instance) return; @@ -452,7 +452,7 @@ class npc_jedoga_initiand : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance && bCheckTimer <= diff) { @@ -504,7 +504,7 @@ class npc_jedoga_initiand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_jedoga_initiandAI(creature); } @@ -544,13 +544,13 @@ class npc_jedogas_aufseher_trigger : public CreatureScript bool bCasted; bool bCasted2; - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*victim*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*victim*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!instance) return; @@ -590,7 +590,7 @@ class npc_jedogas_aufseher_trigger : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_jedogas_aufseher_triggerAI(creature); } @@ -603,7 +603,7 @@ class achievement_volunteer_work : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index a508a962049..327b6923f33 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -93,14 +93,14 @@ class boss_taldaram : public CreatureScript me->SetDisableGravity(true); } - void Reset() OVERRIDE + void Reset() override { _Reset(); _embraceTargetGUID = 0; _embraceTakenDamage = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -110,7 +110,7 @@ class boss_taldaram : public CreatureScript events.ScheduleEvent(EVENT_FLAME_SPHERE, 5000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -240,7 +240,7 @@ class boss_taldaram : public CreatureScript DoMeleeAttackIfReady(); } - void DamageTaken(Unit* /*doneBy*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*doneBy*/, uint32& damage) override { Unit* embraceTarget = GetEmbraceTarget(); @@ -256,13 +256,13 @@ class boss_taldaram : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -311,7 +311,7 @@ class boss_taldaram : public CreatureScript uint32 _embraceTakenDamage = 0; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetAhnKahetAI(creature); } @@ -328,7 +328,7 @@ class npc_taldaram_flamesphere : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //! HACK: Creature's can't have MOVEMENTFLAG_FLYING @@ -341,15 +341,15 @@ class npc_taldaram_flamesphere : public CreatureScript _despawnTimer = 10 * IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_despawnTimer <= diff) me->DisappearAndDie(); @@ -361,7 +361,7 @@ class npc_taldaram_flamesphere : public CreatureScript uint32 _despawnTimer = 0; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_taldaram_flamesphereAI(creature); } @@ -372,7 +372,7 @@ class prince_taldaram_sphere : public GameObjectScript public: prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index b13b5d7ae6e..07d26314042 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -58,7 +58,7 @@ class instance_ahnkahet : public InstanceMapScript InitiandGUIDs.clear(); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -85,7 +85,7 @@ class instance_ahnkahet : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -120,7 +120,7 @@ class instance_ahnkahet : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -132,7 +132,7 @@ class instance_ahnkahet : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -159,7 +159,7 @@ class instance_ahnkahet : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -182,7 +182,7 @@ class instance_ahnkahet : public InstanceMapScript return 0; } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { switch (type) { @@ -197,7 +197,7 @@ class instance_ahnkahet : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -238,7 +238,7 @@ class instance_ahnkahet : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -261,7 +261,7 @@ class instance_ahnkahet : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -272,7 +272,7 @@ class instance_ahnkahet : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -324,7 +324,7 @@ class instance_ahnkahet : public InstanceMapScript uint8 SwitchTrigger; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ahnkahet_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 688983c742c..858fc8849ec 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -116,7 +116,7 @@ class boss_anub_arak : public CreatureScript SummonList Summons; - void Reset() OVERRIDE + void Reset() override { CarrionBeetlesTimer = 8*IN_MILLISECONDS; LeechingSwarmTimer = 20*IN_MILLISECONDS; @@ -157,7 +157,7 @@ class boss_anub_arak : public CreatureScript return NULL; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); DelayTimer = 0; @@ -171,7 +171,7 @@ class boss_anub_arak : public CreatureScript instance->SetBossState(DATA_ANUBARAK, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -334,7 +334,7 @@ class boss_anub_arak : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); Summons.DespawnAll(); @@ -342,7 +342,7 @@ class boss_anub_arak : public CreatureScript instance->SetBossState(DATA_ANUBARAK, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -350,13 +350,13 @@ class boss_anub_arak : public CreatureScript Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { Summons.Summon(summon); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_anub_arakAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 558f97545cb..49489a40148 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -75,7 +75,7 @@ class boss_hadronox : public CreatureScript float fMaxDistance; - void Reset() OVERRIDE + void Reset() override { me->SetFloatValue(UNIT_FIELD_BOUNDING_RADIUS, 9.0f); me->SetFloatValue(UNIT_FIELD_COMBAT_REACH, 9.0f); @@ -94,7 +94,7 @@ class boss_hadronox : public CreatureScript } //when Hadronox kills any enemy (that includes a party member) she will regain 10% of her HP if the target had Leech Poison on - void KilledUnit(Unit* Victim) OVERRIDE + void KilledUnit(Unit* Victim) override { // not sure if this aura check is correct, I think it is though if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->IsAlive()) @@ -103,13 +103,13 @@ class boss_hadronox : public CreatureScript me->ModifyHealth(int32(me->CountPctFromMaxHealth(10))); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_HADRONOX, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetBossState(DATA_HADRONOX, IN_PROGRESS); @@ -137,7 +137,7 @@ class boss_hadronox : public CreatureScript EnterEvadeMode(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -193,7 +193,7 @@ class boss_hadronox : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_hadronoxAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 55662ff5cb1..baac7a52240 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -102,7 +102,7 @@ class boss_krik_thir : public CreatureScript uint32 uiCurseFatigueTimer; uint32 uiSummonTimer; - void Reset() OVERRIDE + void Reset() override { uiMindFlayTimer = 15*IN_MILLISECONDS; uiCurseFatigueTimer = 12*IN_MILLISECONDS; @@ -111,7 +111,7 @@ class boss_krik_thir : public CreatureScript instance->SetBossState(DATA_KRIKTHIR_THE_GATEWATCHER, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); Summon(); @@ -141,7 +141,7 @@ class boss_krik_thir : public CreatureScript me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[7], TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -174,7 +174,7 @@ class boss_krik_thir : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -182,7 +182,7 @@ class boss_krik_thir : public CreatureScript instance->SetBossState(DATA_KRIKTHIR_THE_GATEWATCHER, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -190,13 +190,13 @@ class boss_krik_thir : public CreatureScript Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_krik_thirAI(creature); } @@ -211,14 +211,14 @@ class npc_skittering_infector : public CreatureScript { npc_skittering_infectorAI(Creature* creature) : ScriptedAI(creature) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //The spell is not working propperly DoCastVictim(SPELL_ACID_SPLASH, true); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_skittering_infectorAI(creature); } @@ -236,13 +236,13 @@ class npc_anub_ar_skirmisher : public CreatureScript uint32 uiChargeTimer; uint32 uiBackstabTimer; - void Reset() OVERRIDE + void Reset() override { uiChargeTimer = 11*IN_MILLISECONDS; uiBackstabTimer = 7*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -268,7 +268,7 @@ class npc_anub_ar_skirmisher : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anub_ar_skirmisherAI(creature); } @@ -286,13 +286,13 @@ class npc_anub_ar_shadowcaster : public CreatureScript uint32 uiShadowBoltTimer; uint32 uiShadowNovaTimer; - void Reset() OVERRIDE + void Reset() override { uiShadowBoltTimer = 6*IN_MILLISECONDS; uiShadowNovaTimer = 15*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -314,7 +314,7 @@ class npc_anub_ar_shadowcaster : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anub_ar_shadowcasterAI(creature); } @@ -332,13 +332,13 @@ class npc_anub_ar_warrior : public CreatureScript uint32 uiCleaveTimer; uint32 uiStrikeTimer; - void Reset() OVERRIDE + void Reset() override { uiCleaveTimer = 11*IN_MILLISECONDS; uiStrikeTimer = 6*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -359,7 +359,7 @@ class npc_anub_ar_warrior : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anub_ar_warriorAI(creature); } @@ -377,18 +377,18 @@ class npc_watcher_gashra : public CreatureScript uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; - void Reset() OVERRIDE + void Reset() override { uiWebWrapTimer = 11*IN_MILLISECONDS; uiInfectedBiteTimer = 4*IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_ENRAGE, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -410,7 +410,7 @@ class npc_watcher_gashra : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_watcher_gashraAI(creature); } @@ -429,14 +429,14 @@ class npc_watcher_narjil : public CreatureScript uint32 uiInfectedBiteTimer; uint32 uiBindingWebsTimer; - void Reset() OVERRIDE + void Reset() override { uiWebWrapTimer = 11*IN_MILLISECONDS; uiInfectedBiteTimer = 4*IN_MILLISECONDS; uiBindingWebsTimer = 17*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -464,7 +464,7 @@ class npc_watcher_narjil : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_watcher_narjilAI(creature); } @@ -483,14 +483,14 @@ class npc_watcher_silthik : public CreatureScript uint32 uiInfectedBiteTimer; uint32 uiPoisonSprayTimer; - void Reset() OVERRIDE + void Reset() override { uiWebWrapTimer = 11*IN_MILLISECONDS; uiInfectedBiteTimer = 4*IN_MILLISECONDS; uiPoisonSprayTimer = 15*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -519,7 +519,7 @@ class npc_watcher_silthik : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_watcher_silthikAI(creature); } @@ -532,7 +532,7 @@ class achievement_watch_him_die : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index dd554f697a2..18cbe13f2c1 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -51,7 +51,7 @@ class instance_azjol_nerub : public InstanceMapScript WatcherNarjilGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -78,7 +78,7 @@ class instance_azjol_nerub : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -93,7 +93,7 @@ class instance_azjol_nerub : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -108,7 +108,7 @@ class instance_azjol_nerub : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -131,7 +131,7 @@ class instance_azjol_nerub : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -142,7 +142,7 @@ class instance_azjol_nerub : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -183,7 +183,7 @@ class instance_azjol_nerub : public InstanceMapScript uint64 WatcherNarjilGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_azjol_nerub_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 35362009e0f..6ef52b4281a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -222,7 +222,7 @@ class boss_sartharion : public CreatureScript public: boss_sartharion() : CreatureScript("boss_sartharion") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sartharionAI(creature); } @@ -258,7 +258,7 @@ class boss_sartharion : public CreatureScript uint8 drakeCount; - void Reset() OVERRIDE + void Reset() override { m_bIsBerserk = false; m_bIsSoftEnraged = false; @@ -350,13 +350,13 @@ class boss_sartharion : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_SARTHARION_AGGRO); DoZoneInCombat(); @@ -368,7 +368,7 @@ class boss_sartharion : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_SARTHARION_DEATH); @@ -388,7 +388,7 @@ class boss_sartharion : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SARTHARION_SLAY); } @@ -405,7 +405,7 @@ class boss_sartharion : public CreatureScript me->AddLootMode(LOOT_MODE_HARD_MODE_1); // Add 1st Drake loot mode } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == TWILIGHT_ACHIEVEMENTS) return drakeCount; @@ -552,7 +552,7 @@ class boss_sartharion : public CreatureScript (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -744,7 +744,7 @@ struct dummy_dragonAI : public ScriptedAI bool m_bCanMoveFree; bool m_bCanLoot; - void Reset() OVERRIDE + void Reset() override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -756,13 +756,13 @@ struct dummy_dragonAI : public ScriptedAI m_bCanLoot = true; } - void SetData(uint32 type, uint32 value) OVERRIDE + void SetData(uint32 type, uint32 value) override { if (type == DATA_CAN_LOOT) m_bCanLoot = value; } - void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (!instance || uiType != POINT_MOTION_TYPE) return; @@ -902,7 +902,7 @@ struct dummy_dragonAI : public ScriptedAI //Refresh respawnTime so time again are set to 30secs? } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!m_bCanLoot) me->SetLootRecipient(NULL); @@ -958,7 +958,7 @@ struct dummy_dragonAI : public ScriptedAI } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (m_bCanMoveFree && m_uiMoveNextTimer) { @@ -986,7 +986,7 @@ class npc_tenebron : public CreatureScript public: npc_tenebron() : CreatureScript("npc_tenebron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tenebronAI(creature); } @@ -1001,7 +1001,7 @@ class npc_tenebron : public CreatureScript bool m_bHasPortalOpen; - void Reset() OVERRIDE + void Reset() override { dummy_dragonAI::Reset(); @@ -1012,18 +1012,18 @@ class npc_tenebron : public CreatureScript m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_TENEBRON_AGGRO); DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_TENEBRON_SLAY); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //if no target, update dummy and return if (!UpdateVictim()) @@ -1076,7 +1076,7 @@ class npc_shadron : public CreatureScript public: npc_shadron() : CreatureScript("npc_shadron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadronAI(creature); } @@ -1091,7 +1091,7 @@ class npc_shadron : public CreatureScript bool m_bHasPortalOpen; - void Reset() OVERRIDE + void Reset() override { dummy_dragonAI::Reset(); @@ -1108,18 +1108,18 @@ class npc_shadron : public CreatureScript m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_SHADRON_AGGRO); DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SHADRON_SLAY); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //if no target, update dummy and return if (!UpdateVictim()) @@ -1181,7 +1181,7 @@ class npc_vesperon : public CreatureScript public: npc_vesperon() : CreatureScript("npc_vesperon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_vesperonAI(creature); } @@ -1196,7 +1196,7 @@ class npc_vesperon : public CreatureScript bool m_bHasPortalOpen; - void Reset() OVERRIDE + void Reset() override { dummy_dragonAI::Reset(); @@ -1207,18 +1207,18 @@ class npc_vesperon : public CreatureScript m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_VESPERON_AGGRO); DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_VESPERON_SLAY); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //if no target, update dummy and return if (!UpdateVictim()) @@ -1277,7 +1277,7 @@ class npc_acolyte_of_shadron : public CreatureScript public: npc_acolyte_of_shadron() : CreatureScript("npc_acolyte_of_shadron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_acolyte_of_shadronAI(creature); } @@ -1292,7 +1292,7 @@ class npc_acolyte_of_shadron : public CreatureScript InstanceScript* instance; uint32 uiDespawnTimer; - void Reset() OVERRIDE + void Reset() override { uiDespawnTimer = 28000; if (instance) @@ -1316,7 +1316,7 @@ class npc_acolyte_of_shadron : public CreatureScript me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -1359,7 +1359,7 @@ class npc_acolyte_of_shadron : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (uiDespawnTimer < uiDiff) { @@ -1386,7 +1386,7 @@ class npc_acolyte_of_vesperon : public CreatureScript public: npc_acolyte_of_vesperon() : CreatureScript("npc_acolyte_of_vesperon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_acolyte_of_vesperonAI(creature); } @@ -1401,7 +1401,7 @@ class npc_acolyte_of_vesperon : public CreatureScript InstanceScript* instance; uint32 uiDespawnTimer; - void Reset() OVERRIDE + void Reset() override { uiDespawnTimer = 28000; if (instance) @@ -1409,7 +1409,7 @@ class npc_acolyte_of_vesperon : public CreatureScript DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); @@ -1451,7 +1451,7 @@ class npc_acolyte_of_vesperon : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (uiDespawnTimer < uiDiff) { @@ -1478,7 +1478,7 @@ class npc_twilight_eggs : public CreatureScript public: npc_twilight_eggs() : CreatureScript("npc_twilight_eggs") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_twilight_eggsAI(creature); } @@ -1496,7 +1496,7 @@ class npc_twilight_eggs : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { if (instance) me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); @@ -1515,12 +1515,12 @@ class npc_twilight_eggs : public CreatureScript me->DealDamage(me, me->GetHealth()); } - void JustSummoned(Creature* who) OVERRIDE + void JustSummoned(Creature* who) override { who->SetInCombatWithZone(); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (m_uiHatchEggTimer <= uiDiff) { @@ -1533,8 +1533,8 @@ class npc_twilight_eggs : public CreatureScript m_uiHatchEggTimer -= uiDiff; } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } }; }; @@ -1546,7 +1546,7 @@ class npc_flame_tsunami : public CreatureScript public: npc_flame_tsunami() : CreatureScript("npc_flame_tsunami") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_flame_tsunamiAI(creature); } @@ -1563,7 +1563,7 @@ class npc_flame_tsunami : public CreatureScript uint32 TsunamiBuff_timer; uint32 entry; - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); Tsunami_Timer = 100; @@ -1573,7 +1573,7 @@ class npc_flame_tsunami : public CreatureScript entry = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Tsunami_Timer <= diff) { @@ -1597,7 +1597,7 @@ class npc_twilight_fissure : public CreatureScript public: npc_twilight_fissure() : CreatureScript("npc_twilight_fissure") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_twilight_fissureAI(creature); } @@ -1611,7 +1611,7 @@ class npc_twilight_fissure : public CreatureScript uint32 VoidBlast_Timer; - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -1620,7 +1620,7 @@ class npc_twilight_fissure : public CreatureScript VoidBlast_Timer = 5000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (VoidBlast_Timer <= diff) { @@ -1645,7 +1645,7 @@ class npc_twilight_whelp : public CreatureScript public: npc_twilight_whelp() : CreatureScript("npc_twilight_whelp") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_twilight_whelpAI(creature); } @@ -1659,14 +1659,14 @@ class npc_twilight_whelp : public CreatureScript uint32 m_uiFadeArmorTimer; - void Reset() OVERRIDE + void Reset() override { me->RemoveAllAuras(); me->SetInCombatWithZone(); m_uiFadeArmorTimer = 1000; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -1693,7 +1693,7 @@ class achievement_twilight_assist : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; @@ -1713,7 +1713,7 @@ class achievement_twilight_duo : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; @@ -1733,7 +1733,7 @@ class achievement_twilight_zone : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 1d31577d750..1c08c28ca92 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -33,7 +33,7 @@ class instance_obsidian_sanctum : public InstanceMapScript public: instance_obsidian_sanctum() : InstanceMapScript("instance_obsidian_sanctum", 615) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_obsidian_sanctum_InstanceMapScript(map); } @@ -52,7 +52,7 @@ class instance_obsidian_sanctum : public InstanceMapScript bool m_bShadronKilled; bool m_bVesperonKilled; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -66,7 +66,7 @@ class instance_obsidian_sanctum : public InstanceMapScript m_bVesperonKilled = false; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -75,7 +75,7 @@ class instance_obsidian_sanctum : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -99,7 +99,7 @@ class instance_obsidian_sanctum : public InstanceMapScript } } - void SetData(uint32 uiType, uint32 uiData) OVERRIDE + void SetData(uint32 uiType, uint32 uiData) override { if (uiType == TYPE_SARTHARION_EVENT) m_auiEncounter[0] = uiData; @@ -111,7 +111,7 @@ class instance_obsidian_sanctum : public InstanceMapScript m_bVesperonKilled = true; } - uint32 GetData(uint32 uiType) const OVERRIDE + uint32 GetData(uint32 uiType) const override { if (uiType == TYPE_SARTHARION_EVENT) return m_auiEncounter[0]; @@ -125,7 +125,7 @@ class instance_obsidian_sanctum : public InstanceMapScript return 0; } - uint64 GetData64(uint32 uiData) const OVERRIDE + uint64 GetData64(uint32 uiData) const override { switch (uiData) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index b62beb06091..16815bf22ae 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -79,7 +79,7 @@ class boss_baltharus_the_warborn : public CreatureScript _introDone = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.SetPhase(PHASE_INTRO); @@ -88,7 +88,7 @@ class boss_baltharus_the_warborn : public CreatureScript instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetMaxHealth()); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -113,7 +113,7 @@ class boss_baltharus_the_warborn : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->InterruptNonMeleeSpells(false); _EnterCombat(); @@ -125,7 +125,7 @@ class boss_baltharus_the_warborn : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -133,20 +133,20 @@ class boss_baltharus_the_warborn : public CreatureScript xerestrasza->AI()->DoAction(ACTION_BALTHARUS_DEATH); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); summon->SetHealth(me->GetHealth()); summon->CastSpell(summon, SPELL_SPAWN_EFFECT, true); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (GetDifficulty() == DIFFICULTY_10MAN_NORMAL) { @@ -165,7 +165,7 @@ class boss_baltharus_the_warborn : public CreatureScript instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { bool introPhase = events.IsInPhase(PHASE_INTRO); if (!UpdateVictim() && !introPhase) @@ -218,7 +218,7 @@ class boss_baltharus_the_warborn : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -236,7 +236,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); _events.Reset(); @@ -245,14 +245,14 @@ class npc_baltharus_the_warborn_clone : public CreatureScript _events.ScheduleEvent(EVENT_ENERVATING_BRAND, urand(10000, 15000)); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { // Setting DATA_BALTHARUS_SHARED_HEALTH to 0 when killed would bug the boss. if (_instance && me->GetHealth() > damage) _instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { // This is here because DamageTaken wont trigger if the damage is deadly. if (_instance) @@ -260,7 +260,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript killer->Kill(baltharus); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -304,7 +304,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -328,13 +328,13 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_baltharus_enervating_brand_trigger_SpellScript::CheckDistance); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_baltharus_enervating_brand_trigger_SpellScript(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 6bb31a256bc..1768c130292 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -97,14 +97,14 @@ class boss_general_zarithrian : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); if (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -114,36 +114,36 @@ class boss_general_zarithrian : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_ADDS, 40000); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_GENERAL_ZARITHRIAN, FAIL); } // Override to not set adds in combat yet. - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - bool CanAIAttack(Unit const* /*target*/) const OVERRIDE + bool CanAIAttack(Unit const* /*target*/) const override { return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -192,7 +192,7 @@ class boss_general_zarithrian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -210,7 +210,7 @@ class npc_onyx_flamecaller : public CreatureScript npc_escortAI::SetDespawnAtEnd(false); } - void Reset() OVERRIDE + void Reset() override { _lavaGoutCount = 0; me->setActive(true); @@ -218,26 +218,26 @@ class npc_onyx_flamecaller : public CreatureScript Start(true, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_BLAST_NOVA, urand(20000, 30000)); _events.ScheduleEvent(EVENT_LAVA_GOUT, 5000); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { // Prevent EvadeMode } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { // Let Zarithrian count as summoner. _instance cant be null since we got GetRubySanctumAI if (Creature* zarithrian = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_GENERAL_ZARITHRIAN))) zarithrian->AI()->JustSummoned(me); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == MAX_PATH_FLAMECALLER_WAYPOINTS || waypointId == MAX_PATH_FLAMECALLER_WAYPOINTS*2) { @@ -260,7 +260,7 @@ class npc_onyx_flamecaller : public CreatureScript } } - void UpdateEscortAI(uint32 const diff) OVERRIDE + void UpdateEscortAI(uint32 const diff) override { if (!UpdateVictim()) return; @@ -302,7 +302,7 @@ class npc_onyx_flamecaller : public CreatureScript uint8 _lavaGoutCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 9327ddb3c15..11878d996e0 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -223,7 +223,7 @@ struct generic_halionAI : public BossAI { generic_halionAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId), _canEvade(false) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); me->AddAura(SPELL_TWILIGHT_PRECISION, me); @@ -233,19 +233,19 @@ struct generic_halionAI : public BossAI events.ScheduleEvent(EVENT_BREATH, urand(10000, 15000)); } - void Reset() OVERRIDE + void Reset() override { _canEvade = false; _Reset(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); } - void ExecuteEvent(uint32 eventId) OVERRIDE + void ExecuteEvent(uint32 eventId) override { switch (eventId) { @@ -264,7 +264,7 @@ struct generic_halionAI : public BossAI } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -277,7 +277,7 @@ struct generic_halionAI : public BossAI DoMeleeAttackIfReady(); } - void SetData(uint32 index, uint32 dataValue) OVERRIDE + void SetData(uint32 index, uint32 dataValue) override { switch (index) { @@ -289,7 +289,7 @@ struct generic_halionAI : public BossAI } } - void SpellHit(Unit* /*who*/, SpellInfo const* spellInfo) OVERRIDE + void SpellHit(Unit* /*who*/, SpellInfo const* spellInfo) override { if (spellInfo->Id == SPELL_TWILIGHT_MENDING) Talk(SAY_REGENERATE); @@ -311,7 +311,7 @@ class boss_halion : public CreatureScript me->SetHomePosition(HalionSpawnPos); } - void Reset() OVERRIDE + void Reset() override { generic_halionAI::Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -319,14 +319,14 @@ class boss_halion : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { // Phase 1: We always can evade. Phase 2 & 3: We can evade if and only if the controller tells us to. if (events.IsInPhase(PHASE_ONE) || _canEvade) generic_halionAI::EnterEvadeMode(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_AGGRO); @@ -346,7 +346,7 @@ class boss_halion : public CreatureScript controller->AI()->SetData(DATA_FIGHT_PHASE, PHASE_ONE); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -364,7 +364,7 @@ class boss_halion : public CreatureScript Position const* GetMeteorStrikePosition() const { return &_meteorStrikePos; } - void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32& damage) override { if (me->HealthBelowPctDamaged(75, damage) && events.IsInPhase(PHASE_ONE)) { @@ -391,7 +391,7 @@ class boss_halion : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (events.IsInPhase(PHASE_TWO)) return; @@ -399,7 +399,7 @@ class boss_halion : public CreatureScript generic_halionAI::UpdateAI(diff); } - void ExecuteEvent(uint32 eventId) OVERRIDE + void ExecuteEvent(uint32 eventId) override { switch (eventId) { @@ -433,7 +433,7 @@ class boss_halion : public CreatureScript } } - void SetData(uint32 index, uint32 value) OVERRIDE + void SetData(uint32 index, uint32 value) override { switch (index) { @@ -449,7 +449,7 @@ class boss_halion : public CreatureScript Position _meteorStrikePos; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -480,7 +480,7 @@ class boss_twilight_halion : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { events.Reset(); events.SetPhase(PHASE_TWO); @@ -493,9 +493,9 @@ class boss_twilight_halion : public CreatureScript } // Never evade - void EnterEvadeMode() OVERRIDE { } + void EnterEvadeMode() override { } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); @@ -504,7 +504,7 @@ class boss_twilight_halion : public CreatureScript me->CastSpell(victim, SPELL_LEAVE_TWILIGHT_REALM, true); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Creature* halion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION))) { @@ -523,7 +523,7 @@ class boss_twilight_halion : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32& damage) override { if (me->HealthBelowPctDamaged(50, damage) && events.IsInPhase(PHASE_TWO)) { @@ -545,7 +545,7 @@ class boss_twilight_halion : public CreatureScript } } - void SpellHit(Unit* who, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* who, SpellInfo const* spell) override { switch (spell->Id) { @@ -559,7 +559,7 @@ class boss_twilight_halion : public CreatureScript } } - void ExecuteEvent(uint32 eventId) OVERRIDE + void ExecuteEvent(uint32 eventId) override { switch (eventId) { @@ -578,7 +578,7 @@ class boss_twilight_halion : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -597,7 +597,7 @@ class npc_halion_controller : public CreatureScript me->SetPhaseMask(me->GetPhaseMask() | 0x20, true); } - void Reset() OVERRIDE + void Reset() override { _summons.DespawnAll(); _events.Reset(); @@ -608,12 +608,12 @@ class npc_halion_controller : public CreatureScript DoCast(me, SPELL_CLEAR_DEBUFFS); } - void JustSummoned(Creature* who) OVERRIDE + void JustSummoned(Creature* who) override { _summons.Summon(who); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _events.Reset(); _summons.DespawnAll(); @@ -621,7 +621,7 @@ class npc_halion_controller : public CreatureScript DoCast(me, SPELL_CLEAR_DEBUFFS); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _twilightDamageTaken = 0; _materialDamageTaken = 0; @@ -629,7 +629,7 @@ class npc_halion_controller : public CreatureScript _events.ScheduleEvent(EVENT_TRIGGER_BERSERK, 8 * MINUTE * IN_MILLISECONDS); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TWILIGHT_HALION))) twilightHalion->DespawnOrUnsummon(); @@ -643,7 +643,7 @@ class npc_halion_controller : public CreatureScript _instance->SetBossState(DATA_HALION, FAIL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -685,7 +685,7 @@ class npc_halion_controller : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // The IsInCombat() check is needed because that check should be false when Halion is // not engaged, while it would return true without as UpdateVictim() checks for @@ -752,7 +752,7 @@ class npc_halion_controller : public CreatureScript } } - void SetData(uint32 id, uint32 value) OVERRIDE + void SetData(uint32 id, uint32 value) override { switch (id) { @@ -889,7 +889,7 @@ class npc_halion_controller : public CreatureScript uint8 _materialCorporealityValue; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -910,7 +910,7 @@ class npc_orb_carrier : public CreatureScript ASSERT(creature->GetVehicleKit()); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { /// According to sniffs this spell is cast every 1 or 2 seconds. /// However, refreshing it looks bad, so just cast the spell if @@ -926,7 +926,7 @@ class npc_orb_carrier : public CreatureScript me->SetFacingToObject(rotationFocus); // setInFront } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_SHOOT) { @@ -960,7 +960,7 @@ class npc_orb_carrier : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -979,7 +979,7 @@ class npc_meteor_strike_initial : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -992,7 +992,7 @@ class npc_meteor_strike_initial : public CreatureScript } } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { Creature* owner = summoner->ToCreature(); if (!owner) @@ -1027,14 +1027,14 @@ class npc_meteor_strike_initial : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } - void EnterEvadeMode() OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } + void EnterEvadeMode() override { } private: InstanceScript* _instance; std::list _meteorList; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -1056,7 +1056,7 @@ class npc_meteor_strike : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_METEOR_STRIKE_BURN) { @@ -1066,14 +1066,14 @@ class npc_meteor_strike : public CreatureScript } } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { // Let Halion Controller count as summoner. if (Creature* controller = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION_CONTROLLER))) controller->AI()->JustSummoned(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_spawnCount > 5) return; @@ -1105,7 +1105,7 @@ class npc_meteor_strike : public CreatureScript uint8 _spawnCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -1145,7 +1145,7 @@ class npc_combustion_consumption : public CreatureScript me->SetPhaseMask(0x01 | 0x20, true); } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { // Let Halion Controller count as summoner if (Creature* controller = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION_CONTROLLER))) @@ -1154,7 +1154,7 @@ class npc_combustion_consumption : public CreatureScript _summonerGuid = summoner->GetGUID(); } - void SetData(uint32 type, uint32 stackAmount) OVERRIDE + void SetData(uint32 type, uint32 stackAmount) override { Unit* summoner = ObjectAccessor::GetUnit(*me, _summonerGuid); @@ -1168,7 +1168,7 @@ class npc_combustion_consumption : public CreatureScript summoner->CastCustomSpell(_explosionSpell, SPELLVALUE_BASE_POINT0, damage, summoner); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } private: InstanceScript* _instance; @@ -1177,7 +1177,7 @@ class npc_combustion_consumption : public CreatureScript uint64 _summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -1192,7 +1192,7 @@ class npc_living_inferno : public CreatureScript { npc_living_infernoAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { me->SetInCombatWithZone(); me->CastSpell(me, SPELL_BLAZING_AURA, true); @@ -1202,13 +1202,13 @@ class npc_living_inferno : public CreatureScript controller->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(1); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -1224,30 +1224,30 @@ class npc_living_ember : public CreatureScript { npc_living_emberAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _hasEnraged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _enrageTimer = 20000; _hasEnraged = false; } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (InstanceScript* instance = me->GetInstanceScript()) if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER))) controller->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -1267,7 +1267,7 @@ class npc_living_ember : public CreatureScript bool _hasEnraged; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -1301,14 +1301,14 @@ class go_twilight_portal : public GameObjectScript } } - bool GossipHello(Player* player) OVERRIDE + bool GossipHello(Player* player) override { if (_spellId != 0) player->CastSpell(player, _spellId, true); return true; } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (_instance->GetBossState(DATA_HALION) == IN_PROGRESS) return; @@ -1326,7 +1326,7 @@ class go_twilight_portal : public GameObjectScript bool _deleted; }; - GameObjectAI* GetAI(GameObject* gameobject) const OVERRIDE + GameObjectAI* GetAI(GameObject* gameobject) const override { return GetRubySanctumAI(gameobject); } @@ -1351,13 +1351,13 @@ class spell_halion_meteor_strike_marker : public SpellScriptLoader creCaster->AI()->DoAction(ACTION_METEOR_STRIKE_AOE); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_halion_meteor_strike_marker_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_halion_meteor_strike_marker_AuraScript(); } @@ -1375,7 +1375,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader public: spell_halion_combustion_consumption_AuraScript(uint32 spellID) : AuraScript(), _markSpell(spellID) { } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(_markSpell)) return false; @@ -1401,7 +1401,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _markSpell, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_halion_combustion_consumption_AuraScript::AddMarkStack, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); AfterEffectApply += AuraEffectApplyFn(spell_halion_combustion_consumption_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); @@ -1411,7 +1411,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader uint32 _markSpell; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_halion_combustion_consumption_AuraScript(_spellID); } @@ -1434,7 +1434,7 @@ class spell_halion_marks : public SpellScriptLoader spell_halion_marks_AuraScript(uint32 summonSpell, uint32 removeSpell) : AuraScript(), _summonSpellId(summonSpell), _removeSpellId(removeSpell) { } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(_summonSpellId)) return false; @@ -1461,7 +1461,7 @@ class spell_halion_marks : public SpellScriptLoader GetTarget()->CastCustomSpell(_summonSpellId, SPELLVALUE_BASE_POINT1, aurEff->GetBase()->GetStackAmount(), GetTarget(), TRIGGERED_FULL_MASK, NULL, NULL, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { OnDispel += AuraDispelFn(spell_halion_marks_AuraScript::BeforeDispel); AfterEffectRemove += AuraEffectRemoveFn(spell_halion_marks_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -1471,7 +1471,7 @@ class spell_halion_marks : public SpellScriptLoader uint32 _removeSpellId; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_halion_marks_AuraScript(_summonSpell, _removeSpell); } @@ -1505,13 +1505,13 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader summon->AI()->SetData(DATA_STACKS_DISPELLED, GetSpellValue()->EffectBasePoints[EFFECT_1]); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_halion_damage_aoe_summon_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_halion_damage_aoe_summon_SpellScript(); } @@ -1533,7 +1533,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader _isApply(isApplyHandler), _beforeHitSpellId(beforeHitSpell) { } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(_beforeHitSpellId)) return false; @@ -1558,7 +1558,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader instance->SendEncounterUnit(ENCOUNTER_FRAME_UNK7); } - void Register() OVERRIDE + void Register() override { if (!_isApply) { @@ -1573,7 +1573,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader uint32 _beforeHitSpellId; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_halion_twilight_realm_handlers_AuraScript(_beforeHitSpell, _isApplyHandler); } @@ -1592,7 +1592,7 @@ class spell_halion_clear_debuffs : public SpellScriptLoader { PrepareSpellScript(spell_halion_clear_debuffs_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CLEAR_DEBUFFS)) return false; @@ -1607,13 +1607,13 @@ class spell_halion_clear_debuffs : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(GetSpellInfo()->Effects[effIndex].CalcValue()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_halion_clear_debuffs_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_halion_clear_debuffs_SpellScript(); } @@ -1659,13 +1659,13 @@ class spell_halion_twilight_cutter : public SpellScriptLoader unitList.clear(); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halion_twilight_cutter_SpellScript::RemoveNotBetween, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_halion_twilight_cutter_SpellScript(); } @@ -1687,13 +1687,13 @@ class spell_halion_twilight_phasing : public SpellScriptLoader caster->GetMap()->SummonCreature(NPC_TWILIGHT_HALION, HalionSpawnPos); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_halion_twilight_phasing_SpellScript::Phase); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_halion_twilight_phasing_SpellScript(); } @@ -1721,14 +1721,14 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectLaunch += SpellEffectFn(spell_halion_summon_exit_portals_SpellScript::OnSummon, EFFECT_0, SPELL_EFFECT_SUMMON_OBJECT_WILD); OnEffectLaunch += SpellEffectFn(spell_halion_summon_exit_portals_SpellScript::OnSummon, EFFECT_1, SPELL_EFFECT_SUMMON_OBJECT_WILD); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_halion_summon_exit_portals_SpellScript(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 74f9484d99a..a6ff51ca147 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -80,13 +80,13 @@ class boss_saviana_ragefire : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -96,13 +96,13 @@ class boss_saviana_ragefire : public CreatureScript events.ScheduleEvent(EVENT_FLIGHT, 60000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); me->PlayDirectSound(SOUND_ID_DEATH); } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -131,20 +131,20 @@ class boss_saviana_ragefire : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); me->SetCanFly(false); me->SetDisableGravity(false); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -200,7 +200,7 @@ class boss_saviana_ragefire : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -241,14 +241,14 @@ class spell_saviana_conflagration_init : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_CONFLAGRATION_2, false); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_saviana_conflagration_init_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_saviana_conflagration_init_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_saviana_conflagration_init_SpellScript(); } @@ -270,13 +270,13 @@ class spell_saviana_conflagration_throwback : public SpellScriptLoader GetHitUnit()->GetMotionMaster()->MovePoint(POINT_LAND, SavianaRagefireFlyInPos); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_saviana_conflagration_throwback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_saviana_conflagration_throwback_SpellScript(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index 70918511e23..3a219a31c46 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -60,7 +60,7 @@ class instance_ruby_sanctum : public InstanceMapScript memset(BurningTreeGUID, 0, 4 * sizeof(uint64)); } - void OnPlayerEnter(Player* /*player*/) OVERRIDE + void OnPlayerEnter(Player* /*player*/) override { if (!GetData64(DATA_HALION_CONTROLLER) && GetBossState(DATA_HALION) != DONE && GetBossState(DATA_GENERAL_ZARITHRIAN) == DONE) { @@ -70,7 +70,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -115,7 +115,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -158,7 +158,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -170,7 +170,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -184,7 +184,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -227,7 +227,7 @@ class instance_ruby_sanctum : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -281,7 +281,7 @@ class instance_ruby_sanctum : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type != DATA_BALTHARUS_SHARED_HEALTH) return; @@ -289,7 +289,7 @@ class instance_ruby_sanctum : public InstanceMapScript BaltharusSharedHealth = data; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type != DATA_BALTHARUS_SHARED_HEALTH) return 0; @@ -297,7 +297,7 @@ class instance_ruby_sanctum : public InstanceMapScript return BaltharusSharedHealth; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -308,14 +308,14 @@ class instance_ruby_sanctum : public InstanceMapScript return saveStream.str(); } - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE + void FillInitialWorldStates(WorldStateBuilder& builder) override { builder.AppendState(WORLDSTATE_CORPOREALITY_MATERIAL, 50); builder.AppendState(WORLDSTATE_CORPOREALITY_TWILIGHT, 50); builder.AppendState(WORLDSTATE_CORPOREALITY_TOGGLE, 0); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -368,7 +368,7 @@ class instance_ruby_sanctum : public InstanceMapScript uint32 BaltharusSharedHealth; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ruby_sanctum_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index f816629b565..485cffd79bd 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -63,13 +63,13 @@ class npc_xerestrasza : public CreatureScript _introDone = false; } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); me->RemoveFlag(UNIT_FIELD_NPC_FLAGS, GOSSIP_OPTION_QUESTGIVER); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_BALTHARUS_DEATH) { @@ -95,7 +95,7 @@ class npc_xerestrasza : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_isIntro) return; @@ -141,7 +141,7 @@ class npc_xerestrasza : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetRubySanctumAI(creature); } @@ -152,7 +152,7 @@ class at_baltharus_plateau : public AreaTriggerScript public: at_baltharus_plateau() : AreaTriggerScript("at_baltharus_plateau") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { // Only trigger once if (InstanceScript* instance = player->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index c05bf519741..1c7d6b80cb6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -138,14 +138,14 @@ class spell_eadric_radiance : public SpellScriptLoader unitList.remove_if(OrientationCheck(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_eadric_radiance_SpellScript(); } @@ -173,7 +173,7 @@ class boss_eadric : public CreatureScript bool bDone; - void Reset() OVERRIDE + void Reset() override { uiVenganceTimer = 10000; uiRadianceTimer = 16000; @@ -183,7 +183,7 @@ class boss_eadric : public CreatureScript bDone = false; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage >= me->GetHealth()) { @@ -194,7 +194,7 @@ class boss_eadric : public CreatureScript } } - void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE + void MovementInform(uint32 MovementType, uint32 /*Data*/) override { if (MovementType != POINT_MOTION_TYPE) return; @@ -205,7 +205,7 @@ class boss_eadric : public CreatureScript me->DisappearAndDie(); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (bDone && uiResetTimer <= uiDiff) { @@ -249,7 +249,7 @@ class boss_eadric : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_eadricAI(creature); } @@ -283,7 +283,7 @@ class boss_paletress : public CreatureScript uint32 uiRenewTimer; uint32 uiResetTimer; - void Reset() OVERRIDE + void Reset() override { me->RemoveAllAuras(); @@ -301,13 +301,13 @@ class boss_paletress : public CreatureScript pMemory->RemoveFromWorld(); } - void SetData(uint32 uiId, uint32 /*uiValue*/) OVERRIDE + void SetData(uint32 uiId, uint32 /*uiValue*/) override { if (uiId == 1) me->RemoveAura(SPELL_SHIELD); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage >= me->GetHealth()) { @@ -318,7 +318,7 @@ class boss_paletress : public CreatureScript } } - void MovementInform(uint32 MovementType, uint32 Point) OVERRIDE + void MovementInform(uint32 MovementType, uint32 Point) override { if (MovementType != POINT_MOTION_TYPE || Point != 0) return; @@ -329,7 +329,7 @@ class boss_paletress : public CreatureScript me->DisappearAndDie(); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (bDone && uiResetTimer <= uiDiff) { @@ -401,13 +401,13 @@ class boss_paletress : public CreatureScript DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { MemoryGUID = summon->GetGUID(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_paletressAI(creature); } @@ -426,14 +426,14 @@ class npc_memory : public CreatureScript uint32 uiShadowPastTimer; uint32 uiWakingNightmare; - void Reset() OVERRIDE + void Reset() override { uiOldWoundsTimer = 12000; uiShadowPastTimer = 5000; uiWakingNightmare = 7000; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -467,7 +467,7 @@ class npc_memory : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (TempSummon* summ = me->ToTempSummon()) if (Unit* summoner = summ->GetSummoner()) @@ -476,7 +476,7 @@ class npc_memory : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_memoryAI(creature); } @@ -502,7 +502,7 @@ class npc_argent_soldier : public CreatureScript uint8 uiWaypoint; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId == 0) { @@ -521,7 +521,7 @@ class npc_argent_soldier : public CreatureScript } } - void SetData(uint32 uiType, uint32 /*uiData*/) OVERRIDE + void SetData(uint32 uiType, uint32 /*uiData*/) override { switch (me->GetEntry()) { @@ -573,7 +573,7 @@ class npc_argent_soldier : public CreatureScript uiWaypoint = uiType; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -583,14 +583,14 @@ class npc_argent_soldier : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, instance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_argent_soldierAI(creature); } @@ -635,7 +635,7 @@ class spell_paletress_summon_memory : public SpellScriptLoader { PrepareSpellScript(spell_paletress_summon_memory_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < 25; ++i) if (!sSpellMgr->GetSpellInfo(memorySpellId[i])) @@ -658,14 +658,14 @@ class spell_paletress_summon_memory : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), memorySpellId[urand(0, 24)], true, NULL, NULL, GetCaster()->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_paletress_summon_memory_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_paletress_summon_memory_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_paletress_summon_memory_SpellScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 91f64b0e6ea..5f60851ed15 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -111,7 +111,7 @@ class boss_black_knight : public CreatureScript uint32 uiDeathBiteTimer; uint32 uiMarkedDeathTimer; - void Reset() OVERRIDE + void Reset() override { RemoveSummons(); me->SetDisplayId(me->GetNativeDisplayId()); @@ -150,13 +150,13 @@ class boss_black_knight : public CreatureScript SummonList.clear(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { SummonList.push_back(summon->GetGUID()); summon->AI()->AttackStart(me->GetVictim()); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -271,7 +271,7 @@ class boss_black_knight : public CreatureScript DoMeleeAttackIfReady(); } - void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) OVERRIDE + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) override { if (uiDamage > me->GetHealth() && uiPhase <= PHASE_SKELETON) { @@ -292,7 +292,7 @@ class boss_black_knight : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_KILL_CREDIT); @@ -301,7 +301,7 @@ class boss_black_knight : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_black_knightAI(creature); } @@ -318,12 +318,12 @@ class npc_risen_ghoul : public CreatureScript uint32 uiAttackTimer; - void Reset() OVERRIDE + void Reset() override { uiAttackTimer = 3500; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -342,7 +342,7 @@ class npc_risen_ghoul : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_risen_ghoulAI(creature); } @@ -360,9 +360,9 @@ class npc_black_knight_skeletal_gryphon : public CreatureScript Start(false, true, 0, NULL); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } + void WaypointReached(uint32 /*waypointId*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -371,7 +371,7 @@ class npc_black_knight_skeletal_gryphon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_black_knight_skeletal_gryphonAI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 9d331bff6b9..4c948323eb6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -171,14 +171,14 @@ class generic_vehicleAI_toc5 : public CreatureScript uint32 uiWaypointPath; - void Reset() OVERRIDE + void Reset() override { uiChargeTimer = 5000; uiShieldBreakerTimer = 8000; uiBuffTimer = urand(30000, 60000); } - void SetData(uint32 uiType, uint32 /*uiData*/) OVERRIDE + void SetData(uint32 uiType, uint32 /*uiData*/) override { switch (uiType) { @@ -207,7 +207,7 @@ class generic_vehicleAI_toc5 : public CreatureScript Start(false, true, 0, NULL); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (!instance) return; @@ -224,7 +224,7 @@ class generic_vehicleAI_toc5 : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCastSpellShield(); } @@ -235,7 +235,7 @@ class generic_vehicleAI_toc5 : public CreatureScript DoCast(me, SPELL_SHIELD, true); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -300,7 +300,7 @@ class generic_vehicleAI_toc5 : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new generic_vehicleAI_toc5AI(creature); } @@ -342,14 +342,14 @@ class boss_warrior_toc5 : public CreatureScript bool bDone; bool bHome; - void Reset() OVERRIDE + void Reset() override { uiBladeStormTimer = urand(15000, 20000); uiInterceptTimer = 7000; uiMortalStrikeTimer = urand(8000, 12000); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { ScriptedAI::JustReachedHome(); @@ -362,7 +362,7 @@ class boss_warrior_toc5 : public CreatureScript bHome = false; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -426,14 +426,14 @@ class boss_warrior_toc5 : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warrior_toc5AI(creature); } @@ -475,7 +475,7 @@ class boss_mage_toc5 : public CreatureScript bool bDone; bool bHome; - void Reset() OVERRIDE + void Reset() override { uiFireBallTimer = 5000; uiPolymorphTimer = 8000; @@ -483,7 +483,7 @@ class boss_mage_toc5 : public CreatureScript uiHasteTimer = 22000; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { ScriptedAI::JustReachedHome(); @@ -496,7 +496,7 @@ class boss_mage_toc5 : public CreatureScript bHome = false; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -565,14 +565,14 @@ class boss_mage_toc5 : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mage_toc5AI(creature); } @@ -614,7 +614,7 @@ class boss_shaman_toc5 : public CreatureScript bool bDone; bool bHome; - void Reset() OVERRIDE + void Reset() override { uiChainLightningTimer = 16000; uiHealingWaveTimer = 12000; @@ -622,13 +622,13 @@ class boss_shaman_toc5 : public CreatureScript uiHexMendingTimer = urand(20000, 25000); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoCast(me, SPELL_EARTH_SHIELD); DoCast(who, SPELL_HEX_OF_MENDING); }; - void JustReachedHome() OVERRIDE + void JustReachedHome() override { ScriptedAI::JustReachedHome(); @@ -641,7 +641,7 @@ class boss_shaman_toc5 : public CreatureScript bHome = false; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -712,14 +712,14 @@ class boss_shaman_toc5 : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shaman_toc5AI(creature); } @@ -763,7 +763,7 @@ class boss_hunter_toc5 : public CreatureScript bool bDone; bool bHome; - void Reset() OVERRIDE + void Reset() override { uiShootTimer = 12000; uiMultiShotTimer = 0; @@ -774,7 +774,7 @@ class boss_hunter_toc5 : public CreatureScript bShoot = false; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { ScriptedAI::JustReachedHome(); @@ -787,7 +787,7 @@ class boss_hunter_toc5 : public CreatureScript bHome = false; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -868,14 +868,14 @@ class boss_hunter_toc5 : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_hunter_toc5AI(creature); } @@ -915,14 +915,14 @@ class boss_rouge_toc5 : public CreatureScript bool bDone; bool bHome; - void Reset() OVERRIDE + void Reset() override { uiEviscerateTimer = 8000; uiFanKivesTimer = 14000; uiPosionBottleTimer = 19000; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { ScriptedAI::JustReachedHome(); @@ -935,7 +935,7 @@ class boss_rouge_toc5 : public CreatureScript bHome = false; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -989,14 +989,14 @@ class boss_rouge_toc5 : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rouge_toc5AI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 7df8cd37774..49593529305 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -37,7 +37,7 @@ class instance_trial_of_the_champion : public InstanceMapScript public: instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", 650) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_trial_of_the_champion_InstanceMapScript(map); } @@ -69,7 +69,7 @@ class instance_trial_of_the_champion : public InstanceMapScript bool bDone; - void Initialize() OVERRIDE + void Initialize() override { uiMovementDone = 0; uiGrandChampionsDeaths = 0; @@ -93,7 +93,7 @@ class instance_trial_of_the_champion : public InstanceMapScript memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) { @@ -104,7 +104,7 @@ class instance_trial_of_the_champion : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -155,7 +155,7 @@ class instance_trial_of_the_champion : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -169,7 +169,7 @@ class instance_trial_of_the_champion : public InstanceMapScript } } - void SetData(uint32 uiType, uint32 uiData) OVERRIDE + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -238,7 +238,7 @@ class instance_trial_of_the_champion : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 uiData) const OVERRIDE + uint32 GetData(uint32 uiData) const override { switch (uiData) { @@ -254,7 +254,7 @@ class instance_trial_of_the_champion : public InstanceMapScript return 0; } - uint64 GetData64(uint32 uiData) const OVERRIDE + uint64 GetData64(uint32 uiData) const override { switch (uiData) { @@ -269,7 +269,7 @@ class instance_trial_of_the_champion : public InstanceMapScript return 0; } - void SetData64(uint32 uiType, uint64 uiData) OVERRIDE + void SetData64(uint32 uiType, uint64 uiData) override { switch (uiType) { @@ -285,7 +285,7 @@ class instance_trial_of_the_champion : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -304,7 +304,7 @@ class instance_trial_of_the_champion : public InstanceMapScript return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 4234591da8d..0574d89ac95 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -133,7 +133,7 @@ class npc_announcer_toc5 : public CreatureScript uiPhase = uiPhaseStep; } - void SetData(uint32 uiType, uint32 /*uiData*/) OVERRIDE + void SetData(uint32 uiType, uint32 /*uiData*/) override { switch (uiType) { @@ -188,7 +188,7 @@ class npc_announcer_toc5 : public CreatureScript } } - void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -411,7 +411,7 @@ class npc_announcer_toc5 : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { ScriptedAI::UpdateAI(uiDiff); @@ -443,7 +443,7 @@ class npc_announcer_toc5 : public CreatureScript return; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (instance && instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { @@ -452,7 +452,7 @@ class npc_announcer_toc5 : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { switch (summon->GetEntry()) { @@ -472,12 +472,12 @@ class npc_announcer_toc5 : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_announcer_toc5AI(creature); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); @@ -502,7 +502,7 @@ class npc_announcer_toc5 : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index ab619bd4991..987517bd687 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -170,7 +170,7 @@ class boss_anubarak_trial : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.SetPhase(PHASE_MELEE); @@ -198,7 +198,7 @@ class boss_anubarak_trial : public CreatureScript _burrowGUID.clear(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -208,7 +208,7 @@ class boss_anubarak_trial : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { if (!_intro) @@ -218,7 +218,7 @@ class boss_anubarak_trial : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->SetBossState(BOSS_ANUBARAK, FAIL); @@ -231,7 +231,7 @@ class boss_anubarak_trial : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -245,7 +245,7 @@ class boss_anubarak_trial : public CreatureScript (*itr)->DespawnOrUnsummon(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); switch (summoned->GetEntry()) @@ -267,7 +267,7 @@ class boss_anubarak_trial : public CreatureScript summons.Summon(summoned); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -287,7 +287,7 @@ class boss_anubarak_trial : public CreatureScript _sphereGUID[i] = summoned->GetGUID(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -422,7 +422,7 @@ class boss_anubarak_trial : public CreatureScript bool _reachedPhase3; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_anubarak_trialAI(creature); }; @@ -440,7 +440,7 @@ class npc_swarm_scarab : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->SetCorpseDelay(0); _determinationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); @@ -451,7 +451,7 @@ class npc_swarm_scarab : public CreatureScript Anubarak->AI()->JustSummoned(me); } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { switch (actionId) { @@ -464,12 +464,12 @@ class npc_swarm_scarab : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { DoCast(killer, RAID_MODE(SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_instance && _instance->GetBossState(BOSS_ANUBARAK) != IN_PROGRESS) me->DisappearAndDie(); @@ -494,7 +494,7 @@ class npc_swarm_scarab : public CreatureScript uint32 _determinationTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_swarm_scarabAI(creature); }; @@ -512,7 +512,7 @@ class npc_nerubian_burrower : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->SetCorpseDelay(10); _submergeTimer = 30*IN_MILLISECONDS; @@ -525,7 +525,7 @@ class npc_nerubian_burrower : public CreatureScript Anubarak->AI()->JustSummoned(me); } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { switch (actionId) { @@ -539,7 +539,7 @@ class npc_nerubian_burrower : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_instance && _instance->GetBossState(BOSS_ANUBARAK) != IN_PROGRESS) me->DisappearAndDie(); @@ -582,7 +582,7 @@ class npc_nerubian_burrower : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nerubian_burrowerAI(creature); }; @@ -599,7 +599,7 @@ class npc_frost_sphere : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); DoCast(SPELL_FROST_SPHERE); @@ -607,7 +607,7 @@ class npc_frost_sphere : public CreatureScript me->GetMotionMaster()->MoveRandom(20.0f); } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { if (me->GetHealth() <= damage) { @@ -635,7 +635,7 @@ class npc_frost_sphere : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != EFFECT_MOTION_TYPE) return; @@ -655,7 +655,7 @@ class npc_frost_sphere : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frost_sphereAI(creature); }; @@ -672,7 +672,7 @@ class npc_anubarak_spike : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _phase = PHASE_NO_MOVEMENT; _phaseSwitchTimer = 1; @@ -680,12 +680,12 @@ class npc_anubarak_spike : public CreatureScript me->SetInCombatWithZone(); } - bool CanAIAttack(Unit const* victim) const OVERRIDE + bool CanAIAttack(Unit const* victim) const override { return victim->GetTypeId() == TypeID::TYPEID_PLAYER; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) { @@ -694,12 +694,12 @@ class npc_anubarak_spike : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& uiDamage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& uiDamage) override { uiDamage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -743,7 +743,7 @@ class npc_anubarak_spike : public CreatureScript } } - void MoveInLineOfSight(Unit* pWho) OVERRIDE + void MoveInLineOfSight(Unit* pWho) override { if (!pWho) @@ -803,7 +803,7 @@ class npc_anubarak_spike : public CreatureScript PursuingSpikesPhases _phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_anubarak_spikeAI(creature); }; @@ -828,13 +828,13 @@ class spell_impale : public SpellScriptLoader SetHitDamage(0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_impale_SpellScript::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_impale_SpellScript(); } @@ -849,7 +849,7 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader { PrepareAuraScript(spell_anubarak_leeching_swarm_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_DMG) || !sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_HEAL)) return false; @@ -871,13 +871,13 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_anubarak_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_anubarak_leeching_swarm_AuraScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index a48c8b44c16..ccdd7de3015 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -353,7 +353,7 @@ class boss_toc_champion_controller : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _championsNotStarted = 0; _championsFailed = 0; @@ -471,7 +471,7 @@ class boss_toc_champion_controller : public CreatureScript } } - void SetData(uint32 uiType, uint32 uiData) OVERRIDE + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -539,7 +539,7 @@ class boss_toc_champion_controller : public CreatureScript bool _inProgress; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_toc_champion_controllerAI(creature); } @@ -552,14 +552,14 @@ struct boss_faction_championsAI : public BossAI _aiType = aitype; } - void Reset() OVERRIDE + void Reset() override { _events.ScheduleEvent(EVENT_THREAT, 5*IN_MILLISECONDS); if (IsHeroic() && (_aiType != AI_PET)) _events.ScheduleEvent(EVENT_REMOVE_CC, 5*IN_MILLISECONDS); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) if (Creature* pChampionController = Unit::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER))) @@ -609,7 +609,7 @@ struct boss_faction_championsAI : public BossAI //DoCast(me, SPELL_PVP_TRINKET); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_aiType != AI_PET) if (instance) @@ -617,7 +617,7 @@ struct boss_faction_championsAI : public BossAI pChampionController->AI()->SetData(2, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_ANTI_AOE, true); _EnterCombat(); @@ -626,7 +626,7 @@ struct boss_faction_championsAI : public BossAI pChampionController->AI()->SetData(2, IN_PROGRESS); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -693,7 +693,7 @@ struct boss_faction_championsAI : public BossAI return count; } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -712,7 +712,7 @@ struct boss_faction_championsAI : public BossAI } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -761,7 +761,7 @@ class npc_toc_druid : public CreatureScript { npc_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_LIFEBLOOM, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); @@ -775,7 +775,7 @@ class npc_toc_druid : public CreatureScript SetEquipmentSlots(false, 51799, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -839,7 +839,7 @@ class npc_toc_druid : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_druidAI(creature); } @@ -854,7 +854,7 @@ class npc_toc_shaman : public CreatureScript { npc_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_HEALING_WAVE, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -867,7 +867,7 @@ class npc_toc_shaman : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -932,7 +932,7 @@ class npc_toc_shaman : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_shamanAI(creature); } @@ -947,7 +947,7 @@ class npc_toc_paladin : public CreatureScript { npc_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_HAND_OF_FREEDOM, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS)); @@ -961,7 +961,7 @@ class npc_toc_paladin : public CreatureScript SetEquipmentSlots(false, 50771, 47079, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1036,7 +1036,7 @@ class npc_toc_paladin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_paladinAI(creature); } @@ -1051,7 +1051,7 @@ class npc_toc_priest : public CreatureScript { npc_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_RENEW, urand(3*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1064,7 +1064,7 @@ class npc_toc_priest : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1121,7 +1121,7 @@ class npc_toc_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_priestAI(creature); } @@ -1139,7 +1139,7 @@ class npc_toc_shadow_priest : public CreatureScript { npc_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_SILENCE, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS)); @@ -1154,7 +1154,7 @@ class npc_toc_shadow_priest : public CreatureScript DoCast(me, SPELL_SHADOWFORM); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1219,7 +1219,7 @@ class npc_toc_shadow_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_shadow_priestAI(creature); } @@ -1234,7 +1234,7 @@ class npc_toc_warlock : public CreatureScript { npc_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_HELLFIRE, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS)); @@ -1247,13 +1247,13 @@ class npc_toc_warlock : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_SUMMON_FELHUNTER); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1310,7 +1310,7 @@ class npc_toc_warlock : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_warlockAI(creature); } @@ -1325,7 +1325,7 @@ class npc_toc_mage : public CreatureScript { npc_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS)); @@ -1339,7 +1339,7 @@ class npc_toc_mage : public CreatureScript SetEquipmentSlots(false, 47524, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1404,7 +1404,7 @@ class npc_toc_mage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_mageAI(creature); } @@ -1419,7 +1419,7 @@ class npc_toc_hunter : public CreatureScript { npc_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_AIMED_SHOT, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1433,13 +1433,13 @@ class npc_toc_hunter : public CreatureScript SetEquipmentSlots(false, 47156, EQUIP_NO_CHANGE, 48711); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_CALL_PET); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1506,7 +1506,7 @@ class npc_toc_hunter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_hunterAI(creature); } @@ -1521,7 +1521,7 @@ class npc_toc_boomkin : public CreatureScript { npc_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_CYCLONE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS)); @@ -1536,7 +1536,7 @@ class npc_toc_boomkin : public CreatureScript SetEquipmentSlots(false, 50966, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1598,7 +1598,7 @@ class npc_toc_boomkin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_boomkinAI(creature); } @@ -1616,7 +1616,7 @@ class npc_toc_warrior : public CreatureScript { npc_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_BLADESTORM, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS)); @@ -1631,7 +1631,7 @@ class npc_toc_warrior : public CreatureScript SetEquipmentSlots(false, 47427, 46964, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1702,7 +1702,7 @@ class npc_toc_warrior : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_warriorAI(creature); } @@ -1717,7 +1717,7 @@ class npc_toc_dk : public CreatureScript { npc_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_CHAINS_OF_ICE, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); @@ -1730,7 +1730,7 @@ class npc_toc_dk : public CreatureScript SetEquipmentSlots(false, 47518, 51021, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1798,7 +1798,7 @@ class npc_toc_dk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_dkAI(creature); } @@ -1813,7 +1813,7 @@ class npc_toc_rogue : public CreatureScript { npc_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_FAN_OF_KNIVES, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1829,7 +1829,7 @@ class npc_toc_rogue : public CreatureScript me->SetMaxPower(POWER_ENERGY, 100); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1903,7 +1903,7 @@ class npc_toc_rogue : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_rogueAI(creature); } @@ -1918,7 +1918,7 @@ class npc_toc_enh_shaman : public CreatureScript { npc_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_DPS_EARTH_SHOCK, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1935,12 +1935,12 @@ class npc_toc_enh_shaman : public CreatureScript summons.DespawnAll(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* /*pSummoned*/) OVERRIDE + void SummonedCreatureDespawn(Creature* /*pSummoned*/) override { --_totemCount; } @@ -1963,13 +1963,13 @@ class npc_toc_enh_shaman : public CreatureScript */ } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { boss_faction_championsAI::JustDied(killer); summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -2029,7 +2029,7 @@ class npc_toc_enh_shaman : public CreatureScript float _totemOldCenterX, _totemOldCenterY; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_enh_shamanAI(creature); } @@ -2044,7 +2044,7 @@ class npc_toc_retro_paladin : public CreatureScript { npc_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_AVENGING_WRATH, urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS)); @@ -2058,13 +2058,13 @@ class npc_toc_retro_paladin : public CreatureScript SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_SEAL_OF_COMMAND); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -2135,7 +2135,7 @@ class npc_toc_retro_paladin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_retro_paladinAI(creature); } @@ -2150,14 +2150,14 @@ class npc_toc_pet_warlock : public CreatureScript { npc_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_DEVOUR_MAGIC, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); events.ScheduleEvent(EVENT_SPELL_LOCK, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -2187,7 +2187,7 @@ class npc_toc_pet_warlock : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_pet_warlockAI(creature); } @@ -2202,13 +2202,13 @@ class npc_toc_pet_hunter : public CreatureScript { npc_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) { } - void Reset() OVERRIDE + void Reset() override { boss_faction_championsAI::Reset(); _clawTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -2227,7 +2227,7 @@ class npc_toc_pet_hunter : public CreatureScript uint32 _clawTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toc_pet_hunterAI(creature); } @@ -2242,7 +2242,7 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_AFFLICTION_DISPEL)) return false; @@ -2255,13 +2255,13 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, NULL, GetEffect(EFFECT_0)); } - void Register() OVERRIDE + void Register() override { AfterDispel += AuraDispelFn(spell_faction_champion_warl_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_faction_champion_warl_unstable_affliction_AuraScript(); } @@ -2276,7 +2276,7 @@ class spell_faction_champion_death_grip : public SpellScriptLoader { PrepareSpellScript(spell_faction_champion_death_grip_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DEATH_GRIP_PULL)) return false; @@ -2292,13 +2292,13 @@ class spell_faction_champion_death_grip : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_faction_champion_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_faction_champion_death_grip_SpellScript(); } @@ -2313,7 +2313,7 @@ class spell_toc_bloodlust : public SpellScriptLoader { PrepareSpellScript(spell_toc_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(AURA_SATED)) return false; @@ -2331,7 +2331,7 @@ class spell_toc_bloodlust : public SpellScriptLoader target->CastSpell(target, AURA_SATED, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); @@ -2339,7 +2339,7 @@ class spell_toc_bloodlust : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_toc_bloodlust_SpellScript(); } @@ -2354,7 +2354,7 @@ class spell_toc_heroism : public SpellScriptLoader { PrepareSpellScript(spell_toc_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(AURA_EXHAUSTION)) return false; @@ -2372,7 +2372,7 @@ class spell_toc_heroism : public SpellScriptLoader target->CastSpell(target, AURA_EXHAUSTION, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); @@ -2380,7 +2380,7 @@ class spell_toc_heroism : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_toc_heroism_SpellScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 6bb7aa836e5..4be999289c4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -103,7 +103,7 @@ class boss_jaraxxus : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_FEL_FIREBALL, 5*IN_MILLISECONDS); @@ -115,7 +115,7 @@ class boss_jaraxxus : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_INFERNAL_ERUPTION, 80*IN_MILLISECONDS); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); if (instance) @@ -124,7 +124,7 @@ class boss_jaraxxus : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -134,24 +134,24 @@ class boss_jaraxxus : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summons.Summon(summoned); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -214,7 +214,7 @@ class boss_jaraxxus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_jaraxxusAI(creature); } @@ -233,14 +233,14 @@ class npc_legion_flame : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetInCombatWithZone(); DoCast(SPELL_LEGION_FLAME_EFFECT); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { UpdateVictim(); if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) @@ -250,7 +250,7 @@ class npc_legion_flame : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_legion_flameAI(creature); } @@ -268,7 +268,7 @@ class npc_infernal_volcano : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); @@ -280,31 +280,31 @@ class npc_infernal_volcano : public CreatureScript _summons.DespawnAll(); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCast(SPELL_INFERNAL_ERUPTION_EFFECT); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { _summons.Summon(summoned); // makes immediate corpse despawn of summoned Felflame Infernals summoned->SetCorpseDelay(0); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { // used to despawn corpse immediately me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } private: SummonList _summons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_infernal_volcanoAI(creature); } @@ -322,13 +322,13 @@ class npc_fel_infernal : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _felStreakTimer = 30*IN_MILLISECONDS; me->SetInCombatWithZone(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) { @@ -355,7 +355,7 @@ class npc_fel_infernal : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fel_infernalAI(creature); } @@ -372,7 +372,7 @@ class npc_nether_portal : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); @@ -384,31 +384,31 @@ class npc_nether_portal : public CreatureScript _summons.DespawnAll(); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCast(SPELL_NETHER_PORTAL_EFFECT); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { _summons.Summon(summoned); // makes immediate corpse despawn of summoned Mistress of Pain summoned->SetCorpseDelay(0); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { // used to despawn corpse immediately me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } private: SummonList _summons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nether_portalAI(creature); } @@ -428,7 +428,7 @@ class npc_mistress_of_pain : public CreatureScript _instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE); } - void Reset() OVERRIDE + void Reset() override { _events.ScheduleEvent(EVENT_SHIVAN_SLASH, 30*IN_MILLISECONDS); _events.ScheduleEvent(EVENT_SPINNING_STRIKE, 30*IN_MILLISECONDS); @@ -437,13 +437,13 @@ class npc_mistress_of_pain : public CreatureScript me->SetInCombatWithZone(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_instance) _instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) { @@ -488,7 +488,7 @@ class npc_mistress_of_pain : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mistress_of_painAI(creature); } @@ -503,7 +503,7 @@ class spell_mistress_kiss : public SpellScriptLoader { PrepareAuraScript(spell_mistress_kiss_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (GetCaster()) if (sSpellMgr->GetSpellIdForDifficulty(SPELL_MISTRESS_KISS_DAMAGE_SILENCE, GetCaster())) @@ -525,13 +525,13 @@ class spell_mistress_kiss : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mistress_kiss_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mistress_kiss_AuraScript(); } @@ -578,14 +578,14 @@ class spell_mistress_kiss_area : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mistress_kiss_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_mistress_kiss_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mistress_kiss_area_SpellScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index be2a828a714..6a99c3c9b73 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -162,7 +162,7 @@ class boss_gormok : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_IMPALE, urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS)); events.ScheduleEvent(EVENT_STAGGERING_STOMP, 15*IN_MILLISECONDS); @@ -171,13 +171,13 @@ class boss_gormok : public CreatureScript summons.DespawnAll(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE) return; @@ -195,13 +195,13 @@ class boss_gormok : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) { @@ -211,7 +211,7 @@ class boss_gormok : public CreatureScript me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); me->SetInCombatWithZone(); @@ -228,7 +228,7 @@ class boss_gormok : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { // despawn the remaining passengers on death if (damage >= me->GetHealth()) @@ -237,7 +237,7 @@ class boss_gormok : public CreatureScript pSnobold->ToCreature()->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -284,7 +284,7 @@ class boss_gormok : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gormokAI(creature); } @@ -304,7 +304,7 @@ class npc_snobold_vassal : public CreatureScript _instance->SetData(DATA_SNOBOLD_COUNT, INCREASE); } - void Reset() OVERRIDE + void Reset() override { _events.ScheduleEvent(EVENT_BATTER, 5*IN_MILLISECONDS); _events.ScheduleEvent(EVENT_HEAD_CRACK, 25*IN_MILLISECONDS); @@ -318,25 +318,25 @@ class npc_snobold_vassal : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _targetGUID = who->GetGUID(); me->TauntApply(who); DoCast(who, SPELL_SNOBOLLED); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (pDoneBy->GetGUID() == _targetGUID) uiDamage = 0; } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE) return; @@ -352,7 +352,7 @@ class npc_snobold_vassal : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* target = ObjectAccessor::GetPlayer(*me, _targetGUID)) if (target->IsAlive()) @@ -361,7 +361,7 @@ class npc_snobold_vassal : public CreatureScript _instance->SetData(DATA_SNOBOLD_COUNT, DECREASE); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -376,7 +376,7 @@ class npc_snobold_vassal : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || _targetDied) return; @@ -457,7 +457,7 @@ class npc_snobold_vassal : public CreatureScript bool _targetDied; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_snobold_vassalAI(creature); } @@ -475,7 +475,7 @@ class npc_firebomb : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_FIRE_BOMB_DOT, true); SetCombatMovement(false); @@ -483,7 +483,7 @@ class npc_firebomb : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (_instance->GetData(TYPE_NORTHREND_BEASTS) != GORMOK_IN_PROGRESS) me->DespawnOrUnsummon(); @@ -493,7 +493,7 @@ class npc_firebomb : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_firebombAI(creature); } @@ -505,7 +505,7 @@ struct boss_jormungarAI : public BossAI { } - void Reset() OVERRIDE + void Reset() override { Enraged = false; @@ -517,7 +517,7 @@ struct boss_jormungarAI : public BossAI events.ScheduleEvent(EVENT_SLIME_POOL, 15*IN_MILLISECONDS, 0, PHASE_MOBILE); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -536,7 +536,7 @@ struct boss_jormungarAI : public BossAI } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { // prevent losing 2 attempts at once on heroics if (instance && instance->GetData(TYPE_NORTHREND_BEASTS) != FAIL) @@ -545,14 +545,14 @@ struct boss_jormungarAI : public BossAI me->DespawnOrUnsummon(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) if (instance) instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELIGIBLE, 0); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); me->SetInCombatWithZone(); @@ -560,7 +560,7 @@ struct boss_jormungarAI : public BossAI instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -699,7 +699,7 @@ class boss_acidmaw : public CreatureScript { boss_acidmawAI(Creature* creature) : boss_jormungarAI(creature) { } - void Reset() OVERRIDE + void Reset() override { boss_jormungarAI::Reset(); BiteSpell = SPELL_PARALYTIC_BITE; @@ -715,7 +715,7 @@ class boss_acidmaw : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_acidmawAI(creature); } @@ -732,7 +732,7 @@ class boss_dreadscale : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { boss_jormungarAI::Reset(); BiteSpell = SPELL_BURNING_BITE; @@ -749,7 +749,7 @@ class boss_dreadscale : public CreatureScript WasMobile = false; } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE) return; @@ -767,13 +767,13 @@ class boss_dreadscale : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); boss_jormungarAI::EnterEvadeMode(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); @@ -782,7 +782,7 @@ class boss_dreadscale : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_dreadscaleAI(creature); } @@ -800,13 +800,13 @@ class npc_slime_pool : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _cast = false; me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!_cast) { @@ -822,7 +822,7 @@ class npc_slime_pool : public CreatureScript bool _cast; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_slime_poolAI(creature); } @@ -846,13 +846,13 @@ class spell_gormok_fire_bomb : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_gormok_fire_bomb_SpellScript::TriggerFireBomb, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gormok_fire_bomb_SpellScript(); } @@ -869,7 +869,7 @@ class boss_icehowl : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_FEROCIOUS_BUTT, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS)); @@ -885,14 +885,14 @@ class boss_icehowl : public CreatureScript _stage = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); if (instance) instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE); } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -929,13 +929,13 @@ class boss_icehowl : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) { @@ -945,7 +945,7 @@ class boss_icehowl : public CreatureScript me->DespawnOrUnsummon(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -954,14 +954,14 @@ class boss_icehowl : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); if (instance) instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_TRAMPLE && target->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -973,7 +973,7 @@ class boss_icehowl : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1138,7 +1138,7 @@ class boss_icehowl : public CreatureScript uint8 _stage; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_icehowlAI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 54967734705..a2428c05b60 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -147,7 +147,7 @@ struct boss_twin_baseAI : public BossAI { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); @@ -165,7 +165,7 @@ struct boss_twin_baseAI : public BossAI summons.DespawnAll(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->SetBossState(BOSS_VALKIRIES, FAIL); @@ -174,7 +174,7 @@ struct boss_twin_baseAI : public BossAI me->DespawnOrUnsummon(); } - void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -190,7 +190,7 @@ struct boss_twin_baseAI : public BossAI } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -200,12 +200,12 @@ struct boss_twin_baseAI : public BossAI } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) OVERRIDE + void SummonedCreatureDespawn(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -226,7 +226,7 @@ struct boss_twin_baseAI : public BossAI summons.Despawn(summoned); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); if (instance) @@ -255,7 +255,7 @@ struct boss_twin_baseAI : public BossAI return Unit::GetCreature((*me), instance->GetData64(SisterNpcId)); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->SetInCombatWithZone(); if (instance) @@ -272,7 +272,7 @@ struct boss_twin_baseAI : public BossAI DoCast(me, SurgeSpellId); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -294,7 +294,7 @@ struct boss_twin_baseAI : public BossAI me->UpdateDamagePhysical(mode ? WeaponAttackType::OFF_ATTACK : WeaponAttackType::BASE_ATTACK); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance || !UpdateVictim()) return; @@ -405,7 +405,7 @@ class boss_fjola : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); Stage = 0; @@ -427,7 +427,7 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::Reset(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); @@ -436,13 +436,13 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::EnterCombat(who); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); boss_twin_baseAI::EnterEvadeMode(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); @@ -451,7 +451,7 @@ class boss_fjola : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fjolaAI(creature); } @@ -466,7 +466,7 @@ class boss_eydis : public CreatureScript { boss_eydisAI(Creature* creature) : boss_twin_baseAI(creature) { } - void Reset() OVERRIDE + void Reset() override { SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); Stage = 1; @@ -486,7 +486,7 @@ class boss_eydis : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_eydisAI(creature); } @@ -501,7 +501,7 @@ class npc_essence_of_twin : public CreatureScript { npc_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { uint32 spellReturned = 0; switch (me->GetEntry()) @@ -520,12 +520,12 @@ class npc_essence_of_twin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_essence_of_twinAI(creature); }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { player->RemoveAurasDueToSpell(creature->GetAI()->GetData(ESSENCE_REMOVE)); player->CastSpell(player, creature->GetAI()->GetData(ESSENCE_APPLY), true); @@ -554,7 +554,7 @@ struct npc_unleashed_ballAI : public ScriptedAI me->GetMotionMaster()->MovePoint(0, x, y, me->GetPositionZ()); } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); @@ -565,7 +565,7 @@ struct npc_unleashed_ballAI : public ScriptedAI RangeCheckTimer = 500; } - void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -596,7 +596,7 @@ class npc_unleashed_dark : public CreatureScript { npc_unleashed_darkAI(Creature* creature) : npc_unleashed_ballAI(creature) { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (RangeCheckTimer < diff) { @@ -613,7 +613,7 @@ class npc_unleashed_dark : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unleashed_darkAI(creature); } @@ -628,7 +628,7 @@ class npc_unleashed_light : public CreatureScript { npc_unleashed_lightAI(Creature* creature) : npc_unleashed_ballAI(creature) { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (RangeCheckTimer < diff) { @@ -645,7 +645,7 @@ class npc_unleashed_light : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unleashed_lightAI(creature); } @@ -663,18 +663,18 @@ class npc_bullet_controller : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { DoCastAOE(SPELL_CONTROLLER_PERIODIC); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { UpdateVictim(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bullet_controllerAI(creature); } @@ -693,7 +693,7 @@ class spell_powering_up : public SpellScriptLoader uint32 spellId; uint32 poweringUp; - bool Load() OVERRIDE + bool Load() override { spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster()); if (!sSpellMgr->GetSpellInfo(spellId)) @@ -726,13 +726,13 @@ class spell_powering_up : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_powering_up_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_powering_up_SpellScript(); } @@ -749,7 +749,7 @@ class spell_valkyr_essences : public SpellScriptLoader uint32 spellId; - bool Load() OVERRIDE + bool Load() override { spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster()); if (!sSpellMgr->GetSpellInfo(spellId)) @@ -821,13 +821,13 @@ class spell_valkyr_essences : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectAbsorb += AuraEffectAbsorbFn(spell_valkyr_essences_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_valkyr_essences_AuraScript(); } @@ -842,7 +842,7 @@ class spell_power_of_the_twins : public SpellScriptLoader { PrepareAuraScript(spell_power_of_the_twins_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -865,14 +865,14 @@ class spell_power_of_the_twins : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_power_of_the_twins_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_power_of_the_twins_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_power_of_the_twins_AuraScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 03366caa08c..324702084b4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -33,7 +33,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript { instance_trial_of_the_crusader_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(MAX_ENCOUNTERS); TrialCounter = 50; @@ -71,7 +71,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript FloorGUID = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i) if (GetBossState(i) == IN_PROGRESS) @@ -84,7 +84,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return false; } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (instance->IsHeroic()) { @@ -124,7 +124,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript go->SetGoState(GOState::GO_STATE_READY); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -181,7 +181,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -229,7 +229,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -405,7 +405,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -474,7 +474,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -525,7 +525,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return 0; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -631,7 +631,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (GetData(TYPE_NORTHREND_BEASTS) == SNAKES_SPECIAL && NotOneButTwoJormungarsTimer) { @@ -667,12 +667,12 @@ class instance_trial_of_the_crusader : public InstanceMapScript NeedSave = false; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { return SaveDataBuffer; } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { @@ -699,7 +699,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { switch (criteria_id) { @@ -776,7 +776,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript bool TributeToImmortalityEligible; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_trial_of_the_crusader_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index f1f53d9af9e..358ecde1515 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -117,7 +117,7 @@ class npc_announcer_toc10 : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); if (Creature* pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f)) @@ -126,10 +126,10 @@ class npc_announcer_toc10 : public CreatureScript pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (!instance) @@ -158,7 +158,7 @@ class npc_announcer_toc10 : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) override { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -222,7 +222,7 @@ class npc_announcer_toc10 : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_announcer_toc10AI(creature); } @@ -240,7 +240,7 @@ class boss_lich_king_toc : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _updateTimer = 0; me->SetReactState(REACT_PASSIVE); @@ -254,7 +254,7 @@ class boss_lich_king_toc : public CreatureScript me->SetWalk(true); } - void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiId) override { if (uiType != POINT_MOTION_TYPE || !_instance) return; @@ -272,7 +272,7 @@ class boss_lich_king_toc : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!_instance) return; @@ -357,7 +357,7 @@ class boss_lich_king_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lich_king_tocAI(creature); } @@ -375,7 +375,7 @@ class npc_fizzlebang_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Talk(SAY_STAGE_1_06, killer); _instance->SetData(TYPE_EVENT, 1180); @@ -387,14 +387,14 @@ class npc_fizzlebang_toc : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { me->SetWalk(true); _portalGUID = 0; me->GetMotionMaster()->MovePoint(1, ToCCommonLoc[10].GetPositionX(), ToCCommonLoc[10].GetPositionY()-60, ToCCommonLoc[10].GetPositionZ()); } - void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -415,12 +415,12 @@ class npc_fizzlebang_toc : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { _summons.Summon(summoned); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!_instance) return; @@ -531,7 +531,7 @@ class npc_fizzlebang_toc : public CreatureScript uint64 _triggerGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fizzlebang_tocAI(creature); } @@ -549,11 +549,11 @@ class npc_tirion_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!_instance) return; @@ -819,7 +819,7 @@ class npc_tirion_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tirion_tocAI(creature); } @@ -837,11 +837,11 @@ class npc_garrosh_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!_instance) return; @@ -903,7 +903,7 @@ class npc_garrosh_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_garrosh_tocAI(creature); } @@ -921,11 +921,11 @@ class npc_varian_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!_instance) return; @@ -987,7 +987,7 @@ class npc_varian_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_varian_tocAI(creature); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp index 1caf3534cee..49634703755 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp @@ -63,12 +63,12 @@ class boss_king_dred : public CreatureScript { boss_king_dredAI(Creature* creature) : BossAI(creature, DATA_KING_DRED) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -80,13 +80,13 @@ class boss_king_dred : public CreatureScript events.ScheduleEvent(EVENT_RAPTOR_CALL, urand(20000, 25000)); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_RAPTOR_KILLED) ++raptorsKilled; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_RAPTORS_KILLED) return raptorsKilled; @@ -94,12 +94,12 @@ class boss_king_dred : public CreatureScript return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -154,7 +154,7 @@ class boss_king_dred : public CreatureScript uint8 raptorsKilled; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -176,12 +176,12 @@ class npc_drakkari_gutripper : public CreatureScript uint32 GutRipTimer; - void Reset() OVERRIDE + void Reset() override { GutRipTimer = urand(10000, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -197,14 +197,14 @@ class npc_drakkari_gutripper : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KING_DRED))) Dred->AI()->DoAction(ACTION_RAPTOR_KILLED); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -226,12 +226,12 @@ class npc_drakkari_scytheclaw : public CreatureScript uint32 uiRendTimer; - void Reset() OVERRIDE + void Reset() override { uiRendTimer = urand(10000, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -247,14 +247,14 @@ class npc_drakkari_scytheclaw : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KING_DRED))) Dred->AI()->DoAction(ACTION_RAPTOR_KILLED); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -267,7 +267,7 @@ class achievement_king_dred : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 4b32529a3f4..6390438e4f5 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -85,7 +85,7 @@ class boss_novos : public CreatureScript { boss_novosAI(Creature* creature) : BossAI(creature, DATA_NOVOS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -96,7 +96,7 @@ class boss_novos : public CreatureScript SetBubbled(false); } - void EnterCombat(Unit* /* victim */) OVERRIDE + void EnterCombat(Unit* /* victim */) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -106,7 +106,7 @@ class boss_novos : public CreatureScript SetBubbled(true); } - void AttackStart(Unit* target) OVERRIDE + void AttackStart(Unit* target) override { if (!target) return; @@ -115,19 +115,19 @@ class boss_novos : public CreatureScript DoStartNoMovement(target); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || _bubbled) return; @@ -156,13 +156,13 @@ class boss_novos : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_CRYSTAL_HANDLER_DIED) CrystalHandlerDied(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { BossAI::MoveInLineOfSight(who); @@ -174,12 +174,12 @@ class boss_novos : public CreatureScript _ohNovos = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return type == DATA_NOVOS_ACHIEV && _ohNovos ? 1 : 0; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); } @@ -270,7 +270,7 @@ class boss_novos : public CreatureScript bool _bubbled; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -285,14 +285,14 @@ class npc_crystal_channel_target : public CreatureScript { npc_crystal_channel_targetAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _spell = 0; _timer = 0; _temp = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_spell) { @@ -306,14 +306,14 @@ class npc_crystal_channel_target : public CreatureScript } } - void SetData(uint32 id, uint32 value) OVERRIDE + void SetData(uint32 id, uint32 value) override { _spell = id; _timer = value; _temp = value; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (InstanceScript* instance = me->GetInstanceScript()) if (uint64 guid = instance->GetData64(DATA_NOVOS)) @@ -333,7 +333,7 @@ class npc_crystal_channel_target : public CreatureScript uint32 _temp; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -344,7 +344,7 @@ class achievement_oh_novos : public AchievementCriteriaScript public: achievement_oh_novos() : AchievementCriteriaScript("achievement_oh_novos") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetTypeId() == TypeID::TYPEID_UNIT && target->ToCreature()->AI()->GetData(DATA_NOVOS_ACHIEV); } @@ -359,7 +359,7 @@ class spell_novos_summon_minions : public SpellScriptLoader { PrepareSpellScript(spell_novos_summon_minions_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_COPY_OF_MINIONS)) return false; @@ -372,13 +372,13 @@ class spell_novos_summon_minions : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SUMMON_COPY_OF_MINIONS, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_novos_summon_minions_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_novos_summon_minions_SpellScript(); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 33ff7f4e704..74866b2b3b9 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -87,13 +87,13 @@ class boss_tharon_ja : public CreatureScript { boss_tharon_jaAI(Creature* creature) : BossAI(creature, DATA_THARON_JA) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->RestoreDisplayId(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); _EnterCombat(); @@ -104,13 +104,13 @@ class boss_tharon_ja : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(8000, 10000)); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -119,7 +119,7 @@ class boss_tharon_ja : public CreatureScript DoCastAOE(SPELL_ACHIEVEMENT_CHECK, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -202,7 +202,7 @@ class boss_tharon_ja : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -217,7 +217,7 @@ class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScriptLoader { PrepareSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GIFT_OF_THARON_JA)) return false; @@ -230,13 +230,13 @@ class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScriptLoader target->RemoveAura(SPELL_GIFT_OF_THARON_JA); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript(); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 4a5b9cca4d8..3aa2f2f647c 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -78,13 +78,13 @@ class boss_trollgore : public CreatureScript { boss_trollgoreAI(Creature* creature) : BossAI(creature, DATA_TROLLGORE) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _consumptionJunction = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -96,7 +96,7 @@ class boss_trollgore : public CreatureScript events.ScheduleEvent(EVENT_SPAWN, urand(30000, 40000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -150,13 +150,13 @@ class boss_trollgore : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_CONSUMPTION_JUNCTION) return _consumptionJunction ? 1 : 0; @@ -164,7 +164,7 @@ class boss_trollgore : public CreatureScript return 0; } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -172,7 +172,7 @@ class boss_trollgore : public CreatureScript Talk(SAY_KILL); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->GetMotionMaster()->MovePoint(POINT_LANDING, Landing); summons.Summon(summon); @@ -182,7 +182,7 @@ class boss_trollgore : public CreatureScript bool _consumptionJunction; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -197,7 +197,7 @@ class npc_drakkari_invader : public CreatureScript { npc_drakkari_invaderAI(Creature* creature) : ScriptedAI(creature) { } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type == POINT_MOTION_TYPE && pointId == POINT_LANDING) { @@ -208,7 +208,7 @@ class npc_drakkari_invader : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetDrakTharonKeepAI(creature); } @@ -224,7 +224,7 @@ class spell_trollgore_consume : public SpellScriptLoader { PrepareSpellScript(spell_trollgore_consume_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CONSUME_BUFF)) return false; @@ -237,13 +237,13 @@ class spell_trollgore_consume : public SpellScriptLoader target->CastSpell(GetCaster(), SPELL_CONSUME_BUFF, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_trollgore_consume_SpellScript::HandleConsume, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_trollgore_consume_SpellScript(); } @@ -259,7 +259,7 @@ class spell_trollgore_corpse_explode : public SpellScriptLoader { PrepareAuraScript(spell_trollgore_corpse_explode_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CORPSE_EXPLODE_DAMAGE)) return false; @@ -279,14 +279,14 @@ class spell_trollgore_corpse_explode : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_trollgore_corpse_explode_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); AfterEffectRemove += AuraEffectRemoveFn(spell_trollgore_corpse_explode_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_trollgore_corpse_explode_AuraScript(); } @@ -302,7 +302,7 @@ class spell_trollgore_invader_taunt : public SpellScriptLoader { PrepareSpellScript(spell_trollgore_invader_taunt_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue())) return false; @@ -315,13 +315,13 @@ class spell_trollgore_invader_taunt : public SpellScriptLoader target->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_trollgore_invader_taunt_SpellScript::HandleTaunt, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_trollgore_invader_taunt_SpellScript(); } @@ -334,7 +334,7 @@ class achievement_consumption_junction : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index d05d8211ec0..4288340d7c6 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -44,7 +44,7 @@ class instance_drak_tharon_keep : public InstanceMapScript memset(NovosSummonerGUIDs, 0, 4 * sizeof(uint64)); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -71,7 +71,7 @@ class instance_drak_tharon_keep : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -124,7 +124,7 @@ class instance_drak_tharon_keep : public InstanceMapScript NovosSummonerGUIDs[3] = creature->GetGUID(); } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -155,14 +155,14 @@ class instance_drak_tharon_keep : public InstanceMapScript return 0; } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { if (unit->GetEntry() == NPC_CRYSTAL_HANDLER) if (Creature* novos = instance->GetCreature(NovosGUID)) novos->AI()->DoAction(ACTION_CRYSTAL_HANDLER_DIED); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -173,7 +173,7 @@ class instance_drak_tharon_keep : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -216,7 +216,7 @@ class instance_drak_tharon_keep : public InstanceMapScript uint64 NovosSummonerGUIDs[4]; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_drak_tharon_keep_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 26d37068bcf..205e5576070 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -74,7 +74,7 @@ class boss_bronjahm : public CreatureScript DoCast(me, SPELL_SOULSTORM_CHANNEL, true); } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (!instance || static_cast(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName)) me->IsAIEnabled = false; @@ -82,7 +82,7 @@ class boss_bronjahm : public CreatureScript Reset(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.SetPhase(PHASE_1); @@ -93,12 +93,12 @@ class boss_bronjahm : public CreatureScript instance->SetBossState(DATA_BRONJAHM, NOT_STARTED); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { DoCast(me, SPELL_SOULSTORM_CHANNEL, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL); @@ -106,20 +106,20 @@ class boss_bronjahm : public CreatureScript instance->SetBossState(DATA_BRONJAHM, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetBossState(DATA_BRONJAHM, DONE); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (events.IsInPhase(PHASE_1) && !HealthAbovePct(30)) { @@ -130,7 +130,7 @@ class boss_bronjahm : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); summon->SetReactState(REACT_PASSIVE); @@ -139,7 +139,7 @@ class boss_bronjahm : public CreatureScript summon->CastSpell(summon, SPELL_PURPLE_BANISH_VISUAL, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -189,7 +189,7 @@ class boss_bronjahm : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_bronjahmAI(creature); } @@ -207,7 +207,7 @@ class npc_corrupted_soul_fragment : public CreatureScript instance = me->GetInstanceScript(); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != CHASE_MOTION_TYPE) return; @@ -232,7 +232,7 @@ class npc_corrupted_soul_fragment : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_corrupted_soul_fragmentAI(creature); } @@ -260,13 +260,13 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader SetHitDamage(newDamage); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_bronjahm_magic_bane_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_bronjahm_magic_bane_SpellScript(); } @@ -287,13 +287,13 @@ class spell_bronjahm_consume_soul : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_bronjahm_consume_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_bronjahm_consume_soul_SpellScript(); } @@ -315,13 +315,13 @@ class spell_bronjahm_soulstorm_channel : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), i, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_channel_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_bronjahm_soulstorm_channel_AuraScript(); } @@ -346,13 +346,13 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), i, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_visual_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_bronjahm_soulstorm_visual_AuraScript(); } @@ -394,7 +394,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader targets = sharedTargets; } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargetsInitial, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY); @@ -403,7 +403,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader std::list sharedTargets; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_bronjahm_soulstorm_targeting_SpellScript(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 5d862d99f2b..48a04c48a7d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -135,7 +135,7 @@ class boss_devourer_of_souls : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (!instance || static_cast(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName)) me->IsAIEnabled = false; @@ -143,7 +143,7 @@ class boss_devourer_of_souls : public CreatureScript Reset(); } - void Reset() OVERRIDE + void Reset() override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); me->SetDisplayId(DISPLAY_ANGER); @@ -157,7 +157,7 @@ class boss_devourer_of_souls : public CreatureScript instance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_FACE_AGGRO); @@ -172,7 +172,7 @@ class boss_devourer_of_souls : public CreatureScript instance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -197,7 +197,7 @@ class boss_devourer_of_souls : public CreatureScript Talk(textId); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { summons.DespawnAll(); @@ -226,13 +226,13 @@ class boss_devourer_of_souls : public CreatureScript } } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override { if (spell->Id == H_SPELL_PHANTOM_BLAST) threeFaced = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_THREE_FACED) return threeFaced; @@ -240,7 +240,7 @@ class boss_devourer_of_souls : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Return since we have no target if (!UpdateVictim()) @@ -346,7 +346,7 @@ class boss_devourer_of_souls : public CreatureScript int8 wailingSoulTick; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_devourer_of_soulsAI(creature); } @@ -362,7 +362,7 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScriptLoader { PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MIRRORED_SOUL_PROC_AURA)) return false; @@ -375,13 +375,13 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScriptLoader target->CastSpell(GetCaster(), SPELL_MIRRORED_SOUL_PROC_AURA, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_devourer_of_souls_mirrored_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_devourer_of_souls_mirrored_soul_SpellScript(); } @@ -397,14 +397,14 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader { PrepareAuraScript(spell_devourer_of_souls_mirrored_soul_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MIRRORED_SOUL_DAMAGE)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return true; } @@ -421,14 +421,14 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MIRRORED_SOUL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, GetCaster(), true); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_devourer_of_souls_mirrored_soul_proc_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_devourer_of_souls_mirrored_soul_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_devourer_of_souls_mirrored_soul_proc_AuraScript(); } @@ -444,7 +444,7 @@ class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript { PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MIRRORED_SOUL_BUFF)) return false; @@ -467,14 +467,14 @@ class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript GetCaster()->CastSpell(target, SPELL_MIRRORED_SOUL_BUFF, false); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript(); } @@ -487,7 +487,7 @@ class achievement_three_faced : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 4faa7cf7580..f16914e1286 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -92,13 +92,13 @@ class npc_sylvanas_fos : public CreatureScript EventMap events; Phase phase; - void Reset() OVERRIDE + void Reset() override { events.Reset(); phase = PHASE_NORMAL; } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { switch (actionId) { @@ -112,7 +112,7 @@ class npc_sylvanas_fos : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (phase == PHASE_INTRO) { @@ -164,7 +164,7 @@ class npc_sylvanas_fos : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -178,7 +178,7 @@ class npc_sylvanas_fos : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -194,7 +194,7 @@ class npc_sylvanas_fos : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sylvanas_fosAI(creature); } @@ -218,13 +218,13 @@ class npc_jaina_fos : public CreatureScript EventMap events; Phase phase; - void Reset() OVERRIDE + void Reset() override { events.Reset(); phase = PHASE_NORMAL; } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { switch (actionId) { @@ -238,7 +238,7 @@ class npc_jaina_fos : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (phase == PHASE_INTRO) { @@ -301,7 +301,7 @@ class npc_jaina_fos : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -315,7 +315,7 @@ class npc_jaina_fos : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -331,7 +331,7 @@ class npc_jaina_fos : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_jaina_fosAI(creature); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 662d4bd4166..84b1f787d93 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -46,7 +46,7 @@ class instance_forge_of_souls : public InstanceMapScript teamInInstance = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) @@ -76,7 +76,7 @@ class instance_forge_of_souls : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -89,7 +89,7 @@ class instance_forge_of_souls : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -104,7 +104,7 @@ class instance_forge_of_souls : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -115,7 +115,7 @@ class instance_forge_of_souls : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -152,7 +152,7 @@ class instance_forge_of_souls : public InstanceMapScript uint32 teamInInstance; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_forge_of_souls_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index b38c00fd97b..83d0dda25c8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -53,7 +53,7 @@ class boss_falric : public CreatureScript public: boss_falric() : CreatureScript("boss_falric") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_falricAI(creature); } @@ -64,7 +64,7 @@ class boss_falric : public CreatureScript uint8 uiHopelessnessCount; - void Reset() OVERRIDE + void Reset() override { boss_horAI::Reset(); @@ -74,7 +74,7 @@ class boss_falric : public CreatureScript instance->SetBossState(DATA_FALRIC_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) @@ -85,7 +85,7 @@ class boss_falric : public CreatureScript events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); /// @todo adjust timer. } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -93,12 +93,12 @@ class boss_falric : public CreatureScript instance->SetBossState(DATA_FALRIC_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 4760805998c..7c8f47281b7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -52,7 +52,7 @@ class boss_marwyn : public CreatureScript public: boss_marwyn() : CreatureScript("boss_marwyn") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_marwynAI(creature); } @@ -61,7 +61,7 @@ class boss_marwyn : public CreatureScript { boss_marwynAI(Creature* creature) : boss_horAI(creature) { } - void Reset() OVERRIDE + void Reset() override { boss_horAI::Reset(); @@ -69,7 +69,7 @@ class boss_marwyn : public CreatureScript instance->SetBossState(DATA_MARWYN_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) @@ -81,7 +81,7 @@ class boss_marwyn : public CreatureScript events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); /// @todo Check timer } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -89,12 +89,12 @@ class boss_marwyn : public CreatureScript instance->SetBossState(DATA_MARWYN_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index f61ff94fc89..c7f3a03c962 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -314,7 +314,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript EventMap _events; - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -332,7 +332,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); @@ -344,7 +344,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript _events.ScheduleEvent(EVENT_WALK_INTRO1, 3000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -704,7 +704,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfReflectionAI(creature); } @@ -732,7 +732,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript EventMap _events; - void Reset() OVERRIDE + void Reset() override { _events.Reset(); if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID)) @@ -744,12 +744,12 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript _events.ScheduleEvent(EVENT_ESCAPE, 0); } - void JustDied(Unit* /*Killer*/) OVERRIDE + void JustDied(Unit* /*Killer*/) override { _instance->SetData(DATA_ESCAPE_EVENT, FAIL); } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { switch (actionId) { @@ -766,7 +766,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -792,7 +792,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript wallTarget->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1104,7 +1104,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfReflectionAI(creature); } @@ -1188,19 +1188,19 @@ struct npc_gauntlet_trash : public ScriptedAI { } - void Reset() OVERRIDE + void Reset() override { me->CastSpell(me, SPELL_WELL_OF_SOULS, true); _events.Reset(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (_instance->GetData(DATA_WAVE_COUNT) != NOT_STARTED) _instance->SetData(DATA_WAVE_COUNT, NOT_STARTED); } - void SetData(uint32 type, uint32 value) OVERRIDE + void SetData(uint32 type, uint32 value) override { if (type) return; @@ -1208,7 +1208,7 @@ struct npc_gauntlet_trash : public ScriptedAI InternalWaveId = value; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type) return 0; @@ -1233,7 +1233,7 @@ class npc_ghostly_priest : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); /// @todo adjust timers _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); @@ -1241,7 +1241,7 @@ class npc_ghostly_priest : public CreatureScript _events.ScheduleEvent(EVENT_DARK_MENDING, 20000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1287,7 +1287,7 @@ class npc_ghostly_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ghostly_priestAI(creature); } @@ -1304,7 +1304,7 @@ class npc_phantom_mage : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FIREBALL, 3000); /// @todo adjust timers _events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000); @@ -1313,7 +1313,7 @@ class npc_phantom_mage : public CreatureScript _events.ScheduleEvent(EVENT_HALLUCINATION, 40000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1353,7 +1353,7 @@ class npc_phantom_mage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phantom_mageAI(creature); } @@ -1368,13 +1368,13 @@ class npc_phantom_hallucination : public CreatureScript { npc_phantom_hallucinationAI(Creature* creature) : npc_phantom_mage::npc_phantom_mageAI(creature) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(SPELL_HALLUCINATION_2); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phantom_hallucinationAI(creature); } @@ -1391,7 +1391,7 @@ class npc_shadowy_mercenary : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); /// @todo adjust timers _events.ScheduleEvent(EVENT_DEADLY_POISON, 5000); @@ -1399,7 +1399,7 @@ class npc_shadowy_mercenary : public CreatureScript _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1434,7 +1434,7 @@ class npc_shadowy_mercenary : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadowy_mercenaryAI(creature); } @@ -1451,14 +1451,14 @@ class npc_spectral_footman : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); /// @todo adjust timers _events.ScheduleEvent(EVENT_SHIELD_BASH, 10000); _events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1488,7 +1488,7 @@ class npc_spectral_footman : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spectral_footmanAI(creature); } @@ -1505,7 +1505,7 @@ class npc_tortured_rifleman : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SHOOT, 1); /// @todo adjust timers _events.ScheduleEvent(EVENT_CURSED_ARROW, 7000); @@ -1513,7 +1513,7 @@ class npc_tortured_rifleman : public CreatureScript _events.ScheduleEvent(EVENT_ICE_SHOT, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1549,7 +1549,7 @@ class npc_tortured_rifleman : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tortured_riflemanAI(creature); } @@ -1594,19 +1594,19 @@ class npc_frostworn_general : public CreatureScript InstanceScript* _instance; EventMap _events; - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _instance->SetData(DATA_FROSWORN_EVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); _instance->SetData(DATA_FROSWORN_EVENT, DONE); } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { Talk(SAY_AGGRO); _events.ScheduleEvent(EVENT_SHIELD, 5000); @@ -1615,7 +1615,7 @@ class npc_frostworn_general : public CreatureScript _instance->SetData(DATA_FROSWORN_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1665,7 +1665,7 @@ class npc_frostworn_general : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frostworn_generalAI(creature); } @@ -1685,22 +1685,22 @@ class npc_spiritual_reflection : public CreatureScript EventMap _events; - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3000); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { DoCast(killer, SPELL_SPIRIT_BURST); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1722,7 +1722,7 @@ class npc_spiritual_reflection : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spiritual_reflectionAI(creature); } @@ -1733,7 +1733,7 @@ class at_hor_intro_start : public AreaTriggerScript public: at_hor_intro_start() : AreaTriggerScript("at_hor_intro_start") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { InstanceScript* _instance = player->GetInstanceScript(); @@ -1752,7 +1752,7 @@ class at_hor_waves_restarter : public AreaTriggerScript public: at_hor_waves_restarter() : AreaTriggerScript("at_hor_waves_restarter") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { InstanceScript* _instance = player->GetInstanceScript(); @@ -1786,7 +1786,7 @@ class at_shadow_throne : public AreaTriggerScript public: at_shadow_throne() : AreaTriggerScript("at_shadow_throne") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { InstanceScript* _instance = player->GetInstanceScript(); @@ -1818,7 +1818,7 @@ class npc_raging_ghoul : public CreatureScript bool _doJump; uint64 _leaderGUID; - void Reset() OVERRIDE + void Reset() override { _emergeTimer = 4000; _doEmerge = false; @@ -1827,19 +1827,19 @@ class npc_raging_ghoul : public CreatureScript _instance->SetData(DATA_SUMMONS, 1); } - void IsSummonedBy(Unit*) OVERRIDE + void IsSummonedBy(Unit*) override { DoCast(me, SPELL_EMERGE_VISUAL); DoZoneInCombat(me, 100.00f); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_instance) _instance->SetData(DATA_SUMMONS, 0); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -1850,7 +1850,7 @@ class npc_raging_ghoul : public CreatureScript ScriptedAI::AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_instance) return; @@ -1891,7 +1891,7 @@ class npc_raging_ghoul : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_raging_ghoulAI(creature); } @@ -1917,7 +1917,7 @@ class npc_risen_witch_doctor : public CreatureScript uint32 _boltVolleyTimer; uint32 _curseTimer; - void Reset() OVERRIDE + void Reset() override { _emergeTimer = 5000; _boltTimer = 6000; @@ -1929,19 +1929,19 @@ class npc_risen_witch_doctor : public CreatureScript _instance->SetData(DATA_SUMMONS, 1); } - void IsSummonedBy(Unit*) OVERRIDE + void IsSummonedBy(Unit*) override { DoCast(me, SPELL_EMERGE_VISUAL); DoZoneInCombat(me, 100.00f); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_instance) _instance->SetData(DATA_SUMMONS, 0); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -1952,7 +1952,7 @@ class npc_risen_witch_doctor : public CreatureScript ScriptedAI::AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_instance) return; @@ -2010,7 +2010,7 @@ class npc_risen_witch_doctor : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_risen_witch_doctorAI(creature); } @@ -2035,7 +2035,7 @@ class npc_lumbering_abomination : public CreatureScript uint32 _strikeTimer; uint32 _vomitTimer; - void Reset() OVERRIDE + void Reset() override { _doWalk = false; _vomitTimer = 15000; @@ -2045,13 +2045,13 @@ class npc_lumbering_abomination : public CreatureScript _instance->SetData(DATA_SUMMONS, 1); } - void IsSummonedBy(Unit*) OVERRIDE + void IsSummonedBy(Unit*) override { DoCast(me, SPELL_EMERGE_VISUAL); DoZoneInCombat(me, 100.00f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_instance) return; @@ -2092,14 +2092,14 @@ class npc_lumbering_abomination : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_instance) _instance->SetData(DATA_SUMMONS, 0); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lumbering_abominationAI(creature); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index a228f54e640..9ac88eff495 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -78,7 +78,7 @@ class instance_halls_of_reflection : public InstanceMapScript { instance_halls_of_reflection_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(MAX_ENCOUNTER); events.Reset(); @@ -105,13 +105,13 @@ class instance_halls_of_reflection : public InstanceMapScript _mobsaticewall = 0; } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (!_teamInInstance) _teamInInstance = player->GetTeam(); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) @@ -143,7 +143,7 @@ class instance_halls_of_reflection : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { switch (creature->GetEntry()) { @@ -160,7 +160,7 @@ class instance_halls_of_reflection : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -199,13 +199,13 @@ class instance_halls_of_reflection : public InstanceMapScript } } - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE + void FillInitialWorldStates(WorldStateBuilder& builder) override { builder.AppendState(WORLD_STATE_HOR_WAVES_ENABLED, 0); builder.AppendState(WORLD_STATE_HOR_WAVE_COUNT, 0); } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -237,7 +237,7 @@ class instance_halls_of_reflection : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -308,7 +308,7 @@ class instance_halls_of_reflection : public InstanceMapScript // wave scheduling,checked when wave npcs die - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -342,7 +342,7 @@ class instance_halls_of_reflection : public InstanceMapScript } } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (!instance->HavePlayers()) return; @@ -357,7 +357,7 @@ class instance_halls_of_reflection : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*go*/, uint32 eventId) OVERRIDE + void ProcessEvent(WorldObject* /*go*/, uint32 eventId) override { switch (eventId) { @@ -461,7 +461,7 @@ class instance_halls_of_reflection : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -484,7 +484,7 @@ class instance_halls_of_reflection : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -509,7 +509,7 @@ class instance_halls_of_reflection : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -520,7 +520,7 @@ class instance_halls_of_reflection : public InstanceMapScript return saveStream.str(); } - void Load(char const* in) OVERRIDE + void Load(char const* in) override { if (!in) { @@ -599,7 +599,7 @@ class instance_halls_of_reflection : public InstanceMapScript std::set waveGuidList[8]; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_halls_of_reflection_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 62a981910b0..9d9a222fac6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -87,7 +87,7 @@ class boss_garfrost : public CreatureScript { boss_garfrostAI(Creature* creature) : BossAI(creature, DATA_GARFROST) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.SetPhase(PHASE_ONE); @@ -95,7 +95,7 @@ class boss_garfrost : public CreatureScript _permafrostStack = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -104,13 +104,13 @@ class boss_garfrost : public CreatureScript events.ScheduleEvent(EVENT_THROW_SARONITE, 7000); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -119,7 +119,7 @@ class boss_garfrost : public CreatureScript tyrannus->AI()->Talk(SAY_TYRANNUS_DEATH); } - void DamageTaken(Unit* /*attacker*/, uint32& /*uiDamage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*uiDamage*/) override { if (events.IsInPhase(PHASE_ONE) && !HealthAbovePct(66)) { @@ -142,7 +142,7 @@ class boss_garfrost : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != EFFECT_MOTION_TYPE || id != POINT_FORGE) return; @@ -161,7 +161,7 @@ class boss_garfrost : public CreatureScript events.ScheduleEvent(EVENT_RESUME_ATTACK, 5000); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { if (spell->Id == SPELL_PERMAFROST_HELPER) { @@ -170,12 +170,12 @@ class boss_garfrost : public CreatureScript } } - uint32 GetData(uint32 /*type*/) const OVERRIDE + uint32 GetData(uint32 /*type*/) const override { return _permafrostStack; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -235,7 +235,7 @@ class boss_garfrost : public CreatureScript uint32 _permafrostStack; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetPitOfSaronAI(creature); } @@ -250,7 +250,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader { PrepareSpellScript(spell_garfrost_permafrost_SpellScript); - bool Load() OVERRIDE + bool Load() override { prevented = false; return true; @@ -296,7 +296,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_garfrost_permafrost_SpellScript::PreventHitByLoS); AfterHit += SpellHitFn(spell_garfrost_permafrost_SpellScript::RestoreImmunity); @@ -305,7 +305,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader bool prevented; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_garfrost_permafrost_SpellScript(); } @@ -316,7 +316,7 @@ class achievement_doesnt_go_to_eleven : public AchievementCriteriaScript public: achievement_doesnt_go_to_eleven() : AchievementCriteriaScript("achievement_doesnt_go_to_eleven") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target) if (Creature* garfrost = target->ToCreature()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 3dd2d236741..a5d50ec230d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -145,7 +145,7 @@ class boss_ick : public CreatureScript ASSERT(_vehicle); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); instance->SetBossState(DATA_ICK, NOT_STARTED); @@ -156,7 +156,7 @@ class boss_ick : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRICK)); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -169,13 +169,13 @@ class boss_ick : public CreatureScript events.ScheduleEvent(EVENT_SPECIAL, urand(30000, 35000)); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->GetMotionMaster()->Clear(); ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* krick = GetKrick()) { @@ -198,7 +198,7 @@ class boss_ick : public CreatureScript me->AddThreat(target, _tempThreat); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) return; @@ -274,7 +274,7 @@ class boss_ick : public CreatureScript float _tempThreat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetPitOfSaronAI(creature); } @@ -291,7 +291,7 @@ class boss_krick : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _phase = PHASE_COMBAT; @@ -307,7 +307,7 @@ class boss_krick : public CreatureScript return ObjectAccessor::GetCreature(*me, _instanceScript->GetData64(DATA_ICK)); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -315,7 +315,7 @@ class boss_krick : public CreatureScript Talk(SAY_KRICK_SLAY); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { _summons.Summon(summon); if (summon->GetEntry() == NPC_EXPLODING_ORB) @@ -325,7 +325,7 @@ class boss_krick : public CreatureScript } } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { if (actionId == ACTION_OUTRO) { @@ -341,7 +341,7 @@ class boss_krick : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != POINT_KRICK_INTRO) return; @@ -352,7 +352,7 @@ class boss_krick : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_1, 1000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_phase != PHASE_OUTRO) return; @@ -494,7 +494,7 @@ class boss_krick : public CreatureScript uint64 _tyrannusGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetPitOfSaronAI(creature); } @@ -523,13 +523,13 @@ class spell_krick_explosive_barrage : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_krick_explosive_barrage_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_krick_explosive_barrage_AuraScript(); } @@ -561,14 +561,14 @@ class spell_ick_explosive_barrage : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_ick_explosive_barrage_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_ick_explosive_barrage_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_ick_explosive_barrage_AuraScript(); } @@ -597,13 +597,13 @@ class spell_exploding_orb_hasty_grow : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_exploding_orb_hasty_grow_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAPPLY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_exploding_orb_hasty_grow_AuraScript(); } @@ -634,7 +634,7 @@ class spell_krick_pursuit : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_krick_pursuit_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -651,18 +651,18 @@ class spell_krick_pursuit : public SpellScriptLoader CAST_AI(boss_ick::boss_ickAI, creCaster->AI())->_ResetThreat(GetTarget()); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_krick_pursuit_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_krick_pursuit_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_krick_pursuit_AuraScript(); } @@ -689,14 +689,14 @@ class spell_krick_pursuit_confusion : public SpellScriptLoader GetTarget()->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_krick_pursuit_confusion_AuraScript::OnApply, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_krick_pursuit_confusion_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_krick_pursuit_confusion_AuraScript(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 603cc6c0dab..8968d5da8af 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -137,7 +137,7 @@ class boss_tyrannus : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (instance->GetBossState(DATA_TYRANNUS) != DONE) Reset(); @@ -145,7 +145,7 @@ class boss_tyrannus : public CreatureScript me->DespawnOrUnsummon(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.SetPhase(PHASE_NONE); @@ -159,12 +159,12 @@ class boss_tyrannus : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_RIMEFANG)); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -173,7 +173,7 @@ class boss_tyrannus : public CreatureScript me->GetMotionMaster()->MoveChase(victim); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->SetBossState(DATA_TYRANNUS, FAIL); if (Creature* rimefang = GetRimefang()) @@ -182,13 +182,13 @@ class boss_tyrannus : public CreatureScript me->DespawnOrUnsummon(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetBossState(DATA_TYRANNUS, DONE); @@ -202,7 +202,7 @@ class boss_tyrannus : public CreatureScript rimefang->AI()->DoAction(ACTION_END_COMBAT); } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { if (actionId == ACTION_START_INTRO) { @@ -216,7 +216,7 @@ class boss_tyrannus : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !events.IsInPhase(PHASE_INTRO)) return; @@ -280,7 +280,7 @@ class boss_tyrannus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetPitOfSaronAI(creature); } @@ -298,7 +298,7 @@ class boss_rimefang : public CreatureScript ASSERT(_vehicle); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.SetPhase(PHASE_NONE); @@ -309,12 +309,12 @@ class boss_rimefang : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _vehicle->InstallAllAccessories(false); } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { if (actionId == ACTION_START_RIMEFANG) { @@ -327,7 +327,7 @@ class boss_rimefang : public CreatureScript _EnterEvadeMode(); } - void SetGUID(uint64 guid, int32 type) OVERRIDE + void SetGUID(uint64 guid, int32 type) override { if (type == GUID_HOARFROST) { @@ -336,7 +336,7 @@ class boss_rimefang : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !_events.IsInPhase(PHASE_COMBAT)) return; @@ -379,7 +379,7 @@ class boss_rimefang : public CreatureScript uint8 _currentWaypoint; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_rimefangAI(creature); } @@ -392,25 +392,25 @@ class player_overlord_brandAI : public PlayerAI { } - void SetGUID(uint64 guid, int32 /*type*/) OVERRIDE + void SetGUID(uint64 guid, int32 /*type*/) override { _tyrannus = guid; } - void DamageDealt(Unit* /*victim*/, uint32& damage, DamageEffectType /*damageType*/) OVERRIDE + void DamageDealt(Unit* /*victim*/, uint32& damage, DamageEffectType /*damageType*/) override { if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannus)) if (tyrannus->GetVictim()) me->CastCustomSpell(SPELL_OVERLORD_BRAND_DAMAGE, SPELLVALUE_BASE_POINT0, damage, tyrannus->GetVictim(), true, NULL, NULL, tyrannus->GetGUID()); } - void HealDone(Unit* /*target*/, uint32& addHealth) OVERRIDE + void HealDone(Unit* /*target*/, uint32& addHealth) override { if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannus)) me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID()); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } private: uint64 _tyrannus; @@ -425,7 +425,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader { PrepareAuraScript(spell_tyrannus_overlord_brand_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetEntry() == NPC_TYRANNUS; } @@ -452,7 +452,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader delete thisAI; } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_tyrannus_overlord_brand_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_tyrannus_overlord_brand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -462,7 +462,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader bool oldAIState; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_tyrannus_overlord_brand_AuraScript(); } @@ -488,13 +488,13 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader rimefang->AI()->SetGUID(GetTarget()->GetGUID(), GUID_HOARFROST); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_tyrannus_mark_of_rimefang_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_tyrannus_mark_of_rimefang_AuraScript(); } @@ -505,7 +505,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript public: at_tyrannus_event_starter() : AreaTriggerScript("at_tyrannus_event_starter") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { InstanceScript* instance = player->GetInstanceScript(); if (player->IsGameMaster() || !instance) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 5453aeffad2..0178caa464f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -56,13 +56,13 @@ class instance_pit_of_saron : public InstanceMapScript _teamInInstance = 0; } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (!_teamInInstance) _teamInInstance = player->GetTeam(); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (!_teamInInstance) { @@ -167,7 +167,7 @@ class instance_pit_of_saron : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -178,7 +178,7 @@ class instance_pit_of_saron : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -189,7 +189,7 @@ class instance_pit_of_saron : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -227,7 +227,7 @@ class instance_pit_of_saron : public InstanceMapScript return true; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -240,7 +240,7 @@ class instance_pit_of_saron : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -267,7 +267,7 @@ class instance_pit_of_saron : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -278,7 +278,7 @@ class instance_pit_of_saron : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -325,7 +325,7 @@ class instance_pit_of_saron : public InstanceMapScript uint32 _teamInInstance; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_pit_of_saron_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 6237ed6a3ae..b4867bafad2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -52,18 +52,18 @@ class npc_ymirjar_flamebearer : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FIREBALL, 4000); _events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class npc_ymirjar_flamebearer : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ymirjar_flamebearerAI(creature); } @@ -118,17 +118,17 @@ class npc_iceborn_protodrake : public CreatureScript ASSERT(_vehicle); } - void Reset() OVERRIDE + void Reset() override { _frostBreathCooldown = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _vehicle->RemoveAllPassengers(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -149,7 +149,7 @@ class npc_iceborn_protodrake : public CreatureScript uint32 _frostBreathCooldown; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_iceborn_protodrakeAI(creature); } @@ -166,12 +166,12 @@ class npc_geist_ambusher : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _leapingFaceMaulCooldown = 9000; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (who->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -181,7 +181,7 @@ class npc_geist_ambusher : public CreatureScript DoCast(who, SPELL_LEAPING_FACE_MAUL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -202,7 +202,7 @@ class npc_geist_ambusher : public CreatureScript uint32 _leapingFaceMaulCooldown; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_geist_ambusherAI(creature); } @@ -226,13 +226,13 @@ class spell_trash_npc_glacial_strike : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_npc_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_trash_npc_glacial_strike_AuraScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index f8a227ec8eb..28ad51b6898 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -89,13 +89,13 @@ class boss_drakkari_colossus : public CreatureScript introDone = false; } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (!me->isDead()) Reset(); } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -116,7 +116,7 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -127,7 +127,7 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -136,14 +136,14 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, DONE); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { // Note: This should not be called, but before use SetBossState function we should use BossAI // in all the bosses of the instance instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, FAIL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -176,7 +176,7 @@ class boss_drakkari_colossus : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC)) damage = 0; @@ -194,7 +194,7 @@ class boss_drakkari_colossus : public CreatureScript } } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { if (data == DATA_COLOSSUS_PHASE) return phase; @@ -204,13 +204,13 @@ class boss_drakkari_colossus : public CreatureScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_INTRO_DONE) introDone = data; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -235,7 +235,7 @@ class boss_drakkari_colossus : public CreatureScript DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->SetInCombatWithZone(); @@ -248,7 +248,7 @@ class boss_drakkari_colossus : public CreatureScript bool introDone; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_drakkari_colossusAI(creature); } @@ -267,7 +267,7 @@ class boss_drakkari_elemental : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); @@ -275,7 +275,7 @@ class boss_drakkari_elemental : public CreatureScript me->AddAura(SPELL_MOJO_VOLLEY, me); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer == me) return; @@ -287,7 +287,7 @@ class boss_drakkari_elemental : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -313,7 +313,7 @@ class boss_drakkari_elemental : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -329,7 +329,7 @@ class boss_drakkari_elemental : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (HealthBelowPct(50) && instance) { @@ -359,12 +359,12 @@ class boss_drakkari_elemental : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->DespawnOrUnsummon(); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_MERGE) { @@ -381,7 +381,7 @@ class boss_drakkari_elemental : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_drakkari_elementalAI(creature); } @@ -392,7 +392,7 @@ class npc_living_mojo : public CreatureScript public: npc_living_mojo() : CreatureScript("npc_living_mojo") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_living_mojoAI(creature); } @@ -404,7 +404,7 @@ class npc_living_mojo : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { mojoWaveTimer = 2*IN_MILLISECONDS; mojoPuddleTimer = 7*IN_MILLISECONDS; @@ -424,7 +424,7 @@ class npc_living_mojo : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -442,7 +442,7 @@ class npc_living_mojo : public CreatureScript } } - void AttackStart(Unit* attacker) OVERRIDE + void AttackStart(Unit* attacker) override { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) return; @@ -468,7 +468,7 @@ class npc_living_mojo : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index ca55cb51cdc..9c863405f91 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -38,7 +38,7 @@ class boss_eck : public CreatureScript public: boss_eck() : CreatureScript("boss_eck") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_eckAI(creature); } @@ -59,7 +59,7 @@ class boss_eck : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiBerserkTimer = urand(60*IN_MILLISECONDS, 90*IN_MILLISECONDS); //60-90 secs according to wowwiki uiBiteTimer = 5*IN_MILLISECONDS; @@ -72,13 +72,13 @@ class boss_eck : public CreatureScript instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -128,7 +128,7 @@ class boss_eck : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE); @@ -141,7 +141,7 @@ class npc_ruins_dweller : public CreatureScript public: npc_ruins_dweller() : CreatureScript("npc_ruins_dweller") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ruins_dwellerAI(creature); } @@ -155,7 +155,7 @@ class npc_ruins_dweller : public CreatureScript InstanceScript* instance; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 6d1e008216e..2d93da21e17 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -71,7 +71,7 @@ class boss_gal_darah : public CreatureScript public: boss_gal_darah() : CreatureScript("boss_gal_darah") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gal_darahAI(creature); } @@ -101,7 +101,7 @@ class boss_gal_darah : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiStampedeTimer = 10*IN_MILLISECONDS; uiWhirlingSlashTimer = 21*IN_MILLISECONDS; @@ -125,7 +125,7 @@ class boss_gal_darah : public CreatureScript instance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -133,7 +133,7 @@ class boss_gal_darah : public CreatureScript instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -260,7 +260,7 @@ class boss_gal_darah : public CreatureScript impaledList.push_back(guid); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_SHARE_THE_LOVE) return shareTheLove; @@ -268,7 +268,7 @@ class boss_gal_darah : public CreatureScript return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -276,7 +276,7 @@ class boss_gal_darah : public CreatureScript instance->SetData(DATA_GAL_DARAH_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -291,7 +291,7 @@ class achievement_share_the_love : public AchievementCriteriaScript public: achievement_share_the_love() : AchievementCriteriaScript("achievement_share_the_love") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index a89611bd98c..051687879fc 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -55,7 +55,7 @@ class boss_moorabi : public CreatureScript public: boss_moorabi() : CreatureScript("boss_moorabi") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_moorabiAI(creature); } @@ -76,7 +76,7 @@ class boss_moorabi : public CreatureScript uint32 uiDeterminedStabTimer; uint32 uiTransformationTImer; - void Reset() OVERRIDE + void Reset() override { uiGroundTremorTimer = 18*IN_MILLISECONDS; uiNumblingShoutTimer = 10*IN_MILLISECONDS; @@ -88,7 +88,7 @@ class boss_moorabi : public CreatureScript instance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); DoCast(me, SPELL_MOJO_FRENZY, true); @@ -97,7 +97,7 @@ class boss_moorabi : public CreatureScript instance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -148,7 +148,7 @@ class boss_moorabi : public CreatureScript DoMeleeAttackIfReady(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_LESS_RABI) return bPhase ? 0 : 1; @@ -156,7 +156,7 @@ class boss_moorabi : public CreatureScript return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -164,7 +164,7 @@ class boss_moorabi : public CreatureScript instance->SetData(DATA_MOORABI_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -181,7 +181,7 @@ class achievement_less_rabi : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index b6623ac1ea2..f8d2b4b5ace 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -77,7 +77,7 @@ class boss_slad_ran : public CreatureScript public: boss_slad_ran() : CreatureScript("boss_slad_ran") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_slad_ranAI(creature); } @@ -101,7 +101,7 @@ class boss_slad_ran : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiPoisonNovaTimer = 10*IN_MILLISECONDS; uiPowerfullBiteTimer = 3*IN_MILLISECONDS; @@ -116,7 +116,7 @@ class boss_slad_ran : public CreatureScript instance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -124,7 +124,7 @@ class boss_slad_ran : public CreatureScript instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -178,7 +178,7 @@ class boss_slad_ran : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); lSummons.DespawnAll(); @@ -187,18 +187,18 @@ class boss_slad_ran : public CreatureScript instance->SetData(DATA_SLAD_RAN_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); lSummons.Summon(summoned); } - void SetGUID(uint64 guid, int32 type) OVERRIDE + void SetGUID(uint64 guid, int32 type) override { if (type == DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES) lWrappedPlayers.insert(guid); @@ -216,7 +216,7 @@ class npc_slad_ran_constrictor : public CreatureScript public: npc_slad_ran_constrictor() : CreatureScript("npc_slad_ran_constrictor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_slad_ran_constrictorAI(creature); } @@ -227,12 +227,12 @@ class npc_slad_ran_constrictor : public CreatureScript uint32 uiGripOfSladRanTimer; - void Reset() OVERRIDE + void Reset() override { uiGripOfSladRanTimer = 1*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -266,7 +266,7 @@ class npc_slad_ran_viper : public CreatureScript public: npc_slad_ran_viper() : CreatureScript("npc_slad_ran_viper") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_slad_ran_viperAI(creature); } @@ -277,12 +277,12 @@ class npc_slad_ran_viper : public CreatureScript uint32 uiVenomousBiteTimer; - void Reset() OVERRIDE + void Reset() override { uiVenomousBiteTimer = 2*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -301,7 +301,7 @@ class achievement_snakes_whyd_it_have_to_be_snakes : public AchievementCriteriaS public: achievement_snakes_whyd_it_have_to_be_snakes() : AchievementCriteriaScript("achievement_snakes_whyd_it_have_to_be_snakes") { } - bool OnCheck(Player* player, Unit* target) OVERRIDE + bool OnCheck(Player* player, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 7c3619960d7..d08f7fe1b6f 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -39,7 +39,7 @@ class instance_gundrak : public InstanceMapScript public: instance_gundrak() : InstanceMapScript("instance_gundrak", 604) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_gundrak_InstanceMapScript(map); } @@ -92,7 +92,7 @@ class instance_gundrak : public InstanceMapScript std::string str_data; - void Initialize() OVERRIDE + void Initialize() override { spawnSupport = false; @@ -136,7 +136,7 @@ class instance_gundrak : public InstanceMapScript memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -145,7 +145,7 @@ class instance_gundrak : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -171,7 +171,7 @@ class instance_gundrak : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -276,7 +276,7 @@ class instance_gundrak : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -329,7 +329,7 @@ class instance_gundrak : public InstanceMapScript SaveToDB(); } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { if (type == DATA_RUIN_DWELLER_DIED) DwellerGUIDs.erase(data); @@ -341,7 +341,7 @@ class instance_gundrak : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -362,7 +362,7 @@ class instance_gundrak : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -387,7 +387,7 @@ class instance_gundrak : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -405,7 +405,7 @@ class instance_gundrak : public InstanceMapScript return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -444,7 +444,7 @@ class instance_gundrak : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { // Spawn the support for the bridge if necessary if (spawnSupport) @@ -545,7 +545,7 @@ class go_gundrak_altar : public GameObjectScript public: go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); uint64 statueGUID = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 7fc1bea771c..0ab1c2aac10 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -187,7 +187,7 @@ class boss_blood_council_controller : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); me->SetReactState(REACT_PASSIVE); @@ -197,7 +197,7 @@ class boss_blood_council_controller : public CreatureScript instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, NOT_STARTED); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == IN_PROGRESS) return; @@ -246,14 +246,14 @@ class boss_blood_council_controller : public CreatureScript } } - void SetData(uint32 /*type*/, uint32 data) OVERRIDE + void SetData(uint32 /*type*/, uint32 data) override { _resetCounter += uint8(data); if (_resetCounter == 3) EnterEvadeMode(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _resetCounter = 0; if (Creature* keleseth = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PRINCE_KELESETH_GUID))) @@ -266,7 +266,7 @@ class boss_blood_council_controller : public CreatureScript valanar->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { _JustDied(); // kill all prices @@ -285,7 +285,7 @@ class boss_blood_council_controller : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -352,7 +352,7 @@ class boss_blood_council_controller : public CreatureScript uint32 _resetCounter; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -371,7 +371,7 @@ class boss_prince_keleseth_icc : public CreatureScript _spawnHealth = creature->GetMaxHealth(); } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -383,7 +383,7 @@ class boss_prince_keleseth_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); summons.DespawnAll(); @@ -395,7 +395,7 @@ class boss_prince_keleseth_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); @@ -411,7 +411,7 @@ class boss_prince_keleseth_icc : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { events.Reset(); summons.DespawnAll(); @@ -420,7 +420,7 @@ class boss_prince_keleseth_icc : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->SetHealth(_spawnHealth); @@ -432,19 +432,19 @@ class boss_prince_keleseth_icc : public CreatureScript } } - void JustRespawned() OVERRIDE + void JustRespawned() override { DoCast(me, SPELL_FEIGN_DEATH); me->SetHealth(_spawnHealth); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_INVOCATION_OF_BLOOD_KELESETH) DoAction(ACTION_CAST_INVOCATION); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); Position pos; @@ -456,7 +456,7 @@ class boss_prince_keleseth_icc : public CreatureScript summon->ToTempSummon()->SetTempSummonType(TempSummonType::TEMPSUMMON_CORPSE_DESPAWN); } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) override { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -465,7 +465,7 @@ class boss_prince_keleseth_icc : public CreatureScript instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32& damage) override { if (!_isEmpowered) { @@ -474,13 +474,13 @@ class boss_prince_keleseth_icc : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KELESETH_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -525,7 +525,7 @@ class boss_prince_keleseth_icc : public CreatureScript return true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckRoom()) return; @@ -568,7 +568,7 @@ class boss_prince_keleseth_icc : public CreatureScript bool _isEmpowered; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -587,7 +587,7 @@ class boss_prince_taldaram_icc : public CreatureScript _spawnHealth = creature->GetMaxHealth(); } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -599,7 +599,7 @@ class boss_prince_taldaram_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); summons.DespawnAll(); @@ -611,12 +611,12 @@ class boss_prince_taldaram_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); @@ -628,7 +628,7 @@ class boss_prince_taldaram_icc : public CreatureScript me->AddAura(SPELL_SHADOW_PRISON, me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { events.Reset(); summons.DespawnAll(); @@ -637,7 +637,7 @@ class boss_prince_taldaram_icc : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->SetHealth(_spawnHealth); @@ -649,19 +649,19 @@ class boss_prince_taldaram_icc : public CreatureScript } } - void JustRespawned() OVERRIDE + void JustRespawned() override { DoCast(me, SPELL_FEIGN_DEATH); me->SetHealth(_spawnHealth); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_INVOCATION_OF_BLOOD_TALDARAM) DoAction(ACTION_CAST_INVOCATION); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true); // first try at distance @@ -675,7 +675,7 @@ class boss_prince_taldaram_icc : public CreatureScript summon->AI()->SetGUID(target->GetGUID()); } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) override { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -684,7 +684,7 @@ class boss_prince_taldaram_icc : public CreatureScript instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32& damage) override { if (!_isEmpowered) { @@ -693,13 +693,13 @@ class boss_prince_taldaram_icc : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_TALDARAM_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -744,7 +744,7 @@ class boss_prince_taldaram_icc : public CreatureScript return true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckRoom()) return; @@ -792,7 +792,7 @@ class boss_prince_taldaram_icc : public CreatureScript bool _isEmpowered; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -811,7 +811,7 @@ class boss_prince_valanar_icc : public CreatureScript _spawnHealth = creature->GetMaxHealth(); } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -823,7 +823,7 @@ class boss_prince_valanar_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); summons.DespawnAll(); @@ -835,12 +835,12 @@ class boss_prince_valanar_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); @@ -852,7 +852,7 @@ class boss_prince_valanar_icc : public CreatureScript me->AddAura(SPELL_SHADOW_PRISON, me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { events.Reset(); summons.DespawnAll(); @@ -861,7 +861,7 @@ class boss_prince_valanar_icc : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->SetHealth(me->GetMaxHealth()); @@ -873,13 +873,13 @@ class boss_prince_valanar_icc : public CreatureScript } } - void JustRespawned() OVERRIDE + void JustRespawned() override { DoCast(me, SPELL_FEIGN_DEATH); me->SetHealth(_spawnHealth); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { switch (summon->GetEntry()) { @@ -908,13 +908,13 @@ class boss_prince_valanar_icc : public CreatureScript DoZoneInCombat(summon); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_INVOCATION_OF_BLOOD_VALANAR) DoAction(ACTION_CAST_INVOCATION); } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) override { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -923,7 +923,7 @@ class boss_prince_valanar_icc : public CreatureScript instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32& damage) override { if (!_isEmpowered) { @@ -932,13 +932,13 @@ class boss_prince_valanar_icc : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_VALANAR_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -983,7 +983,7 @@ class boss_prince_valanar_icc : public CreatureScript return true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckRoom()) return; @@ -1036,7 +1036,7 @@ class boss_prince_valanar_icc : public CreatureScript bool _isEmpowered; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1055,7 +1055,7 @@ class npc_blood_queen_lana_thel : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); me->SetDisableGravity(true); @@ -1068,7 +1068,7 @@ class npc_blood_queen_lana_thel : public CreatureScript me->SetVisible(true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (_introDone) @@ -1090,13 +1090,13 @@ class npc_blood_queen_lana_thel : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == POINT_INTRO_DESPAWN) me->SetVisible(false); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_events.GetPhaseMask()) return; @@ -1130,7 +1130,7 @@ class npc_blood_queen_lana_thel : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1148,7 +1148,7 @@ class npc_ball_of_flame : public CreatureScript _despawnTimer = 0; } - void Reset() OVERRIDE + void Reset() override { me->CastSpell(me, SPELL_BALL_OF_FLAMES_VISUAL, true); if (me->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) @@ -1158,7 +1158,7 @@ class npc_ball_of_flame : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == CHASE_MOTION_TYPE && id == GUID_LOPART(_chaseGUID) && _chaseGUID) { @@ -1169,12 +1169,12 @@ class npc_ball_of_flame : public CreatureScript } } - void SetGUID(uint64 guid, int32 /*type*/) OVERRIDE + void SetGUID(uint64 guid, int32 /*type*/) override { _chaseGUID = guid; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_FLAME_BALL_CHASE) if (Player* target = ObjectAccessor::GetPlayer(*me, _chaseGUID)) @@ -1186,7 +1186,7 @@ class npc_ball_of_flame : public CreatureScript } } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) override { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -1195,7 +1195,7 @@ class npc_ball_of_flame : public CreatureScript _instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_despawnTimer) return; @@ -1215,7 +1215,7 @@ class npc_ball_of_flame : public CreatureScript uint32 _despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1230,7 +1230,7 @@ class npc_kinetic_bomb : public CreatureScript { npc_kinetic_bombAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); me->SetWalk(true); @@ -1242,7 +1242,7 @@ class npc_kinetic_bomb : public CreatureScript _groundZ = me->GetMap()->GetHeight(me->GetPhaseMask(), _x, _y, _groundZ, true, 500.0f); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == SPELL_KINETIC_BOMB_EXPLOSION) _events.ScheduleEvent(EVENT_BOMB_DESPAWN, 1000); @@ -1254,7 +1254,7 @@ class npc_kinetic_bomb : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1282,7 +1282,7 @@ class npc_kinetic_bomb : public CreatureScript float _groundZ; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1301,13 +1301,13 @@ class npc_dark_nucleus : public CreatureScript _targetAuraCheck = 0; } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_DEFENSIVE); me->CastSpell(me, SPELL_SHADOW_RESONANCE_AURA, true); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _targetAuraCheck = 1000; if (me->GetDistance(who) >= 15.0f) @@ -1320,13 +1320,13 @@ class npc_dark_nucleus : public CreatureScript me->ClearUnitState(UNIT_STATE_CASTING); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); } - void DamageTaken(Unit* attacker, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* attacker, uint32& /*damage*/) override { if (attacker == me) return; @@ -1335,7 +1335,7 @@ class npc_dark_nucleus : public CreatureScript me->AddThreat(attacker, 500000000.0f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1364,7 +1364,7 @@ class npc_dark_nucleus : public CreatureScript bool _lockedTarget; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1385,13 +1385,13 @@ class spell_taldaram_glittering_sparks : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_taldaram_glittering_sparks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_taldaram_glittering_sparks_SpellScript(); } @@ -1412,13 +1412,13 @@ class spell_taldaram_summon_flame_ball : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_taldaram_summon_flame_ball_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_taldaram_summon_flame_ball_SpellScript(); } @@ -1433,7 +1433,7 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader { PrepareAuraScript(spell_flame_ball_visual_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (GetCaster()->GetEntry() == NPC_BALL_OF_FLAME || GetCaster()->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) return true; @@ -1456,13 +1456,13 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_flame_ball_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_flame_ball_visual_AuraScript(); } @@ -1483,13 +1483,13 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader aur->SetStackAmount(uint8(GetSpellInfo()->StackAmount)); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_taldaram_ball_of_inferno_flame_SpellScript::ModAuraStack); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_taldaram_ball_of_inferno_flame_SpellScript(); } @@ -1513,7 +1513,7 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_valanar_kinetic_bomb_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } @@ -1538,18 +1538,18 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_valanar_kinetic_bomb_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_valanar_kinetic_bomb_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_valanar_kinetic_bomb_AuraScript(); } @@ -1570,13 +1570,13 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScriptLoader target->AI()->DoAction(ACTION_KINETIC_BOMB_JUMP); } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_valanar_kinetic_bomb_knockback_SpellScript::KnockIntoAir); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_valanar_kinetic_bomb_knockback_SpellScript(); } @@ -1598,13 +1598,13 @@ class spell_valanar_kinetic_bomb_absorb : public SpellScriptLoader dmgInfo.AbsorbDamage(absorbAmount); } - void Register() OVERRIDE + void Register() override { OnEffectAbsorb += AuraEffectAbsorbFn(spell_valanar_kinetic_bomb_absorb_AuraScript::OnAbsorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_valanar_kinetic_bomb_absorb_AuraScript(); } @@ -1625,13 +1625,13 @@ class spell_blood_council_shadow_prison : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_blood_council_shadow_prison_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_blood_council_shadow_prison_AuraScript(); } @@ -1653,13 +1653,13 @@ class spell_blood_council_shadow_prison_damage : public SpellScriptLoader SetHitDamage(GetHitDamage() + eff->GetAmount()); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_blood_council_shadow_prison_SpellScript::AddExtraDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_blood_council_shadow_prison_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 03b9a9221c6..135e93ad70b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -148,7 +148,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_BERSERK, 330000); @@ -166,7 +166,7 @@ class boss_blood_queen_lana_thel : public CreatureScript _killMinchar = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer())) { @@ -186,7 +186,7 @@ class boss_blood_queen_lana_thel : public CreatureScript _creditBloodQuickening = instance->GetData(DATA_BLOOD_QUICKENING_STATE) == IN_PROGRESS; } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { _JustDied(); Talk(SAY_DEATH); @@ -226,7 +226,7 @@ class boss_blood_queen_lana_thel : public CreatureScript instance->DoRemoveAurasDueToSpellOnPlayers(PRESENCE_OF_THE_DARKFALLEN); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_KILL_MINCHAR) return; @@ -241,7 +241,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { _EnterEvadeMode(); CleanAuras(); @@ -259,7 +259,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_ANIM_TIER, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); @@ -269,13 +269,13 @@ class boss_blood_queen_lana_thel : public CreatureScript instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, FAIL); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void SetGUID(uint64 guid, int32 type = 0) OVERRIDE + void SetGUID(uint64 guid, int32 type = 0) override { switch (type) { @@ -290,7 +290,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -328,7 +328,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -504,7 +504,7 @@ class boss_blood_queen_lana_thel : public CreatureScript bool _killMinchar; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -522,7 +522,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader { PrepareSpellScript(spell_blood_queen_vampiric_bite_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR)) return false; @@ -576,7 +576,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PRESENCE_OF_THE_DARKFALLEN_2, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_blood_queen_vampiric_bite_SpellScript::CheckTarget); BeforeHit += SpellHitFn(spell_blood_queen_vampiric_bite_SpellScript::OnCast); @@ -584,7 +584,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_blood_queen_vampiric_bite_SpellScript(); } @@ -622,14 +622,14 @@ class spell_blood_queen_frenzied_bloodthirst : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_blood_queen_frenzied_bloodthirst_AuraScript::OnApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_blood_queen_frenzied_bloodthirst_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_blood_queen_frenzied_bloodthirst_AuraScript(); } @@ -658,14 +658,14 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader { PrepareSpellScript(spell_blood_queen_bloodbolt_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TWILIGHT_BLOODBOLT)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetEntry() == NPC_BLOOD_QUEEN_LANA_THEL; } @@ -686,14 +686,14 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_TWILIGHT_BLOODBOLT, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_bloodbolt_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_blood_queen_bloodbolt_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_blood_queen_bloodbolt_SpellScript(); } @@ -709,7 +709,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader { PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL)) return false; @@ -723,13 +723,13 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), TRIGGERED_FULL_MASK, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_blood_queen_essence_of_the_blood_queen_AuraScript::OnProc, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_blood_queen_essence_of_the_blood_queen_AuraScript(); } @@ -771,13 +771,13 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_pact_of_the_darkfallen_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_blood_queen_pact_of_the_darkfallen_SpellScript(); } @@ -792,7 +792,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader { PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE)) return false; @@ -809,13 +809,13 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript(); } @@ -836,13 +836,13 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo unitList.push_back(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript(); } @@ -853,7 +853,7 @@ class achievement_once_bitten_twice_shy_n : public AchievementCriteriaScript public: achievement_once_bitten_twice_shy_n() : AchievementCriteriaScript("achievement_once_bitten_twice_shy_n") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (!target) return false; @@ -869,7 +869,7 @@ class achievement_once_bitten_twice_shy_v : public AchievementCriteriaScript public: achievement_once_bitten_twice_shy_v() : AchievementCriteriaScript("achievement_once_bitten_twice_shy_v") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index c4016b14430..514a5eb1d72 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -257,7 +257,7 @@ class boss_deathbringer_saurfang : public CreatureScript _fallenChampionCastCount = 0; } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -274,7 +274,7 @@ class boss_deathbringer_saurfang : public CreatureScript me->RemoveAurasDueToSpell(SPELL_FRENZY); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (_dead) return; @@ -314,11 +314,11 @@ class boss_deathbringer_saurfang : public CreatureScript instance->SetBossState(DATA_DEATHBRINGER_SAURFANG, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC)) return; @@ -326,27 +326,27 @@ class boss_deathbringer_saurfang : public CreatureScript ScriptedAI::AttackStart(victim); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); if (_introDone) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_DEATHBRINGER_SAURFANG, FAIL); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (damage >= me->GetHealth()) damage = me->GetHealth() - 1; @@ -376,7 +376,7 @@ class boss_deathbringer_saurfang : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) summon->AI()->AttackStart(target); @@ -387,12 +387,12 @@ class boss_deathbringer_saurfang : public CreatureScript DoZoneInCombat(summon); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override { summons.Despawn(summon); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE && id != POINT_SAURFANG) return; @@ -400,7 +400,7 @@ class boss_deathbringer_saurfang : public CreatureScript instance->HandleGameObject(instance->GetData64(GO_SAURFANG_S_DOOR), false); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch (spell->Id) { @@ -419,14 +419,14 @@ class boss_deathbringer_saurfang : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_BLOOD_LINK_POWER) if (Aura* bloodPower = me->GetAura(SPELL_BLOOD_POWER)) bloodPower->RecalculateAmountOfEffects(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !(events.IsInPhase(PHASE_INTRO_A) || events.IsInPhase(PHASE_INTRO_H))) return; @@ -508,7 +508,7 @@ class boss_deathbringer_saurfang : public CreatureScript DoMeleeAttackIfReady(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_MADE_A_MESS) if (_fallenChampionCastCount < RAID_MODE(3, 5, 3, 5)) @@ -518,7 +518,7 @@ class boss_deathbringer_saurfang : public CreatureScript } // intro setup - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -583,7 +583,7 @@ class boss_deathbringer_saurfang : public CreatureScript bool _dead; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -604,12 +604,12 @@ class npc_high_overlord_saurfang_icc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -660,7 +660,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_GRIP_OF_AGONY) { @@ -669,7 +669,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE) { @@ -714,7 +714,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) @@ -773,7 +773,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript std::list _guardList; }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -785,7 +785,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -795,7 +795,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -813,12 +813,12 @@ class npc_muradin_bronzebeard_icc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -865,7 +865,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_GRIP_OF_AGONY) { @@ -874,7 +874,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == POINT_FIRST_STEP) { @@ -894,7 +894,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) @@ -921,7 +921,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript std::list _guardList; }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -933,7 +933,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -943,7 +943,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -961,13 +961,13 @@ class npc_saurfang_event : public CreatureScript _index = 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { ASSERT(!type && data && data < 6); _index = data; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_GRIP_OF_AGONY) { @@ -976,7 +976,7 @@ class npc_saurfang_event : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_CHARGE && _index) me->GetMotionMaster()->MoveCharge(chargePos[_index].GetPositionX(), chargePos[_index].GetPositionY(), chargePos[_index].GetPositionZ(), 13.0f, POINT_CHARGE); @@ -988,7 +988,7 @@ class npc_saurfang_event : public CreatureScript uint32 _index; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1003,7 +1003,7 @@ class spell_deathbringer_blood_link : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_blood_link_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_POWER)) return false; @@ -1018,13 +1018,13 @@ class spell_deathbringer_blood_link : public SpellScriptLoader PreventHitDefaultEffect(EFFECT_0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_link_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_blood_link_SpellScript(); } @@ -1039,7 +1039,7 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader { PrepareAuraScript(spell_deathbringer_blood_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_THE_FALLEN_CHAMPION)) return false; @@ -1054,13 +1054,13 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader saurfang->AI()->DoAction(ACTION_MARK_OF_THE_FALLEN_CHAMPION); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_deathbringer_blood_link_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_deathbringer_blood_link_AuraScript(); } @@ -1081,7 +1081,7 @@ class spell_deathbringer_blood_power : public SpellScriptLoader aura->RecalculateAmountOfEffects(); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_deathbringer_blood_power_SpellScript::ModAuraValue); } @@ -1097,19 +1097,19 @@ class spell_deathbringer_blood_power : public SpellScriptLoader canBeRecalculated = true; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_0, SPELL_AURA_MOD_SCALE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_blood_power_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_deathbringer_blood_power_AuraScript(); } @@ -1124,7 +1124,7 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_rune_of_blood_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_DUMMY)) return false; @@ -1138,13 +1138,13 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, 1, GetCaster(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_rune_of_blood_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_rune_of_blood_SpellScript(); } @@ -1159,7 +1159,7 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_blood_nova_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_DUMMY)) return false; @@ -1173,13 +1173,13 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, 2, GetCaster(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_nova_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_blood_nova_SpellScript(); } @@ -1194,7 +1194,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_blood_nova_targeting_SpellScript); - bool Load() OVERRIDE + bool Load() override { // initialize variable target = NULL; @@ -1248,7 +1248,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -1258,7 +1258,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader WorldObject* target; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_blood_nova_targeting_SpellScript(); } @@ -1273,7 +1273,7 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_boiling_blood_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1289,13 +1289,13 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader targets.push_back(target); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_boiling_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_boiling_blood_SpellScript(); } @@ -1316,13 +1316,13 @@ class spell_deathbringer_remove_marks : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_remove_marks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_deathbringer_remove_marks_SpellScript(); } @@ -1333,7 +1333,7 @@ class achievement_ive_gone_and_made_a_mess : public AchievementCriteriaScript public: achievement_ive_gone_and_made_a_mess() : AchievementCriteriaScript("achievement_ive_gone_and_made_a_mess") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target) if (Creature* saurfang = target->ToCreature()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index f5a9e1e9e02..3709ea0092e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -93,7 +93,7 @@ class boss_festergut : public CreatureScript _gasDummyGUID = 0; } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -115,7 +115,7 @@ class boss_festergut : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer())) { @@ -133,7 +133,7 @@ class boss_festergut : public CreatureScript DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -143,32 +143,32 @@ class boss_festergut : public CreatureScript RemoveBlight(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_FESTERGUT, FAIL); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE))) professor->AI()->EnterEvadeMode(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == PUNGENT_BLIGHT_HELPER) target->RemoveAurasDueToSpell(INOCULATED_HELPER); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -256,13 +256,13 @@ class boss_festergut : public CreatureScript DoMeleeAttackIfReady(); } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_INOCULATED_STACK && data > _maxInoculatedStack) _maxInoculatedStack = data; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_INOCULATED_STACK) return uint32(_maxInoculatedStack); @@ -286,7 +286,7 @@ class boss_festergut : public CreatureScript uint32 _inhaleCounter; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -304,19 +304,19 @@ class npc_stinky_icc : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000)); _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(3000, 7000)); } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { DoCast(me, SPELL_PLAGUE_STENCH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -346,7 +346,7 @@ class npc_stinky_icc : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT))) if (festergut->IsAlive()) @@ -358,7 +358,7 @@ class npc_stinky_icc : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -373,7 +373,7 @@ class spell_festergut_pungent_blight : public SpellScriptLoader { PrepareSpellScript(spell_festergut_pungent_blight_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -388,13 +388,13 @@ class spell_festergut_pungent_blight : public SpellScriptLoader GetCaster()->ToCreature()->AI()->Talk(EMOTE_PUNGENT_BLIGHT); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_festergut_pungent_blight_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_festergut_pungent_blight_SpellScript(); } @@ -409,7 +409,7 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader { PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GASTRIC_EXPLOSION)) return false; @@ -426,13 +426,13 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), SPELL_GASTRIC_EXPLOSION, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_festergut_gastric_bloat_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_festergut_gastric_bloat_SpellScript(); } @@ -447,7 +447,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader { PrepareAuraScript(spell_festergut_blighted_spores_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_INOCULATED)) return false; @@ -462,13 +462,13 @@ class spell_festergut_blighted_spores : public SpellScriptLoader festergut->AI()->SetData(DATA_INOCULATED_STACK, GetStackAmount()); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_festergut_blighted_spores_AuraScript::ExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_festergut_blighted_spores_AuraScript(); } @@ -479,7 +479,7 @@ class achievement_flu_shot_shortage : public AchievementCriteriaScript public: achievement_flu_shot_shortage() : AchievementCriteriaScript("achievement_flu_shot_shortage") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target && target->GetTypeId() == TypeID::TYPEID_UNIT) return target->ToCreature()->AI()->GetData(DATA_INOCULATED_STACK) < 3; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index fbe27d7b196..6c8d22d3711 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -223,7 +223,7 @@ class boss_lady_deathwhisper : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetPower(POWER_MANA, me->GetMaxPower(POWER_MANA)); @@ -238,7 +238,7 @@ class boss_lady_deathwhisper : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!_introDone && me->IsWithinDistInMap(who, 110.0f)) @@ -255,7 +255,7 @@ class boss_lady_deathwhisper : public CreatureScript } } - void AttackStart(Unit* victim) OVERRIDE + void AttackStart(Unit* victim) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -264,7 +264,7 @@ class boss_lady_deathwhisper : public CreatureScript me->GetMotionMaster()->MoveChase(victim); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer())) { @@ -296,7 +296,7 @@ class boss_lady_deathwhisper : public CreatureScript instance->SetBossState(DATA_LADY_DEATHWHISPER, IN_PROGRESS); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Talk(SAY_DEATH); @@ -337,7 +337,7 @@ class boss_lady_deathwhisper : public CreatureScript _JustDied(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_LADY_DEATHWHISPER, FAIL); @@ -350,13 +350,13 @@ class boss_lady_deathwhisper : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void DamageTaken(Unit* /*damageDealer*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*damageDealer*/, uint32& damage) override { // phase transition if (events.IsInPhase(PHASE_ONE) && damage > uint32(me->GetPower(POWER_MANA))) @@ -382,7 +382,7 @@ class boss_lady_deathwhisper : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_DARNAVAN) _darnavanGUID = summon->GetGUID(); @@ -405,7 +405,7 @@ class boss_lady_deathwhisper : public CreatureScript summon->CastSpell(summon, SPELL_ADHERENT_S_DETERMINATION, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!UpdateVictim() && !events.IsInPhase(PHASE_INTRO)) || !CheckInRoom()) return; @@ -551,7 +551,7 @@ class boss_lady_deathwhisper : public CreatureScript summon->AI()->DoCast(summon, SPELL_TELEPORT_VISUAL); } - void SetGUID(uint64 guid, int32 id/* = 0*/) OVERRIDE + void SetGUID(uint64 guid, int32 id/* = 0*/) override { if (id != GUID_CULTIST) return; @@ -575,7 +575,7 @@ class boss_lady_deathwhisper : public CreatureScript DoCast(cultist, SPELL_DARK_MARTYRDOM_T); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_DARK_MARTYRDOM_T) { @@ -621,7 +621,7 @@ class boss_lady_deathwhisper : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -638,7 +638,7 @@ class npc_cult_fanatic : public CreatureScript { npc_cult_fanaticAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { Events.Reset(); Events.ScheduleEvent(EVENT_FANATIC_NECROTIC_STRIKE, urand(10000, 12000)); @@ -648,7 +648,7 @@ class npc_cult_fanatic : public CreatureScript Events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000)); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_DARK_TRANSFORMATION) me->UpdateEntry(NPC_DEFORMED_FANATIC); @@ -660,7 +660,7 @@ class npc_cult_fanatic : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -700,7 +700,7 @@ class npc_cult_fanatic : public CreatureScript EventMap Events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -715,7 +715,7 @@ class npc_cult_adherent : public CreatureScript { npc_cult_adherentAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { Events.Reset(); Events.ScheduleEvent(EVENT_ADHERENT_FROST_FEVER, urand(10000, 12000)); @@ -726,7 +726,7 @@ class npc_cult_adherent : public CreatureScript Events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000)); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_DARK_EMPOWERMENT) me->UpdateEntry(NPC_EMPOWERED_ADHERENT); @@ -738,7 +738,7 @@ class npc_cult_adherent : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -786,7 +786,7 @@ class npc_cult_adherent : public CreatureScript EventMap Events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -805,12 +805,12 @@ class npc_vengeful_shade : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Reset() OVERRIDE + void Reset() override { me->AddAura(SPELL_VENGEFUL_BLAST_PASSIVE, me); } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { switch (spell->Id) { @@ -826,7 +826,7 @@ class npc_vengeful_shade : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -843,7 +843,7 @@ class npc_darnavan : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_DARNAVAN_BLADESTORM, 10000); @@ -854,7 +854,7 @@ class npc_darnavan : public CreatureScript _canShatter = true; } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { _events.Reset(); if (Player* owner = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) @@ -870,7 +870,7 @@ class npc_darnavan : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != POINT_DESPAWN) return; @@ -878,12 +878,12 @@ class npc_darnavan : public CreatureScript me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { Talk(SAY_DARNAVAN_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -947,7 +947,7 @@ class npc_darnavan : public CreatureScript bool _canShatter; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -973,13 +973,13 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_deathwhisper_mana_barrier_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_deathwhisper_mana_barrier_AuraScript(); } @@ -1004,13 +1004,13 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader GetCaster()->SetDisplayId(uint32(GetCaster()->GetEntry() == NPC_CULT_FANATIC ? 38009 : 38010)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_cultist_dark_martyrdom_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_FORCE_DESELECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_cultist_dark_martyrdom_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 033b6229eae..e54eefa524c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -138,7 +138,7 @@ class boss_lord_marrowgar : public CreatureScript _boneSlice = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetSpeed(MOVE_RUN, _baseSpeed, true); @@ -153,7 +153,7 @@ class boss_lord_marrowgar : public CreatureScript _boneSpikeImmune.clear(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -162,27 +162,27 @@ class boss_lord_marrowgar : public CreatureScript instance->SetBossState(DATA_LORD_MARROWGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); _JustDied(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_LORD_MARROWGAR, FAIL); instance->SetData(DATA_BONED_ACHIEVEMENT, uint32(true)); // reset } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!_introDone && me->IsWithinDistInMap(who, 70.0f)) @@ -192,7 +192,7 @@ class boss_lord_marrowgar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -277,7 +277,7 @@ class boss_lord_marrowgar : public CreatureScript DoMeleeAttackIfReady(); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != POINT_TARGET_BONESTORM_PLAYER) return; @@ -291,7 +291,7 @@ class boss_lord_marrowgar : public CreatureScript return &_coldflameLastPos; } - uint64 GetGUID(int32 type /*= 0 */) const OVERRIDE + uint64 GetGUID(int32 type /*= 0 */) const override { switch (type) { @@ -312,7 +312,7 @@ class boss_lord_marrowgar : public CreatureScript return 0LL; } - void SetGUID(uint64 guid, int32 type /*= 0 */) OVERRIDE + void SetGUID(uint64 guid, int32 type /*= 0 */) override { switch (type) { @@ -325,7 +325,7 @@ class boss_lord_marrowgar : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_CLEAR_SPIKE_IMMUNITIES) return; @@ -343,7 +343,7 @@ class boss_lord_marrowgar : public CreatureScript bool _boneSlice; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -362,7 +362,7 @@ class npc_coldflame : public CreatureScript { } - void IsSummonedBy(Unit* owner) OVERRIDE + void IsSummonedBy(Unit* owner) override { if (owner->GetTypeId() != TypeID::TYPEID_UNIT) return; @@ -398,7 +398,7 @@ class npc_coldflame : public CreatureScript _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -416,7 +416,7 @@ class npc_coldflame : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -436,7 +436,7 @@ class npc_bone_spike : public CreatureScript SetCombatMovement(false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (TempSummon* summ = me->ToTempSummon()) if (Unit* trapped = summ->GetSummoner()) @@ -445,13 +445,13 @@ class npc_bone_spike : public CreatureScript me->DespawnOrUnsummon(); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { me->DespawnOrUnsummon(); victim->RemoveAurasDueToSpell(SPELL_IMPALED); } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { DoCast(summoner, SPELL_IMPALED); summoner->CastSpell(me, SPELL_RIDE_VEHICLE, true); @@ -459,7 +459,7 @@ class npc_bone_spike : public CreatureScript _hasTrappedUnit = true; } - void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) override { if (!apply) return; @@ -473,7 +473,7 @@ class npc_bone_spike : public CreatureScript init.Launch(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_hasTrappedUnit) return; @@ -490,7 +490,7 @@ class npc_bone_spike : public CreatureScript bool _hasTrappedUnit; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -525,14 +525,14 @@ class spell_marrowgar_coldflame : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_marrowgar_coldflame_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_marrowgar_coldflame_SpellScript(); } @@ -554,13 +554,13 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue() + i), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_marrowgar_coldflame_SpellScript(); } @@ -590,13 +590,13 @@ class spell_marrowgar_coldflame_damage : public SpellScriptLoader return true; } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_marrowgar_coldflame_damage_AuraScript::CanBeAppliedOn); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_marrowgar_coldflame_damage_AuraScript(); } @@ -611,7 +611,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader { PrepareSpellScript(spell_marrowgar_bone_spike_graveyard_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { for (uint32 i = 0; i < 3; ++i) if (!sSpellMgr->GetSpellInfo(BoneSpikeSummonId[i])) @@ -620,7 +620,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT && GetCaster()->IsAIEnabled; } @@ -654,14 +654,14 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_marrowgar_bone_spike_graveyard_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_marrowgar_bone_spike_graveyard_SpellScript::HandleSpikes, EFFECT_1, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_marrowgar_bone_spike_graveyard_SpellScript(); } @@ -681,13 +681,13 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() / std::max(sqrtf(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_marrowgar_bone_storm_SpellScript(); } @@ -702,7 +702,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader { PrepareSpellScript(spell_marrowgar_bone_slice_SpellScript); - bool Load() OVERRIDE + bool Load() override { _targetCount = 0; return true; @@ -729,7 +729,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader SetHitDamage(GetHitDamage() / _targetCount); } - void Register() OVERRIDE + void Register() override { BeforeCast += SpellCastFn(spell_marrowgar_bone_slice_SpellScript::ClearSpikeImmunities); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_marrowgar_bone_slice_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); @@ -739,7 +739,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_marrowgar_bone_slice_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index d730bc2ba2d..e3edc10458d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -228,7 +228,7 @@ class boss_professor_putricide : public CreatureScript _phase = PHASE_NONE; } - void Reset() OVERRIDE + void Reset() override { if (!(events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT))) instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, NOT_STARTED); @@ -247,7 +247,7 @@ class boss_professor_putricide : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)) return; @@ -275,7 +275,7 @@ class boss_professor_putricide : public CreatureScript instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, IN_PROGRESS); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); me->SetWalk(false); @@ -283,13 +283,13 @@ class boss_professor_putricide : public CreatureScript instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, FAIL); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -300,7 +300,7 @@ class boss_professor_putricide : public CreatureScript DoCast(SPELL_MUTATED_PLAGUE_CLEAR); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); switch (summon->GetEntry()) @@ -344,7 +344,7 @@ class boss_professor_putricide : public CreatureScript DoZoneInCombat(summon); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { switch (_phase) { @@ -365,7 +365,7 @@ class boss_professor_putricide : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -416,7 +416,7 @@ class boss_professor_putricide : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -541,7 +541,7 @@ class boss_professor_putricide : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -558,13 +558,13 @@ class boss_professor_putricide : public CreatureScript return 0; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { if (id == DATA_EXPERIMENT_STAGE) _experimentState = bool(data); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!(events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)) && !UpdateVictim()) || !CheckInRoom()) return; @@ -711,7 +711,7 @@ class boss_professor_putricide : public CreatureScript bool _experimentState; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -725,19 +725,19 @@ class npc_putricide_oozeAI : public ScriptedAI { } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(_hitTargetSpellId, me)) _newTargetSelectTimer = 1000; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_TEAR_GAS_CREATURE) _newTargetSelectTimer = 1000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !_newTargetSelectTimer) return; @@ -786,7 +786,7 @@ class npc_volatile_ooze : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -813,7 +813,7 @@ class npc_gas_cloud : public CreatureScript uint32 _newTargetSelectTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -839,13 +839,13 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_gaseous_bloat_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_putricide_gaseous_bloat_AuraScript(); } @@ -860,7 +860,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader { PrepareSpellScript(spell_putricide_ooze_channel_SpellScript); - bool Validate(SpellInfo const* spell) OVERRIDE + bool Validate(SpellInfo const* spell) override { if (!spell->ExcludeTargetAuraSpell) return false; @@ -871,7 +871,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader // set up initial variables and check if caster is creature // this will let use safely use ToCreature() casts in entire script - bool Load() OVERRIDE + bool Load() override { _target = NULL; return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; @@ -907,7 +907,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader GetCaster()->AddThreat(GetHitUnit(), 500000000.0f); // value seen in sniff } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -918,7 +918,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_ooze_channel_SpellScript(); } @@ -953,14 +953,14 @@ class spell_putricide_slime_puddle : public SpellScriptLoader targets.remove_if(ExactDistanceCheck(GetCaster(), 2.5f * GetCaster()->GetObjectScale())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_slime_puddle_SpellScript(); } @@ -982,13 +982,13 @@ class spell_putricide_slime_puddle_aura : public SpellScriptLoader GetCaster()->AddAura((GetCaster()->GetMap()->GetSpawnMode() & 1) ? 72456 : 70346, target); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_putricide_slime_puddle_aura_SpellScript::ReplaceAura); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_slime_puddle_aura_SpellScript(); } @@ -1030,13 +1030,13 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader GetCaster()->CastSpell(target, uint32(GetSpellInfo()->Effects[stage].CalcValue()), true, NULL, NULL, GetCaster()->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_putricide_unstable_experiment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_unstable_experiment_SpellScript(); } @@ -1061,13 +1061,13 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_putricide_ooze_eruption_searcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_ooze_eruption_searcher_SpellScript(); } @@ -1095,13 +1095,13 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_putricide_choking_gas_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_choking_gas_bomb_SpellScript(); } @@ -1116,7 +1116,7 @@ class spell_putricide_unbound_plague : public SpellScriptLoader { PrepareSpellScript(spell_putricide_unbound_plague_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_UNBOUND_PLAGUE)) return false; @@ -1173,14 +1173,14 @@ class spell_putricide_unbound_plague : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_unbound_plague_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnEffectHitTarget += SpellEffectFn(spell_putricide_unbound_plague_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_unbound_plague_SpellScript(); } @@ -1225,14 +1225,14 @@ class spell_putricide_eat_ooze : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_putricide_eat_ooze_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_eat_ooze_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_eat_ooze_SpellScript(); } @@ -1275,14 +1275,14 @@ class spell_putricide_mutated_plague : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), healSpell, true, NULL, NULL, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_mutated_plague_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutated_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_putricide_mutated_plague_AuraScript(); } @@ -1341,7 +1341,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_putricide_mutation_init_SpellScript::CheckRequirement); } @@ -1360,18 +1360,18 @@ class spell_putricide_mutation_init : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutation_init_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_mutation_init_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_putricide_mutation_init_AuraScript(); } @@ -1392,13 +1392,13 @@ class spell_putricide_mutated_transformation_dismiss : public SpellScriptLoader veh->RemoveAllPassengers(); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutated_transformation_dismiss_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_putricide_mutated_transformation_dismiss_AuraScript(); } @@ -1454,13 +1454,13 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader putricide->AI()->JustSummoned(summon); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_mutated_transformation_SpellScript(); } @@ -1481,13 +1481,13 @@ class spell_putricide_mutated_transformation_dmg : public SpellScriptLoader targets.remove(owner); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_mutated_transformation_dmg_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_mutated_transformation_dmg_SpellScript(); } @@ -1509,13 +1509,13 @@ class spell_putricide_regurgitated_ooze : public SpellScriptLoader instance->SetData(DATA_NAUSEA_ACHIEVEMENT, uint32(false)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_putricide_regurgitated_ooze_SpellScript::ExtraEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_regurgitated_ooze_SpellScript(); } @@ -1538,13 +1538,13 @@ class spell_putricide_clear_aura_effect_value : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(auraId); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_putricide_clear_aura_effect_value_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_putricide_clear_aura_effect_value_SpellScript(); } @@ -1569,13 +1569,13 @@ class spell_stinky_precious_decimate : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_stinky_precious_decimate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_stinky_precious_decimate_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index c4732934604..7dd057dfaa4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -105,7 +105,7 @@ class boss_rotface : public CreatureScript infectionCooldown = 14000; } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_SLIME_SPRAY, 20000); @@ -118,7 +118,7 @@ class boss_rotface : public CreatureScript infectionCooldown = 14000; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer())) { @@ -136,7 +136,7 @@ class boss_rotface : public CreatureScript DoCast(me, SPELL_GREEN_ABOMINATION_HITTIN__YA_PROC, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { instance->DoRemoveAurasDueToSpellOnPlayers(MUTATED_INFECTION); _JustDied(); @@ -145,45 +145,45 @@ class boss_rotface : public CreatureScript professor->AI()->DoAction(ACTION_ROTFACE_DEATH); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_ROTFACE, FAIL); instance->SetData(DATA_OOZE_DANCE_ACHIEVEMENT, uint32(true)); // reset } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE))) professor->AI()->EnterEvadeMode(); } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_SLIME_SPRAY) Talk(SAY_SLIME_SPRAY); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { // don't enter combat } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_VILE_GAS_STALKER) if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE))) professor->CastSpell(summon, SPELL_VILE_GAS_H, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -234,7 +234,7 @@ class boss_rotface : public CreatureScript uint32 infectionStage; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -251,7 +251,7 @@ class npc_little_ooze : public CreatureScript { } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { DoCast(me, SPELL_LITTLE_OOZE_COMBINE, true); DoCast(me, SPELL_WEAK_RADIATING_OOZE, true); @@ -260,12 +260,12 @@ class npc_little_ooze : public CreatureScript me->AddThreat(summoner, 500000.0f); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -285,7 +285,7 @@ class npc_little_ooze : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -302,7 +302,7 @@ class npc_big_ooze : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCast(me, SPELL_LARGE_OOZE_COMBINE, true); DoCast(me, SPELL_LARGE_OOZE_BUFF_COMBINE, true); @@ -315,20 +315,20 @@ class npc_big_ooze : public CreatureScript rotface->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* rotface = Unit::GetCreature(*me, instance->GetData64(DATA_ROTFACE))) rotface->AI()->SummonedCreatureDespawn(me); me->DespawnOrUnsummon(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == EVENT_STICKY_OOZE) events.CancelEvent(EVENT_STICKY_OOZE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -356,7 +356,7 @@ class npc_big_ooze : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -374,7 +374,7 @@ class npc_precious_icc : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000)); @@ -383,19 +383,19 @@ class npc_precious_icc : public CreatureScript _summons.DespawnAll(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { _summons.Summon(summon); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(target); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { _summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _summons.DespawnAll(); if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE))) @@ -403,7 +403,7 @@ class npc_precious_icc : public CreatureScript rotface->AI()->Talk(SAY_PRECIOUS_DIES); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -445,7 +445,7 @@ class npc_precious_icc : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -488,14 +488,14 @@ class spell_rotface_ooze_flood : public SpellScriptLoader targets.pop_front(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rotface_ooze_flood_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_ooze_flood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_ooze_flood_SpellScript(); } @@ -510,7 +510,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader { PrepareSpellScript(spell_rotface_mutated_infection_SpellScript); - bool Load() OVERRIDE + bool Load() override { _target = NULL; return true; @@ -544,7 +544,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader caster->AI()->Talk(EMOTE_MUTATED_INFECTION, target); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_mutated_infection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_mutated_infection_SpellScript::ReplaceTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -555,7 +555,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_mutated_infection_SpellScript(); } @@ -581,13 +581,13 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader GetHitCreature()->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rotface_little_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_little_ooze_combine_SpellScript(); } @@ -623,13 +623,13 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader GetHitCreature()->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rotface_large_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_large_ooze_combine_SpellScript(); } @@ -678,13 +678,13 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader GetHitCreature()->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rotface_large_ooze_buff_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_large_ooze_buff_combine_SpellScript(); } @@ -699,7 +699,7 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader { PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER)) return false; @@ -718,13 +718,13 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader GetCaster()->CastSpell(dummy, SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rotface_unstable_ooze_explosion_init_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_unstable_ooze_explosion_init_SpellScript(); } @@ -755,13 +755,13 @@ class spell_rotface_unstable_ooze_explosion : public SpellScriptLoader rotface->CastSpell(x, y, z, triggered_spell_id, true, NULL, NULL, GetCaster()->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_rotface_unstable_ooze_explosion_SpellScript::CheckTarget, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rotface_unstable_ooze_explosion_SpellScript(); } @@ -788,13 +788,13 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader target->ToCreature()->DespawnOrUnsummon(60000); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rotface_unstable_ooze_explosion_suicide_AuraScript::DespawnSelf, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rotface_unstable_ooze_explosion_suicide_AuraScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 603276ba2ac..b4fd0115e42 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -226,7 +226,7 @@ class boss_sindragosa : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { BossAI::Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -249,7 +249,7 @@ class boss_sindragosa : public CreatureScript } } - void JustDied(Unit* /* killer */) OVERRIDE + void JustDied(Unit* /* killer */) override { _JustDied(); Talk(SAY_DEATH); @@ -258,7 +258,7 @@ class boss_sindragosa : public CreatureScript DoCastAOE(SPELL_FROST_INFUSION_CREDIT, true); } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer())) { @@ -273,7 +273,7 @@ class boss_sindragosa : public CreatureScript Talk(SAY_AGGRO); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { BossAI::JustReachedHome(); instance->SetBossState(DATA_SINDRAGOSA, FAIL); @@ -281,13 +281,13 @@ class boss_sindragosa : public CreatureScript me->SetDisableGravity(false); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_START_FROSTWYRM) { @@ -314,14 +314,14 @@ class boss_sindragosa : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_MYSTIC_BUFFET_STACK) return _mysticBuffetStack; return 0xFFFFFFFF; } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -375,7 +375,7 @@ class boss_sindragosa : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!_isThirdPhase && !HealthAbovePct(35)) { @@ -385,7 +385,7 @@ class boss_sindragosa : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); if (summon->GetEntry() == NPC_FROST_BOMB) @@ -396,14 +396,14 @@ class boss_sindragosa : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { BossAI::SummonedCreatureDespawn(summon); if (summon->GetEntry() == NPC_ICE_TOMB) summon->AI()->JustDied(summon); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(70127, me)) if (spellId == spell->Id) @@ -411,7 +411,7 @@ class boss_sindragosa : public CreatureScript _mysticBuffetStack = std::max(_mysticBuffetStack, mysticBuffet->GetStackAmount()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -543,7 +543,7 @@ class boss_sindragosa : public CreatureScript bool _summoned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -562,12 +562,12 @@ class npc_ice_tomb : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); } - void SetGUID(uint64 guid, int32 type/* = 0 */) OVERRIDE + void SetGUID(uint64 guid, int32 type/* = 0 */) override { if (type == DATA_TRAPPED_PLAYER) { @@ -576,14 +576,14 @@ class npc_ice_tomb : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_TRIGGER_ASPHYXIATION) if (Player* player = ObjectAccessor::GetPlayer(*me, _trappedPlayerGUID)) player->CastSpell(player, SPELL_ASPHYXIATION, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveAllGameObjects(); @@ -595,7 +595,7 @@ class npc_ice_tomb : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_trappedPlayerGUID) return; @@ -621,7 +621,7 @@ class npc_ice_tomb : public CreatureScript uint32 _existenceCheckTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -638,7 +638,7 @@ class npc_spinestalker : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { // Increase add count if (!me->isDead()) @@ -648,7 +648,7 @@ class npc_spinestalker : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_BELLOWING_ROAR, urand(20000, 25000)); @@ -663,18 +663,18 @@ class npc_spinestalker : public CreatureScript } } - void JustRespawned() OVERRIDE + void JustRespawned() override { ScriptedAI::JustRespawned(); _instance->SetData(DATA_SINDRAGOSA_FROSTWYRMS, me->GetDBTableGUIDLow()); // this cannot be in Reset because reset also happens on evade } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _events.Reset(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_START_FROSTWYRM) { @@ -697,7 +697,7 @@ class npc_spinestalker : public CreatureScript } } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != EFFECT_MOTION_TYPE || point != POINT_FROSTWYRM_LAND) return; @@ -711,7 +711,7 @@ class npc_spinestalker : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -751,7 +751,7 @@ class npc_spinestalker : public CreatureScript bool _summoned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -768,7 +768,7 @@ class npc_rimefang : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { // Increase add count if (!me->isDead()) @@ -778,7 +778,7 @@ class npc_rimefang : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, urand(12000, 15000)); @@ -793,18 +793,18 @@ class npc_rimefang : public CreatureScript } } - void JustRespawned() OVERRIDE + void JustRespawned() override { ScriptedAI::JustRespawned(); _instance->SetData(DATA_SINDRAGOSA_FROSTWYRMS, me->GetDBTableGUIDLow()); // this cannot be in Reset because reset also happens on evade } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _events.Reset(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_START_FROSTWYRM) { @@ -827,7 +827,7 @@ class npc_rimefang : public CreatureScript } } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != EFFECT_MOTION_TYPE || point != POINT_FROSTWYRM_LAND) return; @@ -841,12 +841,12 @@ class npc_rimefang : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void EnterCombat(Unit* /*victim*/) OVERRIDE + void EnterCombat(Unit* /*victim*/) override { DoCast(me, SPELL_FROST_AURA_RIMEFANG, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -908,7 +908,7 @@ class npc_rimefang : public CreatureScript bool _summoned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -926,7 +926,7 @@ class npc_sindragosa_trash : public CreatureScript _instance = creature->GetInstanceScript(); } - void InitializeAI() OVERRIDE + void InitializeAI() override { _frostwyrmId = (me->GetHomePosition().GetPositionY() < 2484.35f) ? DATA_RIMEFANG : DATA_SPINESTALKER; // Increase add count @@ -938,7 +938,7 @@ class npc_sindragosa_trash : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { // This is shared AI for handler and whelps if (me->GetEntry() == NPC_FROSTWARDEN_HANDLER) @@ -950,7 +950,7 @@ class npc_sindragosa_trash : public CreatureScript _isTaunted = false; } - void JustRespawned() OVERRIDE + void JustRespawned() override { ScriptedAI::JustRespawned(); @@ -959,13 +959,13 @@ class npc_sindragosa_trash : public CreatureScript _instance->SetData(_frostwyrmId, me->GetDBTableGUIDLow()); // this cannot be in Reset because reset also happens on evade } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_WHELP_MARKER) _isTaunted = data != 0; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_FROSTWYRM_OWNER) return _frostwyrmId; @@ -974,7 +974,7 @@ class npc_sindragosa_trash : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1011,7 +1011,7 @@ class npc_sindragosa_trash : public CreatureScript bool _isTaunted; // Frostwing Whelp only }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1026,7 +1026,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader { PrepareSpellScript(spell_sindragosa_s_fury_SpellScript); - bool Load() OVERRIDE + bool Load() override { _targetCount = 0; @@ -1075,7 +1075,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader GetCaster()->DealSpellDamage(&damageInfo, false); } - void Register() OVERRIDE + void Register() override { BeforeCast += SpellCastFn(spell_sindragosa_s_fury_SpellScript::SelectDest); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_s_fury_SpellScript::CountTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); @@ -1085,7 +1085,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sindragosa_s_fury_SpellScript(); } @@ -1121,13 +1121,13 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader Skyfire::Containers::RandomResizeList(unitList, maxSize); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_unchained_magic_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sindragosa_unchained_magic_SpellScript(); } @@ -1166,13 +1166,13 @@ class spell_sindragosa_frost_breath : public SpellScriptLoader target->CastSpell(target, SPELL_FROST_INFUSION, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_sindragosa_frost_breath_SpellScript::HandleInfusion); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sindragosa_frost_breath_SpellScript(); } @@ -1187,7 +1187,7 @@ class spell_sindragosa_instability : public SpellScriptLoader { PrepareAuraScript(spell_sindragosa_instability_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BACKLASH)) return false; @@ -1200,13 +1200,13 @@ class spell_sindragosa_instability : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_sindragosa_instability_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sindragosa_instability_AuraScript(); } @@ -1221,7 +1221,7 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader { PrepareAuraScript(spell_sindragosa_frost_beacon_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ICE_TOMB_DAMAGE)) return false; @@ -1235,13 +1235,13 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader caster->CastSpell(GetTarget(), SPELL_ICE_TOMB_DAMAGE, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sindragosa_frost_beacon_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sindragosa_frost_beacon_AuraScript(); } @@ -1256,7 +1256,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader { PrepareSpellScript(spell_sindragosa_ice_tomb_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_ICE_TOMB)) return false; @@ -1280,7 +1280,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_sindragosa_ice_tomb_SpellScript::SummonTomb); } @@ -1295,18 +1295,18 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader PreventDefaultAction(); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sindragosa_ice_tomb_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sindragosa_ice_tomb_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sindragosa_ice_tomb_AuraScript(); } @@ -1321,7 +1321,7 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader { PrepareSpellScript(spell_sindragosa_icy_grip_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ICY_GRIP_JUMP)) return false; @@ -1334,13 +1334,13 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), SPELL_ICY_GRIP_JUMP, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sindragosa_icy_grip_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sindragosa_icy_grip_SpellScript(); } @@ -1374,13 +1374,13 @@ class spell_sindragosa_mystic_buffet : public SpellScriptLoader targets.remove_if(MysticBuffetTargetFilter(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_mystic_buffet_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sindragosa_mystic_buffet_SpellScript(); } @@ -1395,7 +1395,7 @@ class spell_rimefang_icy_blast : public SpellScriptLoader { PrepareSpellScript(spell_rimefang_icy_blast_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ICY_BLAST_AREA)) return false; @@ -1410,13 +1410,13 @@ class spell_rimefang_icy_blast : public SpellScriptLoader summon->CastSpell(summon, SPELL_ICY_BLAST_AREA, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_rimefang_icy_blast_SpellScript::HandleTriggerMissile, EFFECT_1, SPELL_EFFECT_TRIGGER_MISSILE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rimefang_icy_blast_SpellScript(); } @@ -1447,7 +1447,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader { PrepareSpellScript(spell_frostwarden_handler_order_whelp_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FOCUS_FIRE)) return false; @@ -1480,14 +1480,14 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader Skyfire::Containers::SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_frostwarden_handler_order_whelp_SpellScript::HandleForcedCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frostwarden_handler_order_whelp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_frostwarden_handler_order_whelp_SpellScript(); } @@ -1509,7 +1509,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader GetCaster()->GetAI()->SetData(DATA_WHELP_MARKER, 1); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_frostwarden_handler_focus_fire_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -1529,18 +1529,18 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_frostwarden_handler_focus_fire_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_frostwarden_handler_focus_fire_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_frostwarden_handler_focus_fire_AuraScript(); } @@ -1551,7 +1551,7 @@ class at_sindragosa_lair : public AreaTriggerScript public: at_sindragosa_lair() : AreaTriggerScript("at_sindragosa_lair") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -1583,7 +1583,7 @@ class achievement_all_you_can_eat : public AchievementCriteriaScript public: achievement_all_you_can_eat() : AchievementCriteriaScript("achievement_all_you_can_eat") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index ec06c1b3e6c..63dfd0d5a3f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -488,7 +488,7 @@ class boss_the_lich_king : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -498,7 +498,7 @@ class boss_the_lich_king : public CreatureScript SetEquipmentSlots(true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); DoCastAOE(SPELL_PLAY_MOVIE, false); @@ -509,7 +509,7 @@ class boss_the_lich_king : public CreatureScript frostmourne->DespawnOrUnsummon(); } - void EnterCombat(Unit* target) OVERRIDE + void EnterCombat(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer())) { @@ -531,7 +531,7 @@ class boss_the_lich_king : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); instance->SetBossState(DATA_THE_LICH_KING, NOT_STARTED); @@ -545,13 +545,13 @@ class boss_the_lich_king : public CreatureScript SendLightOverride(0, 5000); } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { // The Lich King must not select targets in frostmourne room if he killed everyone outside return !target->HasAura(SPELL_IN_FROSTMOURNE_ROOM); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->SetBossState(DATA_THE_LICH_KING, FAIL); BossAI::EnterEvadeMode(); @@ -562,13 +562,13 @@ class boss_the_lich_king : public CreatureScript summons.DoAction(ACTION_TELEPORT_BACK, pred); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER && !me->IsInEvadeMode() && !events.IsInPhase(PHASE_OUTRO)) Talk(SAY_LK_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -612,7 +612,7 @@ class boss_the_lich_king : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -627,7 +627,7 @@ class boss_the_lich_king : public CreatureScript return 0; } - void SetData(uint32 type, uint32 value) OVERRIDE + void SetData(uint32 type, uint32 value) override { switch (type) { @@ -642,7 +642,7 @@ class boss_the_lich_king : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (events.IsInPhase(PHASE_ONE) && !HealthAbovePct(70)) { @@ -687,7 +687,7 @@ class boss_the_lich_king : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { switch (summon->GetEntry()) { @@ -747,7 +747,7 @@ class boss_the_lich_king : public CreatureScript BossAI::JustSummoned(summon); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override { switch (summon->GetEntry()) { @@ -764,13 +764,13 @@ class boss_the_lich_king : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_HARVESTED_SOUL && me->IsInCombat() && !IsHeroic()) Talk(SAY_LK_FROSTMOURNE_KILL); } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == REMORSELESS_WINTER_1 || spell->Id == REMORSELESS_WINTER_2) { @@ -779,7 +779,7 @@ class boss_the_lich_king : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE) return; @@ -845,7 +845,7 @@ class boss_the_lich_king : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // check phase first to prevent updating victim and entering evade mode when not wanted if (!(events.IsInPhase(PHASE_OUTRO) || events.IsInPhase(PHASE_INTRO) || events.IsInPhase(PHASE_FROSTMOURNE))) @@ -1139,7 +1139,7 @@ class boss_the_lich_king : public CreatureScript uint32 _vileSpiritExplosions; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1157,14 +1157,14 @@ class npc_tirion_fordring_tft : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE) me->RemoveFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -1182,7 +1182,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -1200,7 +1200,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ICE_LOCK) me->SetFacingTo(3.085098f); @@ -1208,7 +1208,7 @@ class npc_tirion_fordring_tft : public CreatureScript SetEquipmentSlots(true); // remove glow on ashbringer } - void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) override { if (me->GetCreatureTemplate()->GossipMenuId == sender && !action) { @@ -1219,7 +1219,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); @@ -1229,7 +1229,7 @@ class npc_tirion_fordring_tft : public CreatureScript me->SetFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !(_events.IsInPhase(PHASE_OUTRO) || _events.IsInPhase(PHASE_INTRO))) return; @@ -1289,7 +1289,7 @@ class npc_tirion_fordring_tft : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1307,14 +1307,14 @@ class npc_shambling_horror_icc : public CreatureScript _frenzied = false; } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000)); _events.ScheduleEvent(EVENT_ENRAGE, urand(11000, 14000)); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (!_frenzied && IsHeroic() && me->HealthBelowPctDamaged(20, damage)) { @@ -1323,7 +1323,7 @@ class npc_shambling_horror_icc : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1358,7 +1358,7 @@ class npc_shambling_horror_icc : public CreatureScript bool _frenzied; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1376,7 +1376,7 @@ class npc_raging_spirit : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); @@ -1388,14 +1388,14 @@ class npc_raging_spirit : public CreatureScript DoCast(me, SPELL_BOSS_HITTIN_YA, true); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { // player is the spellcaster so register summon manually if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) lichKing->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) lichKing->AI()->SummonedCreatureDespawn(me); @@ -1403,7 +1403,7 @@ class npc_raging_spirit : public CreatureScript summon->SetTempSummonType(TempSummonType::TEMPSUMMON_CORPSE_DESPAWN); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1434,7 +1434,7 @@ class npc_raging_spirit : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1452,7 +1452,7 @@ class npc_valkyr_shadowguard : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); me->SetReactState(REACT_PASSIVE); @@ -1460,13 +1460,13 @@ class npc_valkyr_shadowguard : public CreatureScript me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2500); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (!IsHeroic()) return; @@ -1483,7 +1483,7 @@ class npc_valkyr_shadowguard : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { // schedule siphon life event (heroic only) DoZoneInCombat(); @@ -1491,11 +1491,11 @@ class npc_valkyr_shadowguard : public CreatureScript _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2000); } - void AttackStart(Unit* /*target*/) OVERRIDE + void AttackStart(Unit* /*target*/) override { } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -1532,12 +1532,12 @@ class npc_valkyr_shadowguard : public CreatureScript } } - void SetGUID(uint64 guid, int32 /* = 0*/) OVERRIDE + void SetGUID(uint64 guid, int32 /* = 0*/) override { _grabbedPlayer = guid; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1581,7 +1581,7 @@ class npc_valkyr_shadowguard : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1599,7 +1599,7 @@ class npc_strangulate_vehicle : public CreatureScript { } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { me->SetFacingToObject(summoner); DoCast(summoner, SPELL_HARVEST_SOUL_VEHICLE); @@ -1612,7 +1612,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->JustSummoned(me); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_TELEPORT_BACK) return; @@ -1630,7 +1630,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->SummonedCreatureDespawn(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { UpdateVictim(); @@ -1688,7 +1688,7 @@ class npc_strangulate_vehicle : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1706,12 +1706,12 @@ class npc_terenas_menethil : public CreatureScript { } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { return target->GetEntry() != NPC_THE_LICH_KING; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -1738,7 +1738,7 @@ class npc_terenas_menethil : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { // no running back home if (!me->IsAlive()) @@ -1748,7 +1748,7 @@ class npc_terenas_menethil : public CreatureScript me->CombatStop(false); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (damage >= me->GetHealth()) { @@ -1769,7 +1769,7 @@ class npc_terenas_menethil : public CreatureScript } } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { _events.Reset(); _events.SetPhase(PHASE_OUTRO); @@ -1780,7 +1780,7 @@ class npc_terenas_menethil : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_2, 14000, 0, PHASE_OUTRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { UpdateVictim(); @@ -1841,7 +1841,7 @@ class npc_terenas_menethil : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1859,20 +1859,20 @@ class npc_spirit_warden : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SOUL_RIP, urand(12000, 15000)); DoCast(SPELL_DARK_HUNGER); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* terenas = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TERENAS_MENETHIL))) terenas->AI()->DoAction(ACTION_TELEPORT_BACK); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1900,7 +1900,7 @@ class npc_spirit_warden : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1917,7 +1917,7 @@ class npc_spirit_bomb : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { float destX, destY, destZ; me->GetPosition(destX, destY); @@ -1926,7 +1926,7 @@ class npc_spirit_bomb : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_GROUND, destX, destY, destZ); } - void MovementInform(uint32 type, uint32 point) OVERRIDE + void MovementInform(uint32 type, uint32 point) override { if (type != POINT_MOTION_TYPE || point != POINT_GROUND) return; @@ -1936,18 +1936,18 @@ class npc_spirit_bomb : public CreatureScript me->DespawnOrUnsummon(1000); } - void AttackStart(Unit* /*victim*/) OVERRIDE + void AttackStart(Unit* /*victim*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { UpdateVictim(); // no melee attacks } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1964,28 +1964,28 @@ class npc_broken_frostmourne : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { _events.SetPhase(PHASE_OUTRO); _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3000, 0, PHASE_OUTRO); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_SUMMON_TERENAS) _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { UpdateVictim(); @@ -2013,7 +2013,7 @@ class npc_broken_frostmourne : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -2046,14 +2046,14 @@ class spell_the_lich_king_infest : public SpellScriptLoader aurEff->SetAmount(int32(aurEff->GetAmount() * 1.15f)); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_infest_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_the_lich_king_infest_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_infest_AuraScript(); } @@ -2068,7 +2068,7 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NECROTIC_PLAGUE_JUMP)) return false; @@ -2095,13 +2095,13 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_necrotic_plague_AuraScript(); } @@ -2116,7 +2116,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript); - bool Load() OVERRIDE + bool Load() override { _hadAura = false; return true; @@ -2143,7 +2143,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader GetHitAura()->ModStackAmount(1); } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::CheckAura); OnHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::AddMissingStack); @@ -2156,7 +2156,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); - bool Load() OVERRIDE + bool Load() override { _lastAmount = 0; return true; @@ -2209,7 +2209,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader Remove(AURA_REMOVE_BY_ENEMY_SPELL); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_the_lich_king_necrotic_plague_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); @@ -2220,12 +2220,12 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader int32 _lastAmount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_necrotic_plague_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_necrotic_plague_AuraScript(); } @@ -2246,13 +2246,13 @@ class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_TRAP_AURA, TRIGGERED_NONE); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_shadow_trap_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_shadow_trap_visual_AuraScript(); } @@ -2275,13 +2275,13 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SHADOW_TRAP_KNOCKBACK, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_shadow_trap_periodic_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_shadow_trap_periodic_SpellScript(); } @@ -2296,7 +2296,7 @@ class spell_the_lich_king_quake : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_quake_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetInstanceScript() != NULL; } @@ -2313,14 +2313,14 @@ class spell_the_lich_king_quake : public SpellScriptLoader GetCaster()->GetAI()->DoAction(ACTION_START_ATTACK); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHit += SpellEffectFn(spell_the_lich_king_quake_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_quake_SpellScript(); } @@ -2335,7 +2335,7 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) return false; @@ -2357,13 +2357,13 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_ice_burst_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_ice_burst_target_search_SpellScript(); } @@ -2378,7 +2378,7 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) return false; @@ -2391,13 +2391,13 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_raging_spirit_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_raging_spirit_SpellScript(); } @@ -2441,7 +2441,7 @@ class spell_the_lich_king_defile : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DEFILE_GROW, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2449,7 +2449,7 @@ class spell_the_lich_king_defile : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_defile_SpellScript(); } @@ -2478,13 +2478,13 @@ class spell_the_lich_king_summon_into_air : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_summon_into_air_SpellScript(); } @@ -2499,7 +2499,7 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SOUL_REAPER_BUFF)) return false; @@ -2512,13 +2512,13 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader GetTarget()->CastSpell(caster, SPELL_SOUL_REAPER_BUFF, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_reaper_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_soul_reaper_AuraScript(); } @@ -2533,14 +2533,14 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _target = NULL; return true; @@ -2574,7 +2574,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_CHARGE, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_valkyr_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_valkyr_target_search_SpellScript::ReplaceTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2584,7 +2584,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_valkyr_target_search_SpellScript(); } @@ -2599,7 +2599,7 @@ class spell_the_lich_king_eject_all_passengers : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_eject_all_passengers_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->IsVehicle(); } @@ -2610,13 +2610,13 @@ class spell_the_lich_king_eject_all_passengers : public SpellScriptLoader GetCaster()->GetVehicleKit()->RemoveAllPassengers(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_eject_all_passengers_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_eject_all_passengers_SpellScript(); } @@ -2636,13 +2636,13 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_cast_back_to_caster_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_cast_back_to_caster_SpellScript(); } @@ -2657,7 +2657,7 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) return false; @@ -2669,13 +2669,13 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_LIFE_SIPHON_HEAL, SPELLVALUE_BASE_POINT0, GetHitDamage() * 10, GetCaster(), true); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_the_lich_king_life_siphon_SpellScript::TriggerHeal); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_life_siphon_SpellScript(); } @@ -2690,7 +2690,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript); - bool Load() OVERRIDE + bool Load() override { _is25Man = GetUnitOwner()->GetMap()->Is25ManRaid(); return true; @@ -2702,7 +2702,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_vile_spirits_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } @@ -2710,7 +2710,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader bool _is25Man; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_vile_spirits_AuraScript(); } @@ -2731,13 +2731,13 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader const_cast(GetExplTargetDest())->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectLaunch += SpellEffectFn(spell_the_lich_king_vile_spirits_visual_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_vile_spirits_visual_SpellScript(); } @@ -2752,7 +2752,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa { PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript); - bool Load() OVERRIDE + bool Load() override { _target = NULL; return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; @@ -2777,7 +2777,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa GetCaster()->AddThreat(GetHitUnit(), 100000.0f); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); @@ -2786,7 +2786,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa WorldObject* _target; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_vile_spirit_move_target_search_SpellScript(); } @@ -2801,7 +2801,7 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL { PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -2821,13 +2821,13 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL GetCaster()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_vile_spirit_damage_target_search_SpellScript(); } @@ -2842,7 +2842,7 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetOwner()->GetInstanceScript() != NULL; } @@ -2854,13 +2854,13 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_harvest_soul_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_harvest_soul_AuraScript(); } @@ -2890,14 +2890,14 @@ class spell_the_lich_king_lights_favor : public SpellScriptLoader amount = int32(caster->GetHealthPct()); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_lights_favor_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_the_lich_king_lights_favor_AuraScript::CalculateBonus, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_lights_favor_AuraScript(); } @@ -2920,13 +2920,13 @@ class spell_the_lich_king_soul_rip : public SpellScriptLoader caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_rip_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_soul_rip_AuraScript(); } @@ -2941,7 +2941,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript); - bool Load() OVERRIDE + bool Load() override { _instance = GetCaster()->GetInstanceScript(); return _instance != NULL; @@ -2970,7 +2970,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader target->RemoveAurasDueToSpell(target->GetMap()->IsHeroic() ? SPELL_HARVEST_SOULS_TELEPORT : SPELL_HARVEST_SOUL_TELEPORT); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_the_lich_king_restore_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); BeforeHit += SpellHitFn(spell_the_lich_king_restore_soul_SpellScript::RemoveAura); @@ -2979,7 +2979,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader InstanceScript* _instance; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_restore_soul_SpellScript(); } @@ -2994,7 +2994,7 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_dark_hunger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DARK_HUNGER_HEAL)) return false; @@ -3008,13 +3008,13 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DARK_HUNGER_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_the_lich_king_dark_hunger_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_dark_hunger_AuraScript(); } @@ -3029,7 +3029,7 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetOwner()->GetInstanceScript() != NULL; } @@ -3041,13 +3041,13 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_in_frostmourne_room_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_the_lich_king_in_frostmourne_room_AuraScript(); } @@ -3068,13 +3068,13 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader GetHitUnit()->CastSpell((Unit*)NULL, uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_summon_spirit_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_summon_spirit_bomb_SpellScript(); } @@ -3098,13 +3098,13 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader VileSpiritActivateEvent(target).Execute(0, 0); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::ActivateSpirit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_trigger_vile_spirit_SpellScript(); } @@ -3128,13 +3128,13 @@ class spell_the_lich_king_jump : public SpellScriptLoader creature->AI()->DoAction(ACTION_BREAK_FROSTMOURNE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_jump_SpellScript(); } @@ -3155,13 +3155,13 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_the_lich_king_jump_SpellScript(); } @@ -3172,7 +3172,7 @@ class achievement_been_waiting_long_time : public AchievementCriteriaScript public: achievement_been_waiting_long_time() : AchievementCriteriaScript("achievement_been_waiting_long_time") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; @@ -3186,7 +3186,7 @@ class achievement_neck_deep_in_vile : public AchievementCriteriaScript public: achievement_neck_deep_in_vile() : AchievementCriteriaScript("achievement_neck_deep_in_vile") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 22a576a25d7..166c12a9914 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -287,7 +287,7 @@ class boss_valithria_dreamwalker : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -297,7 +297,7 @@ class boss_valithria_dreamwalker : public CreatureScript Reset(); } - void Reset() OVERRIDE + void Reset() override { me->SetHealth(_spawnHealth); me->SetReactState(REACT_PASSIVE); @@ -315,11 +315,11 @@ class boss_valithria_dreamwalker : public CreatureScript _done = false; } - void AttackStart(Unit* /*target*/) OVERRIDE + void AttackStart(Unit* /*target*/) override { } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_ENTER_COMBAT) return; @@ -332,7 +332,7 @@ class boss_valithria_dreamwalker : public CreatureScript _events.ScheduleEvent(EVENT_BERSERK, 420000); } - void HealReceived(Unit* healer, uint32& heal) OVERRIDE + void HealReceived(Unit* healer, uint32& heal) override { if (!me->hasLootRecipient()) me->SetLootRecipient(healer); @@ -362,7 +362,7 @@ class boss_valithria_dreamwalker : public CreatureScript archmage->AI()->DoZoneInCombat(); // call EnterCombat on one of them, that will make it all start } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(25, damage)) { @@ -387,7 +387,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_DREAM_SLIP) { @@ -405,7 +405,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_DREAM_PORTAL_PRE_EFFECT) { @@ -419,14 +419,14 @@ class boss_valithria_dreamwalker : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { if (summon->GetEntry() == NPC_DREAM_PORTAL || summon->GetEntry() == NPC_NIGHTMARE_PORTAL) if (summon->AI()->GetData(MISSED_PORTALS)) ++_missedPortals; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // does not enter combat if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) != IN_PROGRESS) @@ -463,7 +463,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == MISSED_PORTALS) return _missedPortals; @@ -483,7 +483,7 @@ class boss_valithria_dreamwalker : public CreatureScript bool _done; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -500,13 +500,13 @@ class npc_green_dragon_combat_trigger : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* target) OVERRIDE + void EnterCombat(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer())) { @@ -522,24 +522,24 @@ class npc_green_dragon_combat_trigger : public CreatureScript valithria->AI()->DoAction(ACTION_ENTER_COMBAT); } - void AttackStart(Unit* target) OVERRIDE + void AttackStart(Unit* target) override { if (target->GetTypeId() == TypeID::TYPEID_PLAYER) BossAI::AttackStart(target); } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { return target->GetTypeId() == TypeID::TYPEID_PLAYER; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); DoAction(ACTION_DEATH); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_DEATH) { @@ -548,7 +548,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!me->IsInCombat()) return; @@ -578,7 +578,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript bool _evadeCheck; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -596,7 +596,7 @@ class npc_the_lich_king_controller : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_GLUTTONOUS_ABOMINATION_SUMMONER, 5000); @@ -607,18 +607,18 @@ class npc_the_lich_king_controller : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->setActive(false); } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { Talk(SAY_LICH_KING_INTRO); me->setActive(true); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { // must not be in dream phase summon->SetPhaseMask((summon->GetPhaseMask() & ~0x10), true); @@ -627,7 +627,7 @@ class npc_the_lich_king_controller : public CreatureScript summon->AI()->AttackStart(target); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -667,7 +667,7 @@ class npc_the_lich_king_controller : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_the_lich_king_controllerAI(creature); } @@ -685,12 +685,12 @@ class npc_risen_archmage : public CreatureScript { } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { return target->GetEntry() != NPC_VALITHRIA_DREAMWALKER; } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, urand(5000, 15000)); @@ -699,7 +699,7 @@ class npc_risen_archmage : public CreatureScript _canCallEnterCombat = true; } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { me->FinishSpell(CURRENT_CHANNELED_SPELL, false); if (me->GetDBTableGUIDLow() && _canCallEnterCombat) @@ -719,7 +719,7 @@ class npc_risen_archmage : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_ENTER_COMBAT) return; @@ -729,7 +729,7 @@ class npc_risen_archmage : public CreatureScript _canCallEnterCombat = true; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_COLUMN_OF_FROST) summon->m_Events.AddEvent(new DelayedCastEvent(summon, SPELL_COLUMN_OF_FROST_DAMAGE, 0, 8000), summon->m_Events.CalculateTime(2000)); @@ -737,7 +737,7 @@ class npc_risen_archmage : public CreatureScript summon->DespawnOrUnsummon(36000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) if (me->GetDBTableGUIDLow()) @@ -784,7 +784,7 @@ class npc_risen_archmage : public CreatureScript bool _canCallEnterCombat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -801,14 +801,14 @@ class npc_blazing_skeleton : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_FIREBALL, urand(2000, 4000)); _events.ScheduleEvent(EVENT_LEY_WASTE, urand(15000, 20000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -843,7 +843,7 @@ class npc_blazing_skeleton : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -861,20 +861,20 @@ class npc_suppresser : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SUPPRESSION, urand(10000, 15000)); me->SetReactState(REACT_PASSIVE); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* valithria = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_VALITHRIA_DREAMWALKER))) AttackStart(valithria); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -909,7 +909,7 @@ class npc_suppresser : public CreatureScript InstanceScript* const _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -926,12 +926,12 @@ class npc_blistering_zombie : public CreatureScript { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_ACID_BURST, true); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -940,7 +940,7 @@ class npc_blistering_zombie : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -957,18 +957,18 @@ class npc_gluttonous_abomination : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_GUT_SPRAY, urand(10000, 13000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_ROT_WORM_SPAWNER, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -998,7 +998,7 @@ class npc_gluttonous_abomination : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1016,7 +1016,7 @@ class npc_dream_portal : public CreatureScript { } - void OnSpellClick(Unit* /*clicker*/, bool& result) OVERRIDE + void OnSpellClick(Unit* /*clicker*/, bool& result) override { if (!result) return; @@ -1025,12 +1025,12 @@ class npc_dream_portal : public CreatureScript me->DespawnOrUnsummon(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return (type == MISSED_PORTALS && _used) ? 0 : 1; } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { UpdateVictim(); } @@ -1039,7 +1039,7 @@ class npc_dream_portal : public CreatureScript bool _used; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1057,7 +1057,7 @@ class npc_dream_cloud : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_CHECK_PLAYER, 1000); @@ -1065,7 +1065,7 @@ class npc_dream_cloud : public CreatureScript me->LoadCreaturesAddon(true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // trigger if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) != IN_PROGRESS) @@ -1103,7 +1103,7 @@ class npc_dream_cloud : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1127,13 +1127,13 @@ class spell_dreamwalker_mana_void : public SpellScriptLoader PreventDefaultAction(); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_mana_void_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dreamwalker_mana_void_AuraScript(); } @@ -1148,7 +1148,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader { PrepareAuraScript(spell_dreamwalker_decay_periodic_timer_AuraScript); - bool Load() OVERRIDE + bool Load() override { _decayRate = GetId() != SPELL_TIMER_BLAZING_SKELETON ? 1000 : 5000; return true; @@ -1163,7 +1163,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader aurEff->SetPeriodicTimer(timer - _decayRate); } - void Register() OVERRIDE + void Register() override { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dreamwalker_decay_periodic_timer_AuraScript::DecayPeriodicTimer, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -1171,7 +1171,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader int32 _decayRate; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dreamwalker_decay_periodic_timer_AuraScript(); } @@ -1186,7 +1186,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader { PrepareSpellScript(spell_dreamwalker_summoner_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster()->GetInstanceScript()) return false; @@ -1213,14 +1213,14 @@ class spell_dreamwalker_summoner : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true, NULL, NULL, GetCaster()->GetInstanceScript()->GetData64(DATA_VALITHRIA_LICH_KING)); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dreamwalker_summoner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summoner_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dreamwalker_summoner_SpellScript(); } @@ -1255,13 +1255,13 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader caster->CastSpell(summoners.back(), SPELL_SUMMON_SUPPRESSER, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_summon_suppresser_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dreamwalker_summon_suppresser_AuraScript(); } @@ -1276,7 +1276,7 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader { PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster()->GetInstanceScript()) return false; @@ -1292,13 +1292,13 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true, NULL, NULL, GetCaster()->GetInstanceScript()->GetData64(DATA_VALITHRIA_LICH_KING)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_suppresser_effect_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dreamwalker_summon_suppresser_effect_SpellScript(); } @@ -1323,13 +1323,13 @@ class spell_dreamwalker_summon_dream_portal : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_dream_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dreamwalker_summon_dream_portal_SpellScript(); } @@ -1354,13 +1354,13 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_nightmare_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dreamwalker_summon_nightmare_portal_SpellScript(); } @@ -1375,7 +1375,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader { PrepareAuraScript(spell_dreamwalker_nightmare_cloud_AuraScript); - bool Load() OVERRIDE + bool Load() override { _instance = GetOwner()->GetInstanceScript(); return _instance != NULL; @@ -1387,7 +1387,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader PreventDefaultAction(); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_nightmare_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -1395,7 +1395,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader InstanceScript* _instance; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dreamwalker_nightmare_cloud_AuraScript(); } @@ -1421,13 +1421,13 @@ class spell_dreamwalker_twisted_nightmares : public SpellScriptLoader GetHitUnit()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, NULL, NULL, instance->GetData64(DATA_VALITHRIA_DREAMWALKER)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_twisted_nightmares_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dreamwalker_twisted_nightmares_SpellScript(); } @@ -1438,7 +1438,7 @@ class achievement_portal_jockey : public AchievementCriteriaScript public: achievement_portal_jockey() : AchievementCriteriaScript("achievement_portal_jockey") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && !target->GetAI()->GetData(MISSED_PORTALS); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 605d8519102..311b6f5359c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -389,7 +389,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _theLichKing = 0; @@ -400,7 +400,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript // IMPORTANT NOTE: This is triggered from per-GUID scripts // of The Damned SAI - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_DAMNED_KILLS && data == 1) { @@ -462,7 +462,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_damnedKills != 2) return; @@ -583,7 +583,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript uint16 _damnedKills; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -600,7 +600,7 @@ class npc_rotting_frost_giant : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_DEATH_PLAGUE, 15000); @@ -608,12 +608,12 @@ class npc_rotting_frost_giant : public CreatureScript _events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(10000, 15000)); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _events.Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -655,7 +655,7 @@ class npc_rotting_frost_giant : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -673,7 +673,7 @@ class npc_frost_freeze_trap : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -686,7 +686,7 @@ class npc_frost_freeze_trap : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -701,7 +701,7 @@ class npc_frost_freeze_trap : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -712,7 +712,7 @@ class npc_alchemist_adrianna : public CreatureScript public: npc_alchemist_adrianna() : CreatureScript("npc_alchemist_adrianna") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (!creature->FindCurrentSpellBySpellId(SPELL_HARVEST_BLIGHT_SPECIMEN) && !creature->FindCurrentSpellBySpellId(SPELL_HARVEST_BLIGHT_SPECIMEN25)) if (player->HasAura(SPELL_ORANGE_BLIGHT_RESIDUE) && player->HasAura(SPELL_GREEN_BLIGHT_RESIDUE)) @@ -733,7 +733,7 @@ class boss_sister_svalna : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (!me->isDead()) Reset(); @@ -741,14 +741,14 @@ class boss_sister_svalna : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_DEFENSIVE); _isEventInProgress = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_SVALNA_DEATH); @@ -767,7 +767,7 @@ class boss_sister_svalna : public CreatureScript } } - void EnterCombat(Unit* /*attacker*/) OVERRIDE + void EnterCombat(Unit* /*attacker*/) override { _EnterCombat(); if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_CROK_SCOURGEBANE))) @@ -777,7 +777,7 @@ class boss_sister_svalna : public CreatureScript events.ScheduleEvent(EVENT_AETHER_SHIELD, urand(100000, 110000)); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { switch (victim->GetTypeId()) { @@ -802,7 +802,7 @@ class boss_sister_svalna : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { _JustReachedHome(); me->SetReactState(REACT_PASSIVE); @@ -810,7 +810,7 @@ class boss_sister_svalna : public CreatureScript me->SetHover(false); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -838,7 +838,7 @@ class boss_sister_svalna : public CreatureScript } } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_HURL_SPEAR && me->HasAura(SPELL_AETHER_SHIELD)) { @@ -847,7 +847,7 @@ class boss_sister_svalna : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != EFFECT_MOTION_TYPE || id != POINT_LAND) return; @@ -859,7 +859,7 @@ class boss_sister_svalna : public CreatureScript me->SetHover(false); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch (spell->Id) { @@ -879,7 +879,7 @@ class boss_sister_svalna : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !_isEventInProgress) return; @@ -924,7 +924,7 @@ class boss_sister_svalna : public CreatureScript bool _isEventInProgress; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -948,7 +948,7 @@ class npc_crok_scourgebane : public CreatureScript _didUnderTenPercentText = false; } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SCOURGE_STRIKE, urand(7500, 12500)); @@ -958,7 +958,7 @@ class npc_crok_scourgebane : public CreatureScript _wipeCheckTimer = 1000; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_START_GAUNTLET) { @@ -990,7 +990,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void SetGUID(uint64 guid, int32 type/* = 0*/) OVERRIDE + void SetGUID(uint64 guid, int32 type/* = 0*/) override { if (type == ACTION_VRYKUL_DEATH) { @@ -1010,7 +1010,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -1040,7 +1040,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void WaypointStart(uint32 waypointId) OVERRIDE + void WaypointStart(uint32 waypointId) override { _currentWPid = waypointId; switch (waypointId) @@ -1088,7 +1088,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { // check wipe if (!_wipeCheckTimer) @@ -1130,7 +1130,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void UpdateEscortAI(uint32 const diff) OVERRIDE + void UpdateEscortAI(uint32 const diff) override { if (_wipeCheckTimer <= diff) _wipeCheckTimer = 0; @@ -1188,7 +1188,7 @@ class npc_crok_scourgebane : public CreatureScript DoMeleeAttackIfReady(); } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { // do not see targets inside Frostwing Halls when we are not there return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f); @@ -1207,7 +1207,7 @@ class npc_crok_scourgebane : public CreatureScript bool _didUnderTenPercentText; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1223,7 +1223,7 @@ struct npc_argent_captainAI : public ScriptedAI IsUndead = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_firstDeath) { @@ -1234,13 +1234,13 @@ struct npc_argent_captainAI : public ScriptedAI Talk(SAY_CAPTAIN_SECOND_DEATH); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_CAPTAIN_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_START_GAUNTLET) { @@ -1260,20 +1260,20 @@ struct npc_argent_captainAI : public ScriptedAI } } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { me->SetHomePosition(*me); if (IsUndead) DoZoneInCombat(); } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { // do not see targets inside Frostwing Halls when we are not there return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { // not yet following if (me->GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != CHASE_MOTION_TYPE || IsUndead) @@ -1295,7 +1295,7 @@ struct npc_argent_captainAI : public ScriptedAI Reset(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_REVIVE_CHAMPION && !IsUndead) { @@ -1348,7 +1348,7 @@ class npc_captain_arnath : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { Events.Reset(); Events.ScheduleEvent(EVENT_ARNATH_FLASH_HEAL, urand(4000, 7000)); @@ -1358,7 +1358,7 @@ class npc_captain_arnath : public CreatureScript Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, urand(22000, 27000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1412,7 +1412,7 @@ class npc_captain_arnath : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1429,7 +1429,7 @@ class npc_captain_brandon : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { Events.Reset(); Events.ScheduleEvent(EVENT_BRANDON_CRUSADER_STRIKE, urand(6000, 10000)); @@ -1439,7 +1439,7 @@ class npc_captain_brandon : public CreatureScript Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, urand(25000, 30000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1480,7 +1480,7 @@ class npc_captain_brandon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1497,7 +1497,7 @@ class npc_captain_grondel : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { Events.Reset(); Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500); @@ -1507,7 +1507,7 @@ class npc_captain_grondel : public CreatureScript Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, urand(12000, 17000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1547,7 +1547,7 @@ class npc_captain_grondel : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1564,7 +1564,7 @@ class npc_captain_rupert : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { Events.Reset(); Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, urand(15000, 20000)); @@ -1572,7 +1572,7 @@ class npc_captain_rupert : public CreatureScript Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, urand(10000, 15000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1610,7 +1610,7 @@ class npc_captain_rupert : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetIcecrownCitadelAI(creature); } @@ -1627,14 +1627,14 @@ class npc_frostwing_vrykul : public CreatureScript { } - bool CanAIAttack(Unit const* target) const OVERRIDE + bool CanAIAttack(Unit const* target) const override { // do not see targets inside Frostwing Halls when we are not there return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && SmartAI::CanAIAttack(target); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frostwing_vrykulAI(creature); } @@ -1651,13 +1651,13 @@ class npc_impaling_spear : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); _vehicleCheckTimer = 500; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_vehicleCheckTimer <= diff) { @@ -1672,7 +1672,7 @@ class npc_impaling_spear : public CreatureScript uint32 _vehicleCheckTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_impaling_spearAI(creature); } @@ -1689,7 +1689,7 @@ class npc_arthas_teleport_visual : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); if (_instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && @@ -1698,7 +1698,7 @@ class npc_arthas_teleport_visual : public CreatureScript _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(1000, 6000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_events.Empty()) return; @@ -1717,7 +1717,7 @@ class npc_arthas_teleport_visual : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { // Distance from the center of the spire if (creature->GetExactDist2d(4357.052f, 2769.421f) < 100.0f && creature->GetHomePosition().GetPositionZ() < 315.0f) @@ -1757,14 +1757,14 @@ class spell_icc_stoneform : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_icc_stoneform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_icc_stoneform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_icc_stoneform_AuraScript(); } @@ -1820,13 +1820,13 @@ class spell_icc_sprit_alarm : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_icc_sprit_alarm_SpellScript::HandleEvent, EFFECT_2, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_icc_sprit_alarm_SpellScript(); } @@ -1864,7 +1864,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader { PrepareSpellScript(spell_frost_giant_death_plague_SpellScript); - bool Load() OVERRIDE + bool Load() override { _failed = false; return true; @@ -1901,7 +1901,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DEATH_PLAGUE_KILL, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frost_giant_death_plague_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frost_giant_death_plague_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); @@ -1911,7 +1911,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader bool _failed; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_frost_giant_death_plague_SpellScript(); } @@ -1937,14 +1937,14 @@ class spell_icc_harvest_blight_specimen : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_icc_harvest_blight_specimen_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_icc_harvest_blight_specimen_SpellScript::HandleQuestComplete, EFFECT_1, SPELL_EFFECT_QUEST_COMPLETE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_icc_harvest_blight_specimen_SpellScript(); } @@ -1991,14 +1991,14 @@ class spell_svalna_revive_champion : public SpellScriptLoader caster->GetMotionMaster()->MoveLand(POINT_LAND, pos); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_svalna_revive_champion_SpellScript::RemoveAliveTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); OnEffectHit += SpellEffectFn(spell_svalna_revive_champion_SpellScript::Land, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_svalna_revive_champion_SpellScript(); } @@ -2024,13 +2024,13 @@ class spell_svalna_remove_spear : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_svalna_remove_spear_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_svalna_remove_spear_SpellScript(); } @@ -2051,13 +2051,13 @@ class spell_icc_soul_missile : public SpellScriptLoader const_cast(GetExplTargetDest())->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnCast += SpellCastFn(spell_icc_soul_missile_SpellScript::RelocateDest); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_icc_soul_missile_SpellScript(); } @@ -2068,7 +2068,7 @@ class at_icc_saurfang_portal : public AreaTriggerScript public: at_icc_saurfang_portal() : AreaTriggerScript("at_icc_saurfang_portal") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -2102,7 +2102,7 @@ class at_icc_shutdown_traps : public AreaTriggerScript public: at_icc_shutdown_traps() : AreaTriggerScript("at_icc_shutdown_traps") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) instance->SetData(DATA_COLDFLAME_JETS, DONE); @@ -2115,7 +2115,7 @@ class at_icc_start_blood_quickening : public AreaTriggerScript public: at_icc_start_blood_quickening() : AreaTriggerScript("at_icc_start_blood_quickening") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetData(DATA_BLOOD_QUICKENING_STATE) == NOT_STARTED) @@ -2129,7 +2129,7 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript public: at_icc_start_frostwing_gauntlet() : AreaTriggerScript("at_icc_start_frostwing_gauntlet") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* crok = ObjectAccessor::GetCreature(*player, instance->GetData64(DATA_CROK_SCOURGEBANE))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index b1845634ed7..ae8dba481a4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -477,7 +477,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader public: spell_trigger_spell_from_caster_SpellScript(uint32 triggerId) : SpellScript(), _triggerId(triggerId) { } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(_triggerId)) return false; @@ -489,7 +489,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), _triggerId, true); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_trigger_spell_from_caster_SpellScript::HandleTrigger); } @@ -497,7 +497,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader uint32 _triggerId; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_trigger_spell_from_caster_SpellScript(_triggerId); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index e1e062da518..ba566d032c5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -32,7 +32,7 @@ class icecrown_citadel_teleport : public GameObjectScript public: icecrown_citadel_teleport() : GameObjectScript("icecrown_citadel_teleport") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to Light's Hammer.", GOSSIP_SENDER_ICC_PORT, LIGHT_S_HAMMER_TELEPORT); if (InstanceScript* instance = go->GetInstanceScript()) @@ -54,7 +54,7 @@ class icecrown_citadel_teleport : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -80,7 +80,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript public: at_frozen_throne_teleport() : AreaTriggerScript("at_frozen_throne_teleport") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override { if (player->IsInCombat()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 1ba1185bb1e..42768a2c062 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -154,7 +154,7 @@ class instance_icecrown_citadel : public InstanceMapScript BloodQuickeningMinutes = 0; } - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE + void FillInitialWorldStates(WorldStateBuilder& builder) override { builder.AppendState(WORLDSTATE_SHOW_TIMER, BloodQuickeningState == IN_PROGRESS); builder.AppendState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes); @@ -163,13 +163,13 @@ class instance_icecrown_citadel : public InstanceMapScript builder.AppendState(WORLDSTATE_ATTEMPTS_MAX, MaxHeroicAttempts); } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (!TeamInInstance) TeamInInstance = player->GetTeam(); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (!TeamInInstance) { @@ -312,14 +312,14 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { if (creature->GetEntry() == NPC_SINDRAGOSA) SindragosaGUID = 0; } // Weekly quest spawn prevention - uint32 GetCreatureEntry(uint32 /*guidLow*/, CreatureData const* data) OVERRIDE + uint32 GetCreatureEntry(uint32 /*guidLow*/, CreatureData const* data) override { uint32 entry = data->id; switch (entry) @@ -351,7 +351,7 @@ class instance_icecrown_citadel : public InstanceMapScript return entry; } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -409,7 +409,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -557,7 +557,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -591,7 +591,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -616,7 +616,7 @@ class instance_icecrown_citadel : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -682,7 +682,7 @@ class instance_icecrown_citadel : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -845,7 +845,7 @@ class instance_icecrown_citadel : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -911,7 +911,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { switch (criteria_id) { @@ -951,7 +951,7 @@ class instance_icecrown_citadel : public InstanceMapScript return false; } - bool CheckRequiredBosses(uint32 bossId, Player const* player = NULL) const OVERRIDE + bool CheckRequiredBosses(uint32 bossId, Player const* player = NULL) const override { if (player && player->GetSession()->HasPermission(rbac::RBAC_PERM_SKIP_CHECK_INSTANCE_REQUIRED_BOSSES)) return true; @@ -1106,7 +1106,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -1118,7 +1118,7 @@ class instance_icecrown_citadel : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -1160,7 +1160,7 @@ class instance_icecrown_citadel : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (BloodQuickeningState != IN_PROGRESS && GetBossState(DATA_THE_LICH_KING) != IN_PROGRESS) return; @@ -1218,7 +1218,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*source*/, uint32 eventId) OVERRIDE + void ProcessEvent(WorldObject* /*source*/, uint32 eventId) override { switch (eventId) { @@ -1313,7 +1313,7 @@ class instance_icecrown_citadel : public InstanceMapScript bool IsOrbWhispererEligible; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_icecrown_citadel_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 82e6f7f2b4e..7e626c0a8f8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -60,7 +60,7 @@ class boss_anubrekhan : public CreatureScript public: boss_anubrekhan() : CreatureScript("boss_anubrekhan") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_anubrekhanAI(creature); } @@ -71,7 +71,7 @@ class boss_anubrekhan : public CreatureScript bool hasTaunted; - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -93,7 +93,7 @@ class boss_anubrekhan : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { /// Force the player to spawn corpse scarabs via spell, @todo Check percent chance for scarabs, 20% at the moment if (!(rand()%5)) @@ -103,7 +103,7 @@ class boss_anubrekhan : public CreatureScript Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -111,7 +111,7 @@ class boss_anubrekhan : public CreatureScript if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -123,7 +123,7 @@ class boss_anubrekhan : public CreatureScript events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TypeID::TYPEID_PLAYER) @@ -134,7 +134,7 @@ class boss_anubrekhan : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { BossAI::SummonedCreatureDespawn(summon); @@ -145,7 +145,7 @@ class boss_anubrekhan : public CreatureScript summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index adc8d23a6b6..01ff97cfbc1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -70,7 +70,7 @@ class boss_faerlina : public CreatureScript } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -79,14 +79,14 @@ class boss_faerlina : public CreatureScript events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); } - void Reset() OVERRIDE + void Reset() override { _Reset(); _delayFrenzy = false; _frenzyDispels = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!_introDone && who->GetTypeId() == TypeID::TYPEID_PLAYER) @@ -98,19 +98,19 @@ class boss_faerlina : public CreatureScript BossAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!urand(0, 2)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_WIDOWS_EMBRACE || spell->Id == H_SPELL_WIDOWS_EMBRACE) { @@ -121,7 +121,7 @@ class boss_faerlina : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_FRENZY_DISPELS) return _frenzyDispels; @@ -129,7 +129,7 @@ class boss_faerlina : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -180,7 +180,7 @@ class boss_faerlina : public CreatureScript bool _delayFrenzy; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_faerlinaAI(creature); } @@ -198,7 +198,7 @@ class npc_faerlina_add : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { if (GetDifficulty() == DIFFICULTY_10MAN_NORMAL) { me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_BIND, true); @@ -206,7 +206,7 @@ class npc_faerlina_add : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_instance && GetDifficulty() == DIFFICULTY_10MAN_NORMAL) if (Creature* faerlina = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_FAERLINA))) @@ -217,7 +217,7 @@ class npc_faerlina_add : public CreatureScript InstanceScript* const _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_faerlina_addAI(creature); } @@ -228,7 +228,7 @@ class achievement_momma_said_knock_you_out : public AchievementCriteriaScript public: achievement_momma_said_knock_you_out() : AchievementCriteriaScript("achievement_momma_said_knock_you_out") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && !target->GetAI()->GetData(DATA_FRENZY_DISPELS); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 1ffc51ef1d5..cf9d01c3e10 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -90,7 +90,7 @@ class boss_four_horsemen : public CreatureScript public: boss_four_horsemen() : CreatureScript("boss_four_horsemen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_four_horsemenAI(creature); } @@ -119,7 +119,7 @@ class boss_four_horsemen : public CreatureScript bool encounterActionReset; bool doDelayPunish; - void Reset() OVERRIDE + void Reset() override { if (!encounterActionReset) DoEncounteraction(NULL, false, true, false); @@ -223,7 +223,7 @@ class boss_four_horsemen : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -266,7 +266,7 @@ class boss_four_horsemen : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { BossAI::MoveInLineOfSight(who); @@ -274,7 +274,7 @@ class boss_four_horsemen : public CreatureScript SelectNearestTarget(who); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!movementCompleted && !movementStarted) { @@ -293,13 +293,13 @@ class boss_four_horsemen : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { events.Reset(); summons.DespawnAll(); @@ -320,7 +320,7 @@ class boss_four_horsemen : public CreatureScript Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -330,7 +330,7 @@ class boss_four_horsemen : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 15*100*1000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (nextWP && movementStarted && !movementCompleted && !nextMovementStarted) { @@ -438,13 +438,13 @@ class spell_four_horsemen_mark : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_four_horsemen_mark_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_four_horsemen_mark_AuraScript(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 89b22dc9f98..7e6a896e8e8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -59,7 +59,7 @@ class boss_gluth : public CreatureScript public: boss_gluth() : CreatureScript("boss_gluth") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gluthAI(creature); } @@ -72,7 +72,7 @@ class boss_gluth : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_INFECTED_WOUND, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who->GetEntry() == NPC_ZOMBIE && me->IsWithinDistInMap(who, 7)) @@ -85,7 +85,7 @@ class boss_gluth : public CreatureScript BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_WOUND, 10000); @@ -95,14 +95,14 @@ class boss_gluth : public CreatureScript events.ScheduleEvent(EVENT_SUMMON, 15000); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_ZOMBIE) summon->AI()->AttackStart(me); summons.Summon(summon); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictimWithGaze() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 5aee42196b6..108fbf5fcb6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -178,7 +178,7 @@ class boss_gothik : public CreatureScript std::vector LiveTriggerGUID; std::vector DeadTriggerGUID; - void Reset() OVERRIDE + void Reset() override { LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); @@ -192,7 +192,7 @@ class boss_gothik : public CreatureScript thirtyPercentReached = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { for (uint32 i = 0; i < POS_LIVE; ++i) if (Creature* trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i])) @@ -217,7 +217,7 @@ class boss_gothik : public CreatureScript instance->SetData(DATA_GOTHIK_GATE, uint32(GOState::GO_STATE_READY)); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == WORLD_TRIGGER) summon->setActive(true); @@ -234,18 +234,18 @@ class boss_gothik : public CreatureScript summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%5)) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); @@ -353,7 +353,7 @@ class boss_gothik : public CreatureScript return false; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { uint32 spellId = 0; switch (spell->Id) @@ -370,13 +370,13 @@ class boss_gothik : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { if (!phaseTwo) damage = 0; } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (!me->IsInCombat()) return; @@ -396,7 +396,7 @@ class boss_gothik : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -501,7 +501,7 @@ class boss_gothik : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gothikAI(creature); } @@ -527,25 +527,25 @@ class npc_gothik_minion : public CreatureScript return (liveSide == IN_LIVE_SIDE(who)); } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { gateClose = param; } - void DamageTaken(Unit* attacker, uint32 &damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32 &damage) override { if (gateClose && !isOnSameSide(attacker)) damage = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (me->IsSummon()) if (Unit* owner = me->ToTempSummon()->GetSummoner()) CombatAI::JustDied(owner); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (!gateClose) { @@ -577,7 +577,7 @@ class npc_gothik_minion : public CreatureScript Reset(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (gateClose && (!isOnSameSide(me) || (me->GetVictim() && !isOnSameSide(me->GetVictim())))) { @@ -589,7 +589,7 @@ class npc_gothik_minion : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_gothik_minionAI(creature); } @@ -609,13 +609,13 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader targets.remove_if(Skyfire::UnitAuraCheck(false, SPELL_SHADOW_MARK)); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gothik_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gothik_shadow_bolt_volley_SpellScript(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index a600060172c..b7838fb5716 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -52,7 +52,7 @@ class boss_grobbulus : public CreatureScript public: boss_grobbulus() : CreatureScript("boss_grobbulus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_grobbulusAI(creature); } @@ -64,7 +64,7 @@ class boss_grobbulus : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_CLOUD, 15000); @@ -73,7 +73,7 @@ class boss_grobbulus : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 12*60000); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { if (spell->Id == uint32(SPELL_SLIME_SPRAY)) { @@ -82,7 +82,7 @@ class boss_grobbulus : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -122,7 +122,7 @@ class npc_grobbulus_poison_cloud : public CreatureScript public: npc_grobbulus_poison_cloud() : CreatureScript("npc_grobbulus_poison_cloud") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_grobbulus_poison_cloudAI(creature); } @@ -136,13 +136,13 @@ class npc_grobbulus_poison_cloud : public CreatureScript uint32 Cloud_Timer; - void Reset() OVERRIDE + void Reset() override { Cloud_Timer = 1000; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Cloud_Timer <= diff) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 0e01de1d790..3a5b5f8ddb2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -62,7 +62,7 @@ class boss_heigan : public CreatureScript public: boss_heigan() : CreatureScript("boss_heigan") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_heiganAI(creature); } @@ -76,7 +76,7 @@ class boss_heigan : public CreatureScript bool safetyDance; Phases phase; - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (!(rand()%5)) Talk(SAY_SLAY); @@ -84,13 +84,13 @@ class boss_heigan : public CreatureScript safetyDance = false; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { if (id == DATA_SAFETY_DANCE) safetyDance = data ? true : false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_SAFETY_DANCE) return safetyDance ? 1 : 0; @@ -98,13 +98,13 @@ class boss_heigan : public CreatureScript return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -139,7 +139,7 @@ class boss_heigan : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -204,13 +204,13 @@ class spell_heigan_eruption : public SpellScriptLoader Heigan->AI()->SetData(DATA_SAFETY_DANCE, 0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_heigan_eruption_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_heigan_eruption_SpellScript(); } @@ -223,7 +223,7 @@ class achievement_safety_dance : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index c26024cb7f8..635032eb2d5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -297,7 +297,7 @@ class boss_kelthuzad : public CreatureScript chained.clear(); } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -338,12 +338,12 @@ class boss_kelthuzad : public CreatureScript nWeaver = 0; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -351,7 +351,7 @@ class boss_kelthuzad : public CreatureScript ResetPlayerScale(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->setFaction(uiFaction); @@ -384,7 +384,7 @@ class boss_kelthuzad : public CreatureScript KTTriggerGUID = instance ? instance->GetData64(DATA_KELTHUZAD_TRIGGER) : 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -649,7 +649,7 @@ class boss_kelthuzad : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kelthuzadAI(creature); } @@ -660,7 +660,7 @@ class at_kelthuzad_center : public AreaTriggerScript public: at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { if (player->IsGameMaster()) return false; @@ -730,14 +730,14 @@ class npc_kelthuzad_abomination : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(2000, 5000)); DoCast(me, SPELL_FRENZY, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -758,7 +758,7 @@ class npc_kelthuzad_abomination : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (_instance) _instance->SetData(DATA_ABOMINATION_KILLED, _instance->GetData(DATA_ABOMINATION_KILLED) + 1); @@ -769,7 +769,7 @@ class npc_kelthuzad_abomination : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kelthuzad_abominationAI(creature); } @@ -784,7 +784,7 @@ class spell_kelthuzad_detonate_mana : public SpellScriptLoader { PrepareAuraScript(spell_kelthuzad_detonate_mana_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MANA_DETONATION_DAMAGE)) return false; @@ -803,13 +803,13 @@ class spell_kelthuzad_detonate_mana : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_kelthuzad_detonate_mana_AuraScript::HandleScript, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_kelthuzad_detonate_mana_AuraScript(); } @@ -820,7 +820,7 @@ class achievement_just_cant_get_enough : public AchievementCriteriaScript public: achievement_just_cant_get_enough() : AchievementCriteriaScript("achievement_just_cant_get_enough") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 5fc2d341464..44d4458a48f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -67,14 +67,14 @@ class boss_loatheb : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _doomCounter = 0; _sporeLoserData = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_NECROTIC_AURA, 17000); @@ -83,12 +83,12 @@ class boss_loatheb : public CreatureScript events.ScheduleEvent(EVENT_INEVITABLE_DOOM, 120000); } - void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) override { _sporeLoserData = false; } - uint32 GetData(uint32 id) const OVERRIDE + uint32 GetData(uint32 id) const override { if (id != DATA_ACHIEVEMENT_SPORE_LOSER) return 0; @@ -96,7 +96,7 @@ class boss_loatheb : public CreatureScript return uint32(_sporeLoserData); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -142,7 +142,7 @@ class boss_loatheb : public CreatureScript uint8 _doomCounter; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_loathebAI(creature); } @@ -153,7 +153,7 @@ class achievement_spore_loser : public AchievementCriteriaScript public: achievement_spore_loser() : AchievementCriteriaScript("achievement_spore_loser") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_ACHIEVEMENT_SPORE_LOSER); } @@ -170,7 +170,7 @@ class spell_loatheb_necrotic_aura_warning : public SpellScriptLoader { PrepareAuraScript(spell_loatheb_necrotic_aura_warning_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellStore.LookupEntry(SPELL_WARN_NECROTIC_AURA)) return false; @@ -189,14 +189,14 @@ class spell_loatheb_necrotic_aura_warning : public SpellScriptLoader CAST_AI(LoathebAI, GetTarget()->GetAI())->Talk(SAY_NECROTIC_AURA_REMOVED); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_loatheb_necrotic_aura_warning_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_loatheb_necrotic_aura_warning_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_loatheb_necrotic_aura_warning_AuraScript(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index e4d3623d17c..863840c78de 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -66,7 +66,7 @@ class boss_maexxna : public CreatureScript public: boss_maexxna() : CreatureScript("boss_maexxna") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_maexxnaAI(creature); } @@ -77,7 +77,7 @@ class boss_maexxna : public CreatureScript bool enraged; - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); enraged = false; @@ -88,7 +88,7 @@ class boss_maexxna : public CreatureScript events.ScheduleEvent(EVENT_SUMMON, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -156,7 +156,7 @@ class npc_webwrap : public CreatureScript public: npc_webwrap() : CreatureScript("npc_webwrap") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_webwrapAI(creature); } @@ -167,7 +167,7 @@ class npc_webwrap : public CreatureScript uint64 victimGUID; - void SetGUID(uint64 guid, int32 /*param*/) OVERRIDE + void SetGUID(uint64 guid, int32 /*param*/) override { victimGUID = guid; if (me->m_spells[0] && victimGUID) @@ -175,7 +175,7 @@ class npc_webwrap : public CreatureScript victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID()); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (me->m_spells[0] && victimGUID) if (Unit* victim = Unit::GetUnit(*me, victimGUID)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 3bdec684777..c4ba6d5a491 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -76,7 +76,7 @@ class boss_noth : public CreatureScript public: boss_noth() : CreatureScript("boss_noth") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nothAI(creature); } @@ -87,14 +87,14 @@ class boss_noth : public CreatureScript uint32 waveCount, balconyCount; - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -119,20 +119,20 @@ class boss_noth : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); summon->setActive(true); summon->AI()->DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -148,7 +148,7 @@ class boss_noth : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index afe57561b0d..7dd193179ec 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -58,7 +58,7 @@ class boss_patchwerk : public CreatureScript public: boss_patchwerk() : CreatureScript("boss_patchwerk") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_patchwerkAI(creature); } @@ -69,7 +69,7 @@ class boss_patchwerk : public CreatureScript bool Enraged; - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -77,19 +77,19 @@ class boss_patchwerk : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT); } - void KilledUnit(Unit* /*Victim*/) OVERRIDE + void KilledUnit(Unit* /*Victim*/) override { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Enraged = false; @@ -101,7 +101,7 @@ class boss_patchwerk : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index db672a577f6..27841e2a7cd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -64,7 +64,7 @@ class boss_razuvious : public CreatureScript public: boss_razuvious() : CreatureScript("boss_razuvious") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_razuviousAI(creature); } @@ -73,13 +73,13 @@ class boss_razuvious : public CreatureScript { boss_razuviousAI(Creature* creature) : BossAI(creature, BOSS_RAZUVIOUS) { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%3)) DoPlaySoundToSet(me, SOUND_SLAY); } - void DamageTaken(Unit* pDone_by, uint32& uiDamage) OVERRIDE + void DamageTaken(Unit* pDone_by, uint32& uiDamage) override { // Damage done by the controlled Death Knight understudies should also count toward damage done by players if (pDone_by->GetTypeId() == TypeID::TYPEID_UNIT && (pDone_by->GetEntry() == 16803 || pDone_by->GetEntry() == 29941)) @@ -88,14 +88,14 @@ class boss_razuvious : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); DoPlaySoundToSet(me, SOUND_DEATH); me->CastSpell(me, SPELL_HOPELESS, true); /// @todo this may affect other creatures } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); DoPlaySoundToSet(me, SOUND_AGGRO); @@ -105,7 +105,7 @@ class boss_razuvious : public CreatureScript events.ScheduleEvent(EVENT_KNIFE, 10000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 879d09493c7..8b12505b7bd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -97,7 +97,7 @@ class boss_sapphiron : public CreatureScript _map(me->GetMap()) { } - void InitializeAI() OVERRIDE + void InitializeAI() override { float x, y, z; me->GetPosition(x, y, z); @@ -109,7 +109,7 @@ class boss_sapphiron : public CreatureScript BossAI::InitializeAI(); } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -122,7 +122,7 @@ class boss_sapphiron : public CreatureScript _checkFrostResistTimer = 5 * IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -134,7 +134,7 @@ class boss_sapphiron : public CreatureScript CheckPlayersFrostResist(); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_ICEBOLT) { @@ -147,7 +147,7 @@ class boss_sapphiron : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); me->CastSpell(me, SPELL_DIES, true); @@ -155,13 +155,13 @@ class boss_sapphiron : public CreatureScript CheckPlayersFrostResist(); } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == 1) events.ScheduleEvent(EVENT_LIFTOFF, 0); } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { if (param == DATA_SAPPHIRON_BIRTH) { @@ -211,7 +211,7 @@ class boss_sapphiron : public CreatureScript _iceblocks.clear(); } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { if (data == DATA_THE_HUNDRED_CLUB) return _canTheHundredClub; @@ -219,7 +219,7 @@ class boss_sapphiron : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!_phase) return; @@ -404,7 +404,7 @@ class boss_sapphiron : public CreatureScript Map* _map; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_sapphironAI(creature); } @@ -415,7 +415,7 @@ class achievement_the_hundred_club : public AchievementCriteriaScript public: achievement_the_hundred_club() : AchievementCriteriaScript("achievement_the_hundred_club") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_THE_HUNDRED_CLUB); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 0c29d6c7845..f2d8297eedc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -111,7 +111,7 @@ class boss_thaddius : public CreatureScript public: boss_thaddius() : CreatureScript("boss_thaddius") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_thaddiusAI(creature); } @@ -150,19 +150,19 @@ class boss_thaddius : public CreatureScript bool polaritySwitch; uint32 uiAddsTimer; - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -193,7 +193,7 @@ class boss_thaddius : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -202,18 +202,18 @@ class boss_thaddius : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 360000); } - void DamageTaken(Unit* /*pDoneBy*/, uint32 & /*uiDamage*/) OVERRIDE + void DamageTaken(Unit* /*pDoneBy*/, uint32 & /*uiDamage*/) override { me->SetReactState(REACT_AGGRESSIVE); } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { if (id == DATA_POLARITY_SWITCH) polaritySwitch = data ? true : false; } - uint32 GetData(uint32 id) const OVERRIDE + uint32 GetData(uint32 id) const override { if (id != DATA_POLARITY_SWITCH) return 0; @@ -221,7 +221,7 @@ class boss_thaddius : public CreatureScript return uint32(polaritySwitch); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (checkFeugenAlive && checkStalaggAlive) uiAddsTimer = 0; @@ -285,7 +285,7 @@ class npc_stalagg : public CreatureScript public: npc_stalagg() : CreatureScript("npc_stalagg") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stalaggAI(creature); } @@ -302,7 +302,7 @@ class npc_stalagg : public CreatureScript uint32 powerSurgeTimer; uint32 magneticPullTimer; - void Reset() OVERRIDE + void Reset() override { if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) @@ -312,19 +312,19 @@ class npc_stalagg : public CreatureScript magneticPullTimer = 20000; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%5)) Talk(SAY_STAL_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_STAL_AGGRO); DoCast(SPELL_STALAGG_TESLA); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_STAL_DEATH); if (instance) @@ -333,7 +333,7 @@ class npc_stalagg : public CreatureScript pThaddius->AI()->DoAction(ACTION_STALAGG_DIED); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -378,7 +378,7 @@ class npc_feugen : public CreatureScript public: npc_feugen() : CreatureScript("npc_feugen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_feugenAI(creature); } @@ -394,7 +394,7 @@ class npc_feugen : public CreatureScript uint32 staticFieldTimer; - void Reset() OVERRIDE + void Reset() override { if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) @@ -403,19 +403,19 @@ class npc_feugen : public CreatureScript staticFieldTimer = 5000; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (!(rand()%5)) Talk(SAY_FEUG_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_FEUG_AGGRO); DoCast(SPELL_FEUGEN_TESLA); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_FEUG_DEATH); if (instance) @@ -424,7 +424,7 @@ class npc_feugen : public CreatureScript pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -449,7 +449,7 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader { PrepareSpellScript(spell_thaddius_pos_neg_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE)) return false; @@ -462,7 +462,7 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -506,14 +506,14 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_thaddius_pos_neg_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_thaddius_pos_neg_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_thaddius_pos_neg_charge_SpellScript(); } @@ -528,7 +528,7 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader { PrepareSpellScript(spell_thaddius_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_POLARITY) || !sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_POLARITY)) return false; @@ -542,13 +542,13 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, NULL, NULL, caster->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_thaddius_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_thaddius_polarity_shift_SpellScript(); } @@ -559,7 +559,7 @@ class achievement_polarity_switch : public AchievementCriteriaScript public: achievement_polarity_switch() : AchievementCriteriaScript("achievement_polarity_switch") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_POLARITY_SWITCH); } diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 1469662e408..f42e75a4691 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -134,7 +134,7 @@ class instance_naxxramas : public InstanceMapScript memset(PortalsGUID, 0, sizeof(PortalsGUID)); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -178,12 +178,12 @@ class instance_naxxramas : public InstanceMapScript AddMinion(creature, true); } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { AddMinion(creature, false); } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) { @@ -223,7 +223,7 @@ class instance_naxxramas : public InstanceMapScript AddDoor(go, true); } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) { @@ -250,7 +250,7 @@ class instance_naxxramas : public InstanceMapScript AddDoor(go, false); } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { if (unit->GetTypeId() == TypeID::TYPEID_PLAYER && IsEncounterInProgress()) { @@ -259,7 +259,7 @@ class instance_naxxramas : public InstanceMapScript } } - void SetData(uint32 id, uint32 value) OVERRIDE + void SetData(uint32 id, uint32 value) override { switch (id) { @@ -295,7 +295,7 @@ class instance_naxxramas : public InstanceMapScript } } - uint32 GetData(uint32 id) const OVERRIDE + uint32 GetData(uint32 id) const override { switch (id) { @@ -308,7 +308,7 @@ class instance_naxxramas : public InstanceMapScript return 0; } - uint64 GetData64(uint32 id) const OVERRIDE + uint64 GetData64(uint32 id) const override { switch (id) { @@ -347,7 +347,7 @@ class instance_naxxramas : public InstanceMapScript return 0; } - bool SetBossState(uint32 id, EncounterState state) OVERRIDE + bool SetBossState(uint32 id, EncounterState state) override { if (!InstanceScript::SetBossState(id, state)) return false; @@ -397,7 +397,7 @@ class instance_naxxramas : public InstanceMapScript return true; } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) override { switch (criteria_id) { @@ -430,7 +430,7 @@ class instance_naxxramas : public InstanceMapScript return false; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -441,7 +441,7 @@ class instance_naxxramas : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { @@ -516,7 +516,7 @@ class instance_naxxramas : public InstanceMapScript uint32 playerDied; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_naxxramas_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 7f8b1ce4f4f..5178e87269d 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -349,7 +349,7 @@ class boss_malygos : public CreatureScript _flySpeed = me->GetSpeed(MOVE_FLIGHT); // Get initial fly speed, otherwise on each wipe fly speed would add up if we get it } - void Reset() OVERRIDE + void Reset() override { // EnterEvadeMode and Reset() links are cut for the sake of properly functioning despawner. if (!_despawned) @@ -383,7 +383,7 @@ class boss_malygos : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { switch (data) { @@ -396,7 +396,7 @@ class boss_malygos : public CreatureScript return 0; } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == DATA_SUMMON_DEATHS && _phase == PHASE_TWO && !_despawned) { @@ -421,7 +421,7 @@ class boss_malygos : public CreatureScript } } - uint64 GetGUID(int32 type) const OVERRIDE + uint64 GetGUID(int32 type) const override { if (type >= DATA_FIRST_SURGE_TARGET_GUID && type < DATA_FIRST_SURGE_TARGET_GUID + NUM_MAX_SURGE_TARGETS) return _surgeTargetGUID[type - DATA_FIRST_SURGE_TARGET_GUID]; @@ -431,7 +431,7 @@ class boss_malygos : public CreatureScript return 0; } - void SetGUID(uint64 guid, int32 type) OVERRIDE + void SetGUID(uint64 guid, int32 type) override { switch (type) { @@ -448,7 +448,7 @@ class boss_malygos : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -560,13 +560,13 @@ class boss_malygos : public CreatureScript } // There are moments where boss will do nothing while being attacked - void AttackStart(Unit* target) OVERRIDE + void AttackStart(Unit* target) override { if (_canAttack) BossAI::AttackStart(target); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { // We can't call full function here since it includes DoZoneInCombat(), // if someone does it will be returned with a warning. @@ -588,7 +588,7 @@ class boss_malygos : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (instance) instance->SetBossState(DATA_MALYGOS_EVENT, FAIL); @@ -635,7 +635,7 @@ class boss_malygos : public CreatureScript instance->SetBossState(DATA_MALYGOS_EVENT, NOT_STARTED); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -663,7 +663,7 @@ class boss_malygos : public CreatureScript } } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_POWER_SPARK_MALYGOS) { @@ -676,7 +676,7 @@ class boss_malygos : public CreatureScript sCreatureTextMgr->SendChat(me, EMOTE_HIT_BERSERKER_TIMER, 0, ChatMsg::CHAT_MSG_ADDON, Language::LANG_ADDON, TEXT_RANGE_MAP); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->IsInCombat() || _phase != PHASE_ONE) @@ -687,7 +687,7 @@ class boss_malygos : public CreatureScript who->CastSpell(me, SPELL_POWER_SPARK_MALYGOS, true); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -756,7 +756,7 @@ class boss_malygos : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance || (!UpdateVictim() && _phase != PHASE_NOT_STARTED && _phase != PHASE_TWO)) return; @@ -999,7 +999,7 @@ class boss_malygos : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -1075,7 +1075,7 @@ class boss_malygos : public CreatureScript float _flySpeed; // Used to store base fly speed to prevent stacking on each evade. }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_malygosAI(creature); } @@ -1093,7 +1093,7 @@ class npc_portal_eoe: public CreatureScript _instance = creature->GetInstanceScript(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_PORTAL_OPENED) { @@ -1105,7 +1105,7 @@ class npc_portal_eoe: public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { // When duration of opened riff visual ends, closed one should be cast if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) && !me->HasAura(SPELL_PORTAL_OPENED)) @@ -1128,7 +1128,7 @@ class npc_portal_eoe: public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_portal_eoeAI(creature); } @@ -1158,7 +1158,7 @@ class npc_power_spark: public CreatureScript me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!_instance) return; @@ -1182,7 +1182,7 @@ class npc_power_spark: public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->CastSpell(me, SPELL_POWER_SPARK_DEATH, true); // not supposed to hide the fact it's there by not selectable } @@ -1191,7 +1191,7 @@ class npc_power_spark: public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_power_sparkAI(creature); } @@ -1212,14 +1212,14 @@ class npc_melee_hover_disk : public CreatureScript me->SetSpeed(MOVE_FLIGHT, 1.25f); } - void Reset() OVERRIDE + void Reset() override { VehicleAI::Reset(); _wpCount = 0; } - void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) override { if (apply) { @@ -1251,7 +1251,7 @@ class npc_melee_hover_disk : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1259,7 +1259,7 @@ class npc_melee_hover_disk : public CreatureScript me->GetMotionMaster()->MovePoint(eventId, MeleeHoverDisksWaypoints[eventId]); } - void DoAction(int32 /*action*/) OVERRIDE + void DoAction(int32 /*action*/) override { if (Vehicle* vehicleTemp = me->GetVehicleKit()) { @@ -1272,7 +1272,7 @@ class npc_melee_hover_disk : public CreatureScript me->DespawnOrUnsummon(3*IN_MILLISECONDS); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -1293,7 +1293,7 @@ class npc_melee_hover_disk : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_melee_hover_diskAI(creature); } @@ -1315,16 +1315,16 @@ class npc_caster_hover_disk : public CreatureScript me->SetSpeed(MOVE_FLIGHT, 0.45f); } - void Reset() OVERRIDE + void Reset() override { VehicleAI::Reset(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { } - void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) override { if (apply) { @@ -1340,7 +1340,7 @@ class npc_caster_hover_disk : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action < ACTION_DELAYED_DESPAWN) { @@ -1375,7 +1375,7 @@ class npc_caster_hover_disk : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_caster_hover_diskAI(creature); } @@ -1393,23 +1393,23 @@ class npc_nexus_lord : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { } - void DoAction(int32 /*action*/) OVERRIDE + void DoAction(int32 /*action*/) override { _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1); _events.ScheduleEvent(EVENT_ARCANE_SHOCK, 2*IN_MILLISECONDS); _events.ScheduleEvent(EVENT_HASTE_BUFF, 12*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1440,7 +1440,7 @@ class npc_nexus_lord : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* malygos = me->GetMap()->GetCreature(_instance->GetData64(DATA_MALYGOS))) malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS) + 1); @@ -1451,7 +1451,7 @@ class npc_nexus_lord : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nexus_lordAI(creature); } @@ -1469,29 +1469,29 @@ class npc_scion_of_eternity : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(14, 29)*IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* /*target*/) OVERRIDE + void AttackStart(Unit* /*target*/) override { } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1507,7 +1507,7 @@ class npc_scion_of_eternity : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* malygos = me->GetMap()->GetCreature(_instance->GetData64(DATA_MALYGOS))) malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS) + 1); @@ -1518,7 +1518,7 @@ class npc_scion_of_eternity : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scion_of_eternityAI(creature); } @@ -1537,7 +1537,7 @@ class npc_arcane_overload : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (Creature* creature = summoner->ToCreature()) { @@ -1546,11 +1546,11 @@ class npc_arcane_overload : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { } - void DoAction(int32 /*action*/) OVERRIDE + void DoAction(int32 /*action*/) override { if (Creature* malygos = me->GetMap()->GetCreature(_instance->GetData64(DATA_MALYGOS))) { @@ -1562,7 +1562,7 @@ class npc_arcane_overload : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ARCANE_BOMB_TRIGGER) { @@ -1576,7 +1576,7 @@ class npc_arcane_overload : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_arcane_overloadAI(creature); } @@ -1594,7 +1594,7 @@ class npc_wyrmrest_skytalon : public CreatureScript { } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { _summoner = NULL; if (Player* player = summoner->ToPlayer()) @@ -1604,7 +1604,7 @@ class npc_wyrmrest_skytalon : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { VehicleAI::UpdateAI(diff); _events.Update(diff); @@ -1620,7 +1620,7 @@ class npc_wyrmrest_skytalon : public CreatureScript } } - void PassengerBoarded(Unit* /*unit*/, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* /*unit*/, int8 /*seat*/, bool apply) override { if (!apply) { @@ -1641,7 +1641,7 @@ class npc_wyrmrest_skytalon : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wyrmrest_skytalonAI(creature); } @@ -1660,14 +1660,14 @@ class npc_static_field : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { // For some great reason the spell doesn't time it... me->DespawnOrUnsummon(30*IN_MILLISECONDS); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_static_fieldAI(creature); } @@ -1682,12 +1682,12 @@ class spell_malygos_portal_beam : public SpellScriptLoader { PrepareAuraScript(spell_malygos_portal_beam_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PORTAL_OPENED)) return false; @@ -1707,14 +1707,14 @@ class spell_malygos_portal_beam : public SpellScriptLoader target->RemoveAura(SPELL_PORTAL_OPENED); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_malygos_portal_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_portal_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_malygos_portal_beam_AuraScript(); } @@ -1729,7 +1729,7 @@ class spell_malygos_random_portal : public SpellScriptLoader { PrepareSpellScript(spell_malygos_random_portal_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1746,13 +1746,13 @@ class spell_malygos_random_portal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_malygos_random_portal_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_malygos_random_portal_SpellScript(); } @@ -1785,12 +1785,12 @@ class spell_malygos_arcane_storm : public SpellScriptLoader { PrepareSpellScript(spell_malygos_arcane_storm_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ARCANE_STORM_EXTRA_VISUAL)) return false; @@ -1823,14 +1823,14 @@ class spell_malygos_arcane_storm : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_ARCANE_STORM_EXTRA_VISUAL, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_arcane_storm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectLaunchTarget += SpellEffectFn(spell_malygos_arcane_storm_SpellScript::HandleVisual, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_malygos_arcane_storm_SpellScript(); } @@ -1845,7 +1845,7 @@ class spell_malygos_vortex_dummy : public SpellScriptLoader { PrepareSpellScript(spell_malygos_vortex_dummy_SpellScript) - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1861,13 +1861,13 @@ class spell_malygos_vortex_dummy : public SpellScriptLoader // the rest of the vortex execution continues when SPELL_VORTEX_2 is removed. } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_malygos_vortex_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_malygos_vortex_dummy_SpellScript(); } @@ -1882,12 +1882,12 @@ class spell_malygos_vortex_visual : public SpellScriptLoader { PrepareAuraScript(spell_malygos_vortex_visual_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_VORTEX_1) || !sSpellMgr->GetSpellInfo(SPELL_VORTEX_6)) return false; @@ -1925,13 +1925,13 @@ class spell_malygos_vortex_visual : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_vortex_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_malygos_vortex_visual_AuraScript(); } @@ -1961,7 +1961,7 @@ class spell_arcane_overload : public SpellScriptLoader { PrepareSpellScript(spell_arcane_overload_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1973,13 +1973,13 @@ class spell_arcane_overload : public SpellScriptLoader GetSpellInfo()->Effects[EFFECT_0].CalcRadius(arcaneOverload) * arcaneOverload->GetObjectScale())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arcane_overload_SpellScript::ResizeEffectRadiusTargetChecker, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_arcane_overload_SpellScript(); } @@ -1994,7 +1994,7 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader { PrepareSpellScript(spell_nexus_lord_align_disk_aggro_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -2006,13 +2006,13 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader target->GetMotionMaster()->MoveChase(caster->GetVictim()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_nexus_lord_align_disk_aggro_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_nexus_lord_align_disk_aggro_SpellScript(); } @@ -2045,7 +2045,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader { PrepareSpellScript(spell_scion_of_eternity_arcane_barrage_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT && GetCaster()->GetInstanceScript() != NULL; } @@ -2107,14 +2107,14 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_scion_of_eternity_arcane_barrage_SpellScript::FilterMeleeHoverDiskPassangers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnHit += SpellHitFn(spell_scion_of_eternity_arcane_barrage_SpellScript::TriggerDamageSpellFromPlayer); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_scion_of_eternity_arcane_barrage_SpellScript(); } @@ -2129,12 +2129,12 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader { PrepareAuraScript(spell_malygos_destroy_platform_channel_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DESTROY_PLATFORM_BOOM_VISUAL)) return false; @@ -2150,13 +2150,13 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader platformTrigger->CastSpell(platformTrigger, SPELL_DESTROY_PLATFORM_BOOM_VISUAL); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_destroy_platform_channel_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_malygos_destroy_platform_channel_AuraScript(); } @@ -2171,12 +2171,12 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL { PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DESTROY_PLATFORM_EVENT)) return false; @@ -2190,13 +2190,13 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL target->CastSpell(target, SPELL_DESTROY_PLATFORM_EVENT); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript(); } @@ -2211,7 +2211,7 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader { PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -2229,14 +2229,14 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SUMMON_RED_DRAGON_BUDDY_F_CAST); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_alexstrasza_bunny_destroy_platform_event_SpellScript(); } @@ -2251,7 +2251,7 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader { PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -2266,13 +2266,13 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript(); } @@ -2287,7 +2287,7 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript { PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -2298,13 +2298,13 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript target->CastSpell(GetCaster(), GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript(); } @@ -2319,12 +2319,12 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade { PrepareSpellScript(spell_malygos_surge_of_power_warning_selector_25_SpellScript) - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SURGE_OF_POWER_PHASE_3_25)) return false; @@ -2363,14 +2363,14 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade GetCaster()->ToCreature()->AI()->DoCastAOE(SPELL_SURGE_OF_POWER_PHASE_3_25); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_surge_of_power_warning_selector_25_SpellScript::SendThreeTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); AfterHit += SpellHitFn(spell_malygos_surge_of_power_warning_selector_25_SpellScript::ExecuteMainSpell); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_malygos_surge_of_power_warning_selector_25_SpellScript(); } @@ -2385,7 +2385,7 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader { PrepareSpellScript(spell_malygos_surge_of_power_25_SpellScript) - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -2415,13 +2415,13 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_surge_of_power_25_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_malygos_surge_of_power_25_SpellScript(); } @@ -2436,12 +2436,12 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader { PrepareAuraScript(spell_alexstrasza_gift_beam_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ALEXSTRASZAS_GIFT_BEAM_VISUAL)) return false; @@ -2461,14 +2461,14 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader target->RemoveAura(SPELL_ALEXSTRASZAS_GIFT_BEAM_VISUAL); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_alexstrasza_gift_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_alexstrasza_gift_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_alexstrasza_gift_beam_AuraScript(); } @@ -2483,7 +2483,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader { PrepareAuraScript(spell_alexstrasza_gift_beam_visual_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -2515,7 +2515,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_alexstrasza_gift_beam_visual_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_alexstrasza_gift_beam_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -2524,7 +2524,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader GameObject* _alexstraszaGift; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_alexstrasza_gift_beam_visual_AuraScript(); } @@ -2535,7 +2535,7 @@ class achievement_denyin_the_scion : public AchievementCriteriaScript public: achievement_denyin_the_scion() : AchievementCriteriaScript("achievement_denyin_the_scion") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { // Only melee disks can be used if (Unit* disk = source->GetVehicleBase()) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 1aaa37337ac..d5d53e49c28 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -29,7 +29,7 @@ class instance_eye_of_eternity : public InstanceMapScript public: instance_eye_of_eternity() : InstanceMapScript("instance_eye_of_eternity", 616) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_eye_of_eternity_InstanceMapScript(map); } @@ -51,7 +51,7 @@ class instance_eye_of_eternity : public InstanceMapScript alexstraszaBunnyGUID = 0; }; - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -100,7 +100,7 @@ class instance_eye_of_eternity : public InstanceMapScript instance->AddToMap(go); } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -136,7 +136,7 @@ class instance_eye_of_eternity : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -158,7 +158,7 @@ class instance_eye_of_eternity : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { if (unit->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -171,7 +171,7 @@ class instance_eye_of_eternity : public InstanceMapScript unit->SetControlled(true, UNIT_STATE_ROOT); } - void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) OVERRIDE + void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override { if (eventId == EVENT_FOCUSING_IRIS) { @@ -245,7 +245,7 @@ class instance_eye_of_eternity : public InstanceMapScript } } - void SetData(uint32 data, uint32 /*value*/) OVERRIDE + void SetData(uint32 data, uint32 /*value*/) override { switch (data) { @@ -261,7 +261,7 @@ class instance_eye_of_eternity : public InstanceMapScript } } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -284,7 +284,7 @@ class instance_eye_of_eternity : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -295,7 +295,7 @@ class instance_eye_of_eternity : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index a603ff0cfe9..8fbb8730c4e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -88,7 +88,7 @@ class boss_anomalus : public CreatureScript uint64 uiChaoticRiftGUID; bool chaosTheory; - void Reset() OVERRIDE + void Reset() override { Phase = 0; uiSparkTimer = 5000; @@ -99,7 +99,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -107,7 +107,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -115,7 +115,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, DONE); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_CHAOS_THEORY) return chaosTheory ? 1 : 0; @@ -123,13 +123,13 @@ class boss_anomalus : public CreatureScript return 0; } - void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) OVERRIDE + void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) override { if (summoned->GetEntry() == NPC_CHAOTIC_RIFT) chaosTheory = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -185,7 +185,7 @@ class boss_anomalus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_anomalusAI(creature); } @@ -209,7 +209,7 @@ class npc_chaotic_rift : public CreatureScript uint32 uiChaoticEnergyBurstTimer; uint32 uiSummonCrazedManaWraithTimer; - void Reset() OVERRIDE + void Reset() override { uiChaoticEnergyBurstTimer = 1000; uiSummonCrazedManaWraithTimer = 5000; @@ -217,7 +217,7 @@ class npc_chaotic_rift : public CreatureScript DoCast(me, SPELL_ARCANEFORM, false); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -253,7 +253,7 @@ class npc_chaotic_rift : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_chaotic_riftAI(creature); } @@ -266,7 +266,7 @@ class achievement_chaos_theory : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index 6f015890e05..e36dd538e3a 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -50,7 +50,7 @@ class boss_commander_kolurg : public CreatureScript public: boss_commander_kolurg() : CreatureScript("boss_commander_kolurg") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_commander_kolurgAI(creature); } @@ -59,12 +59,12 @@ class boss_commander_kolurg : public CreatureScript { boss_commander_kolurgAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { //Return since we have no target if (!UpdateVictim()) @@ -72,7 +72,7 @@ class boss_commander_kolurg : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) override { } }; }; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp index 0947c90f88f..4fcf901e1b2 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp @@ -43,7 +43,7 @@ class boss_commander_stoutbeard : public CreatureScript public: boss_commander_stoutbeard() : CreatureScript("boss_commander_stoutbeard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_commander_stoutbeardAI(creature); } @@ -52,11 +52,11 @@ class boss_commander_stoutbeard : public CreatureScript { boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 57bf69246bd..8ef0d6fb35c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -60,7 +60,7 @@ class boss_keristrasza : public CreatureScript public: boss_keristrasza() : CreatureScript("boss_keristrasza") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_keristraszaAI(creature); } @@ -82,7 +82,7 @@ class boss_keristrasza : public CreatureScript bool intenseCold; bool bEnrage; - void Reset() OVERRIDE + void Reset() override { uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); @@ -100,7 +100,7 @@ class boss_keristrasza : public CreatureScript instance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); @@ -109,7 +109,7 @@ class boss_keristrasza : public CreatureScript instance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -117,7 +117,7 @@ class boss_keristrasza : public CreatureScript instance->SetData(DATA_KERISTRASZA_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } @@ -163,13 +163,13 @@ class boss_keristrasza : public CreatureScript } } - void SetGUID(uint64 guid, int32 id/* = 0 */) OVERRIDE + void SetGUID(uint64 guid, int32 id/* = 0 */) override { if (id == DATA_INTENSE_COLD) intenseColdList.push_back(guid); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -213,7 +213,7 @@ class containment_sphere : public GameObjectScript public: containment_sphere() : GameObjectScript("containment_sphere") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); @@ -250,13 +250,13 @@ class spell_intense_cold : public SpellScriptLoader caster->GetAI()->SetGUID(GetTarget()->GetGUID(), DATA_INTENSE_COLD); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_intense_cold_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_intense_cold_AuraScript(); } @@ -269,7 +269,7 @@ class achievement_intense_cold : public AchievementCriteriaScript { } - bool OnCheck(Player* player, Unit* target) OVERRIDE + bool OnCheck(Player* player, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 31a6bc4d0ff..b66f6a1edc6 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -65,7 +65,7 @@ class boss_magus_telestra : public CreatureScript public: boss_magus_telestra() : CreatureScript("boss_magus_telestra") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_magus_telestraAI(creature); } @@ -98,7 +98,7 @@ class boss_magus_telestra : public CreatureScript uint8 splitPersonality; time_t time[3]; - void Reset() OVERRIDE + void Reset() override { Phase = 0; //These times are probably wrong @@ -124,7 +124,7 @@ class boss_magus_telestra : public CreatureScript instance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -132,7 +132,7 @@ class boss_magus_telestra : public CreatureScript instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -140,12 +140,12 @@ class boss_magus_telestra : public CreatureScript instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_MAGUS_DEAD) { @@ -159,7 +159,7 @@ class boss_magus_telestra : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_SPLIT_PERSONALITY) return splitPersonality; @@ -196,7 +196,7 @@ class boss_magus_telestra : public CreatureScript return 0; } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { if (summon->IsAlive()) return; @@ -218,7 +218,7 @@ class boss_magus_telestra : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -346,7 +346,7 @@ class achievement_split_personality : public AchievementCriteriaScript public: achievement_split_personality() : AchievementCriteriaScript("achievement_split_personality") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index b48e6b630d8..4bff5e9bd4d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -71,7 +71,7 @@ class boss_ormorok : public CreatureScript { boss_ormorokAI(Creature* creature) : BossAI(creature, DATA_ORMOROK_EVENT) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -87,7 +87,7 @@ class boss_ormorok : public CreatureScript instance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!frenzy && HealthBelowPct(25)) { @@ -96,7 +96,7 @@ class boss_ormorok : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -106,12 +106,12 @@ class boss_ormorok : public CreatureScript instance->SetData(DATA_ORMOROK_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -156,7 +156,7 @@ class boss_ormorok : public CreatureScript bool frenzy; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ormorokAI(creature); } @@ -191,7 +191,7 @@ class npc_crystal_spike_trigger : public CreatureScript { npc_crystal_spike_triggerAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* owner) OVERRIDE + void IsSummonedBy(Unit* owner) override { switch (me->GetEntry()) { @@ -215,12 +215,12 @@ class npc_crystal_spike_trigger : public CreatureScript _despawntimer = 2000; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return type == DATA_COUNT ? _count : 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_despawntimer <= diff) { @@ -239,7 +239,7 @@ class npc_crystal_spike_trigger : public CreatureScript uint32 _despawntimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crystal_spike_triggerAI(creature); } @@ -266,13 +266,13 @@ class spell_crystal_spike : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_crystal_spike_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_crystal_spike_AuraScript(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index d4b10eb1c47..0e449d227d5 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -35,7 +35,7 @@ class instance_nexus : public InstanceMapScript public: instance_nexus() : InstanceMapScript("instance_nexus", 576) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_nexus_InstanceMapScript(map); } @@ -55,7 +55,7 @@ class instance_nexus : public InstanceMapScript std::string strInstData; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -66,7 +66,7 @@ class instance_nexus : public InstanceMapScript TelestrasContainmentSphere = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { Map::PlayerList const &players = instance->GetPlayers(); uint32 TeamInInstance = 0; @@ -128,7 +128,7 @@ class instance_nexus : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -156,7 +156,7 @@ class instance_nexus : public InstanceMapScript } } - uint32 GetData(uint32 identifier) const OVERRIDE + uint32 GetData(uint32 identifier) const override { switch (identifier) { @@ -168,7 +168,7 @@ class instance_nexus : public InstanceMapScript return 0; } - void SetData(uint32 identifier, uint32 data) OVERRIDE + void SetData(uint32 identifier, uint32 data) override { switch (identifier) { @@ -223,7 +223,7 @@ class instance_nexus : public InstanceMapScript } } - uint64 GetData64(uint32 uiIdentifier) const OVERRIDE + uint64 GetData64(uint32 uiIdentifier) const override { switch (uiIdentifier) { @@ -236,12 +236,12 @@ class instance_nexus : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { return strInstData; } - void Load(const char *chrIn) OVERRIDE + void Load(const char *chrIn) override { if (!chrIn) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index b52114c55da..8db241e21d1 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -58,7 +58,7 @@ class boss_drakos : public CreatureScript public: boss_drakos() : CreatureScript("boss_drakos") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_drakosAI(creature); } @@ -67,7 +67,7 @@ class boss_drakos : public CreatureScript { boss_drakosAI(Creature* creature) : BossAI(creature, DATA_DRAKOS_EVENT) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -78,13 +78,13 @@ class boss_drakos : public CreatureScript postPull = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -128,7 +128,7 @@ class boss_drakos : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -138,7 +138,7 @@ class boss_drakos : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } @@ -152,7 +152,7 @@ class npc_unstable_sphere : public CreatureScript public: npc_unstable_sphere() : CreatureScript("npc_unstable_sphere") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unstable_sphereAI(creature); } @@ -161,7 +161,7 @@ class npc_unstable_sphere : public CreatureScript { npc_unstable_sphereAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MoveRandom(40.0f); @@ -173,7 +173,7 @@ class npc_unstable_sphere : public CreatureScript deathTimer = 19000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (pulseTimer <= diff) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 6fd6dcf28d5..1d498e6fcd1 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -86,7 +86,7 @@ class boss_eregos : public CreatureScript public: boss_eregos() : CreatureScript("boss_eregos") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_eregosAI(creature); } @@ -95,7 +95,7 @@ class boss_eregos : public CreatureScript { boss_eregosAI(Creature* creature) : BossAI(creature, DATA_EREGOS_EVENT) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase = PHASE_NORMAL; @@ -107,12 +107,12 @@ class boss_eregos : public CreatureScript DoAction(ACTION_SET_NORMAL_EVENTS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -128,7 +128,7 @@ class boss_eregos : public CreatureScript _amberVoid = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -144,7 +144,7 @@ class boss_eregos : public CreatureScript return 0; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_SET_NORMAL_EVENTS) return; @@ -155,7 +155,7 @@ class boss_eregos : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { BossAI::JustSummoned(summon); @@ -167,7 +167,7 @@ class boss_eregos : public CreatureScript summon->GetMotionMaster()->MoveRandom(100.0f); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { if (summon->GetEntry() != NPC_PLANAR_ANOMALY) return; @@ -176,7 +176,7 @@ class boss_eregos : public CreatureScript summon->CastSpell(summon, SPELL_PLANAR_BLAST, true); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!me->GetMap()->IsHeroic()) return; @@ -197,7 +197,7 @@ class boss_eregos : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -236,7 +236,7 @@ class boss_eregos : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -267,13 +267,13 @@ class spell_eregos_planar_shift : public SpellScriptLoader creatureCaster->AI()->DoAction(ACTION_SET_NORMAL_EVENTS); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_eregos_planar_shift_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_eregos_planar_shift_AuraScript(); } @@ -284,7 +284,7 @@ class achievement_gen_eregos_void : public AchievementCriteriaScript public: achievement_gen_eregos_void(char const* name, uint32 data) : AchievementCriteriaScript(name), _data(data) { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetAI()->GetData(_data); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index bd909a9c104..8c43ae8dd2f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -94,7 +94,7 @@ class boss_urom : public CreatureScript public: boss_urom() : CreatureScript("boss_urom") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_uromAI(creature); } @@ -103,7 +103,7 @@ class boss_urom : public CreatureScript { boss_uromAI(Creature* creature) : BossAI(creature, DATA_UROM_EVENT) { } - void Reset() OVERRIDE + void Reset() override { me->CastSpell(me, SPELL_EVOCATE); @@ -129,7 +129,7 @@ class boss_urom : public CreatureScript timeBombTimer = urand(20000, 25000); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -141,7 +141,7 @@ class boss_urom : public CreatureScript instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -237,12 +237,12 @@ class boss_urom : public CreatureScript DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -310,7 +310,7 @@ class boss_urom : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -324,7 +324,7 @@ class boss_urom : public CreatureScript me->DeleteThreatList(); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) override { switch (pSpell->Id) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 06e7f4e89f8..962aa940c09 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -59,7 +59,7 @@ class boss_varos : public CreatureScript public: boss_varos() : CreatureScript("boss_varos") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_varosAI(creature); } @@ -72,7 +72,7 @@ class boss_varos : public CreatureScript DoCast(me, SPELL_CENTRIFUGE_SHIELD); } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -85,7 +85,7 @@ class boss_varos : public CreatureScript coreEnergizeOrientation = 0.0f; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -97,7 +97,7 @@ class boss_varos : public CreatureScript return coreEnergizeOrientation; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -145,7 +145,7 @@ class boss_varos : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -169,7 +169,7 @@ class npc_azure_ring_captain : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { targetGUID = 0; @@ -179,7 +179,7 @@ class npc_azure_ring_captain : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_ICE_BEAM) { @@ -188,7 +188,7 @@ class npc_azure_ring_captain : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -196,7 +196,7 @@ class npc_azure_ring_captain : public CreatureScript DoMeleeAttackIfReady(); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE || id != ACTION_CALL_DRAGON_EVENT) @@ -208,7 +208,7 @@ class npc_azure_ring_captain : public CreatureScript DoCast(target, SPELL_ICE_BEAM); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -235,7 +235,7 @@ class npc_azure_ring_captain : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_ring_captainAI(creature); } @@ -250,7 +250,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader { PrepareAuraScript(spell_varos_centrifuge_shield_AuraScript); - bool Load() OVERRIDE + bool Load() override { Unit* caster = GetCaster(); return (caster && caster->ToCreature()); @@ -279,14 +279,14 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_varos_centrifuge_shield_AuraScript(); } @@ -327,13 +327,13 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_varos_energize_core_area_enemySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_varos_energize_core_area_enemySpellScript(); } @@ -374,13 +374,13 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_varos_energize_core_area_entrySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_varos_energize_core_area_entrySpellScript(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 7208c2a2473..3079be50e8a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -37,7 +37,7 @@ class instance_oculus : public InstanceMapScript public: instance_oculus() : InstanceMapScript("instance_oculus", 578) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_oculus_InstanceMapScript(map); } @@ -46,7 +46,7 @@ class instance_oculus : public InstanceMapScript { instance_oculus_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(MAX_ENCOUNTER); @@ -68,7 +68,7 @@ class instance_oculus : public InstanceMapScript verdisaGUID = 0; } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -84,7 +84,7 @@ class instance_oculus : public InstanceMapScript varos->RemoveAllAuras(); } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE) { @@ -97,7 +97,7 @@ class instance_oculus : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*unit*/, uint32 eventId) OVERRIDE + void ProcessEvent(WorldObject* /*unit*/, uint32 eventId) override { if (eventId != EVENT_CALL_DRAGON) return; @@ -111,7 +111,7 @@ class instance_oculus : public InstanceMapScript drake->AI()->DoAction(ACTION_CALL_DRAGON_EVENT); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -174,7 +174,7 @@ class instance_oculus : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -194,7 +194,7 @@ class instance_oculus : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -239,7 +239,7 @@ class instance_oculus : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -249,7 +249,7 @@ class instance_oculus : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -261,7 +261,7 @@ class instance_oculus : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -309,7 +309,7 @@ class instance_oculus : public InstanceMapScript gwhelp->SetPhaseMask(1, true); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -322,7 +322,7 @@ class instance_oculus : public InstanceMapScript return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 6bab74a23a3..d0da88baebc 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -113,7 +113,7 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript public: npc_verdisa_beglaristrasz_eternos() : CreatureScript("npc_verdisa_beglaristrasz_eternos") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (creature->GetEntry()) @@ -219,7 +219,7 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -240,7 +240,7 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript { npc_verdisa_beglaristrasz_eternosAI(Creature* creature) : ScriptedAI(creature) { } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id) return; @@ -254,7 +254,7 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_verdisa_beglaristrasz_eternosAI(creature); } @@ -269,7 +269,7 @@ class npc_image_belgaristrasz : public CreatureScript { npc_image_belgaristraszAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (summoner->GetEntry() == NPC_VAROS) { @@ -284,7 +284,7 @@ class npc_image_belgaristrasz : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_image_belgaristraszAI(creature); } @@ -317,7 +317,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript bool HealthWarningOff; bool DisableTakeOff; - void Reset() OVERRIDE + void Reset() override { summonerGUID = 0; WelcomeTimer = 4500; @@ -333,7 +333,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript DisableTakeOff = false; } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (instance->GetBossState(DATA_EREGOS_EVENT) == IN_PROGRESS) if (Creature* eregos = me->FindNearestCreature(NPC_EREGOS, 450.0f, true)) @@ -354,13 +354,13 @@ class npc_ruby_emerald_amber_drake : public CreatureScript me->GetMotionMaster()->MovePoint(0, pos); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 0) me->SetDisableGravity(false); // Needed this for proper animation after spawn, the summon in air fall to ground bug leave no other option for now, if this isn't used the drake will only walk on move. } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!(instance->GetBossState(DATA_VAROS_EVENT) == DONE)) { @@ -447,7 +447,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript }; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ruby_emerald_amber_drakeAI(creature); } @@ -472,13 +472,13 @@ class spell_gen_stop_time : public SpellScriptLoader caster->CastSpell(target, SPELL_SHOCK_CHARGE, false); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_gen_stop_time_AuraScript::Apply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_stop_time_AuraScript(); } @@ -510,14 +510,14 @@ class spell_call_ruby_emerald_amber_drake : public SpellScriptLoader const_cast(GetExplTargetDest())->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_call_ruby_emerald_amber_drake_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); OnEffectLaunch += SpellEffectFn(spell_call_ruby_emerald_amber_drake_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_call_ruby_emerald_amber_drake_SpellScript(); } @@ -538,13 +538,13 @@ class spell_oculus_touch_the_nightmare : public SpellScriptLoader SetHitDamage(int32(GetCaster()->CountPctFromMaxHealth(30))); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_oculus_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_oculus_touch_the_nightmare_SpellScript(); } @@ -567,14 +567,14 @@ class spell_oculus_dream_funnel: public SpellScriptLoader canBeRecalculated = false; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_oculus_dream_funnel_AuraScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 281c32060d5..ac18f46aa86 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -99,7 +99,7 @@ class boss_bjarngrim : public CreatureScript public: boss_bjarngrim() : CreatureScript("boss_bjarngrim") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_bjarngrimAI(creature); } @@ -139,7 +139,7 @@ class boss_bjarngrim : public CreatureScript uint64 m_auiStormforgedLieutenantGUID[2]; - void Reset() OVERRIDE + void Reset() override { if (canBuff) if (!me->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE)) @@ -186,7 +186,7 @@ class boss_bjarngrim : public CreatureScript instance->SetBossState(DATA_BJARNGRIM, NOT_STARTED); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (me->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE)) canBuff = true; @@ -196,7 +196,7 @@ class boss_bjarngrim : public CreatureScript ScriptedAI::EnterEvadeMode(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -207,12 +207,12 @@ class boss_bjarngrim : public CreatureScript instance->SetBossState(DATA_BJARNGRIM, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -237,7 +237,7 @@ class boss_bjarngrim : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -390,7 +390,7 @@ class npc_stormforged_lieutenant : public CreatureScript public: npc_stormforged_lieutenant() : CreatureScript("npc_stormforged_lieutenant") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stormforged_lieutenantAI(creature); } @@ -407,13 +407,13 @@ class npc_stormforged_lieutenant : public CreatureScript uint32 m_uiArcWeld_Timer; uint32 m_uiRenewSteel_Timer; - void Reset() OVERRIDE + void Reset() override { m_uiArcWeld_Timer = urand(20000, 21000); m_uiRenewSteel_Timer = urand(10000, 11000); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -425,7 +425,7 @@ class npc_stormforged_lieutenant : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 2aaa7fe1b31..fd36d54a92c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -71,7 +71,7 @@ class boss_ionar : public CreatureScript public: boss_ionar() : CreatureScript("boss_ionar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ionarAI(creature); } @@ -97,7 +97,7 @@ class boss_ionar : public CreatureScript uint32 uiDisperseHealth; - void Reset() OVERRIDE + void Reset() override { lSparkList.DespawnAll(); @@ -120,7 +120,7 @@ class boss_ionar : public CreatureScript instance->SetBossState(DATA_IONAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -128,7 +128,7 @@ class boss_ionar : public CreatureScript instance->SetBossState(DATA_IONAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -138,12 +138,12 @@ class boss_ionar : public CreatureScript instance->SetBossState(DATA_IONAR, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_DISPERSE) { @@ -185,13 +185,13 @@ class boss_ionar : public CreatureScript } } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) override { if (!me->IsVisible()) uiDamage = 0; } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_SPARK_OF_IONAR) { @@ -208,13 +208,13 @@ class boss_ionar : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summoned) OVERRIDE + void SummonedCreatureDespawn(Creature* summoned) override { if (summoned->GetEntry() == NPC_SPARK_OF_IONAR) lSparkList.Despawn(summoned); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -299,7 +299,7 @@ class npc_spark_of_ionar : public CreatureScript public: npc_spark_of_ionar() : CreatureScript("npc_spark_of_ionar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spark_of_ionarAI(creature); } @@ -315,13 +315,13 @@ class npc_spark_of_ionar : public CreatureScript uint32 uiCheckTimer; - void Reset() OVERRIDE + void Reset() override { uiCheckTimer = 2*IN_MILLISECONDS; me->SetReactState(REACT_PASSIVE); } - void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE || !instance) return; @@ -330,12 +330,12 @@ class npc_spark_of_ionar : public CreatureScript me->DespawnOrUnsummon(); } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) override { uiDamage = 0; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { // Despawn if the encounter is not running if (instance && instance->GetBossState(DATA_IONAR) != IN_PROGRESS) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 620a55e9dcb..a0cd3be5e6f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -69,7 +69,7 @@ class boss_loken : public CreatureScript public: boss_loken() : CreatureScript("boss_loken") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lokenAI(creature); } @@ -89,7 +89,7 @@ class boss_loken : public CreatureScript uint32 m_uiHealthAmountModifier; - void Reset() OVERRIDE + void Reset() override { m_uiArcLightning_Timer = 15000; m_uiLightningNova_Timer = 20000; @@ -104,7 +104,7 @@ class boss_loken : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -115,7 +115,7 @@ class boss_loken : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -126,12 +126,12 @@ class boss_loken : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -211,13 +211,13 @@ class spell_loken_pulsing_shockwave : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * distance)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_loken_pulsing_shockwave_SpellScript::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_loken_pulsing_shockwave_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 27b74c49b06..3c2641ff889 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -75,7 +75,7 @@ class boss_volkhan : public CreatureScript public: boss_volkhan() : CreatureScript("boss_volkhan") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_volkhanAI(creature); } @@ -104,7 +104,7 @@ class boss_volkhan : public CreatureScript uint32 m_uiHealthAmountModifier; - void Reset() OVERRIDE + void Reset() override { m_bIsStriking = false; m_bHasTemper = false; @@ -126,7 +126,7 @@ class boss_volkhan : public CreatureScript instance->SetBossState(DATA_VOLKHAN, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -134,7 +134,7 @@ class boss_volkhan : public CreatureScript instance->SetBossState(DATA_VOLKHAN, IN_PROGRESS); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->Attack(who, true)) { @@ -147,7 +147,7 @@ class boss_volkhan : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); DespawnGolem(); @@ -156,7 +156,7 @@ class boss_volkhan : public CreatureScript instance->SetBossState(DATA_VOLKHAN, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } @@ -197,7 +197,7 @@ class boss_volkhan : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_MOLTEN_GOLEM) { @@ -211,7 +211,7 @@ class boss_volkhan : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (m_uiSummonPhase == 2) { @@ -220,7 +220,7 @@ class boss_volkhan : public CreatureScript } } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { if (data == DATA_SHATTER_RESISTANT) return GolemsShattered; @@ -228,7 +228,7 @@ class boss_volkhan : public CreatureScript return 0; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -309,7 +309,7 @@ class boss_volkhan : public CreatureScript case 2: // 2 - Check if reached Anvil - // This is handled in: void JustReachedHome() OVERRIDE + // This is handled in: void JustReachedHome() override break; case 3: @@ -364,7 +364,7 @@ class npc_molten_golem : public CreatureScript public: npc_molten_golem() : CreatureScript("npc_molten_golem") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_molten_golemAI(creature); } @@ -379,7 +379,7 @@ class npc_molten_golem : public CreatureScript uint32 m_uiDeathDelay_Timer; uint32 m_uiImmolation_Timer; - void Reset() OVERRIDE + void Reset() override { m_bIsFrozen = false; @@ -388,7 +388,7 @@ class npc_molten_golem : public CreatureScript m_uiImmolation_Timer = 5000; } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->Attack(who, true)) { @@ -401,7 +401,7 @@ class npc_molten_golem : public CreatureScript } } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) override { if (uiDamage > me->GetHealth()) { @@ -420,7 +420,7 @@ class npc_molten_golem : public CreatureScript } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) override { // This is the dummy effect of the spells if (pSpell->Id == SPELL_SHATTER_N || pSpell->Id == SPELL_SHATTER_H) @@ -428,7 +428,7 @@ class npc_molten_golem : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { // Return since we have no target or if we are frozen if (!UpdateVictim() || m_bIsFrozen) @@ -460,7 +460,7 @@ class achievement_shatter_resistant : public AchievementCriteriaScript public: achievement_shatter_resistant() : AchievementCriteriaScript("achievement_shatter_resistant") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_SHATTER_RESISTANT) < 5; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 4087931a1b6..08ee73eaf5a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -50,7 +50,7 @@ class instance_halls_of_lightning : public InstanceMapScript LokenGlobeGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -71,7 +71,7 @@ class instance_halls_of_lightning : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -88,7 +88,7 @@ class instance_halls_of_lightning : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -102,7 +102,7 @@ class instance_halls_of_lightning : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -121,7 +121,7 @@ class instance_halls_of_lightning : public InstanceMapScript return true; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -139,7 +139,7 @@ class instance_halls_of_lightning : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -150,7 +150,7 @@ class instance_halls_of_lightning : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -191,7 +191,7 @@ class instance_halls_of_lightning : public InstanceMapScript uint64 LokenGlobeGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_halls_of_lightning_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index bf487532576..c733b10d03d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -76,7 +76,7 @@ class boss_krystallus : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { bIsSlam = false; @@ -89,7 +89,7 @@ class boss_krystallus : public CreatureScript if (instance) instance->SetBossState(DATA_KRYSTALLUS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -97,7 +97,7 @@ class boss_krystallus : public CreatureScript instance->SetBossState(DATA_KRYSTALLUS, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -142,7 +142,7 @@ class boss_krystallus : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -150,7 +150,7 @@ class boss_krystallus : public CreatureScript instance->SetBossState(DATA_KRYSTALLUS, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -158,7 +158,7 @@ class boss_krystallus : public CreatureScript Talk(SAY_KILL); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) override { //this part should be in the core if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER) @@ -180,7 +180,7 @@ class boss_krystallus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } @@ -204,13 +204,13 @@ class spell_krystallus_shatter : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_krystallus_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_krystallus_shatter_SpellScript(); } @@ -239,13 +239,13 @@ class spell_krystallus_shatter_effect : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_krystallus_shatter_effect_SpellScript::CalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_krystallus_shatter_effect_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index ccbfd3bbc79..1e929decec5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -73,7 +73,7 @@ class boss_maiden_of_grief : public CreatureScript uint32 ShockOfSorrowTimer; uint32 PillarOfWoeTimer; - void Reset() OVERRIDE + void Reset() override { PartingSorrowTimer = urand(25000, 30000); StormOfGriefTimer = 10000; @@ -87,7 +87,7 @@ class boss_maiden_of_grief : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -98,7 +98,7 @@ class boss_maiden_of_grief : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -144,7 +144,7 @@ class boss_maiden_of_grief : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -152,7 +152,7 @@ class boss_maiden_of_grief : public CreatureScript instance->SetBossState(DATA_MAIDEN_OF_GRIEF, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -161,7 +161,7 @@ class boss_maiden_of_grief : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 98a506eff3c..5691ea94c48 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -81,13 +81,13 @@ class boss_sjonnir : public CreatureScript { boss_sjonnirAI(Creature* creature) : BossAI(creature, DATA_SJONNIR) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); abuseTheOoze = 0; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_SJONNIR, who->ToPlayer())) { @@ -106,7 +106,7 @@ class boss_sjonnir : public CreatureScript events.ScheduleEvent(EVENT_FRENZY, 300000); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->GetMotionMaster()->MovePoint(0, CenterPoint); /*if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -114,25 +114,25 @@ class boss_sjonnir : public CreatureScript summons.Summon(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action == ACTION_OOZE_DEAD) ++abuseTheOoze; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_ABUSE_THE_OOZE) return abuseTheOoze; @@ -140,7 +140,7 @@ class boss_sjonnir : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -201,7 +201,7 @@ class boss_sjonnir : public CreatureScript uint8 abuseTheOoze; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } @@ -216,12 +216,12 @@ class npc_malformed_ooze : public CreatureScript { npc_malformed_oozeAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _mergeTimer = 10000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_mergeTimer <= diff) { @@ -246,7 +246,7 @@ class npc_malformed_ooze : public CreatureScript uint32 _mergeTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } @@ -266,14 +266,14 @@ class npc_iron_sludge : public CreatureScript InstanceScript* instance; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* sjonnir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SJONNIR))) sjonnir->AI()->DoAction(ACTION_OOZE_DEAD); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } @@ -286,7 +286,7 @@ class achievement_abuse_the_ooze : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 7a474d03666..045688d185b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -159,7 +159,7 @@ class npc_tribuna_controller : public CreatureScript std::list KaddrakGUIDList; - void Reset() OVERRIDE + void Reset() override { uiKaddrakEncounterTimer = 1500; uiMarnakEncounterTimer = 10000; @@ -206,7 +206,7 @@ class npc_tribuna_controller : public CreatureScript }*/ } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bKaddrakActivated) { @@ -260,7 +260,7 @@ class npc_tribuna_controller : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } @@ -271,7 +271,7 @@ class npc_brann_hos : public CreatureScript public: npc_brann_hos() : CreatureScript("npc_brann_hos") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1 || action == GOSSIP_ACTION_INFO_DEF+2) @@ -283,7 +283,7 @@ class npc_brann_hos : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -313,7 +313,7 @@ class npc_brann_hos : public CreatureScript bool bIsLowHP; bool brannSparklinNews; - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -344,7 +344,7 @@ class npc_brann_hos : public CreatureScript lDwarfGUIDList.clear(); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -398,7 +398,7 @@ class npc_brann_hos : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { lDwarfGUIDList.push_back(summoned->GetGUID()); summoned->AddThreat(me, 0.0f); @@ -419,13 +419,13 @@ class npc_brann_hos : public CreatureScript Start(); } - void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) override { if (brannSparklinNews) brannSparklinNews = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_BRANN_SPARKLIN_NEWS) return brannSparklinNews ? 1 : 0; @@ -433,7 +433,7 @@ class npc_brann_hos : public CreatureScript return 0; } - void UpdateEscortAI(const uint32 uiDiff) OVERRIDE + void UpdateEscortAI(const uint32 uiDiff) override { if (uiPhaseTimer <= uiDiff) { @@ -737,7 +737,7 @@ class npc_brann_hos : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetHallsOfStoneAI(creature); } @@ -750,7 +750,7 @@ class achievement_brann_spankin_new : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 427aefe0880..03590b162f1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -59,7 +59,7 @@ class instance_halls_of_stone : public InstanceMapScript MarnakGoGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -89,7 +89,7 @@ class instance_halls_of_stone : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -122,7 +122,7 @@ class instance_halls_of_stone : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -134,7 +134,7 @@ class instance_halls_of_stone : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -167,7 +167,7 @@ class instance_halls_of_stone : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -188,7 +188,7 @@ class instance_halls_of_stone : public InstanceMapScript return true; } - bool CheckRequiredBosses(uint32 bossId, Player const* player /*= NULL*/) const OVERRIDE + bool CheckRequiredBosses(uint32 bossId, Player const* player /*= NULL*/) const override { if (player && player->GetSession()->HasPermission(rbac::RBAC_PERM_SKIP_CHECK_INSTANCE_REQUIRED_BOSSES)) return true; @@ -206,7 +206,7 @@ class instance_halls_of_stone : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -217,7 +217,7 @@ class instance_halls_of_stone : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -267,7 +267,7 @@ class instance_halls_of_stone : public InstanceMapScript uint64 MarnakGoGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_halls_of_stone_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index a32dde306e7..87001bf715d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -308,7 +308,7 @@ class boss_algalon_the_observer : public CreatureScript _fedOnTears = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -317,7 +317,7 @@ class boss_algalon_the_observer : public CreatureScript _hasYelled = false; } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_UNIT) { @@ -331,7 +331,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -378,12 +378,12 @@ class boss_algalon_the_observer : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; } - void EnterCombat(Unit* /*target*/) OVERRIDE + void EnterCombat(Unit* /*target*/) override { uint32 introDelay = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC); @@ -425,7 +425,7 @@ class boss_algalon_the_observer : public CreatureScript (*itr)->m_Events.KillAllEvents(true); } - void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE + void MovementInform(uint32 movementType, uint32 pointId) override { if (movementType != POINT_MOTION_TYPE) return; @@ -447,7 +447,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); switch (summon->GetEntry()) @@ -489,7 +489,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { instance->SetBossState(BOSS_ALGALON, FAIL); BossAI::EnterEvadeMode(); @@ -497,7 +497,7 @@ class boss_algalon_the_observer : public CreatureScript me->SetSheath(SHEATH_STATE_UNARMED); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (_fightWon) { @@ -540,7 +540,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!(events.IsInPhase(PHASE_ROLE_PLAY) || events.IsInPhase(PHASE_BIG_BANG)) && !UpdateVictim()) || !CheckInRoom()) return; @@ -704,7 +704,7 @@ class boss_algalon_the_observer : public CreatureScript bool _hasYelled; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -721,19 +721,19 @@ class npc_living_constellation : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 2500); _isActive = false; } - uint32 GetData(uint32 /*type*/) const OVERRIDE + uint32 GetData(uint32 /*type*/) const override { return _isActive ? 1 : 0; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -758,7 +758,7 @@ class npc_living_constellation : public CreatureScript } } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != SPELL_CONSTELLATION_PHASE_EFFECT || caster->GetTypeId() != TypeID::TYPEID_UNIT) return; @@ -770,7 +770,7 @@ class npc_living_constellation : public CreatureScript caster->ToCreature()->DespawnOrUnsummon(1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!(_events.IsInPhase(PHASE_ROLE_PLAY) || _events.IsInPhase(PHASE_BIG_BANG)) && !UpdateVictim()) return; @@ -797,7 +797,7 @@ class npc_living_constellation : public CreatureScript bool _isActive; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -815,7 +815,7 @@ class npc_collapsing_star : public CreatureScript _dying = false; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() != NPC_BLACK_HOLE) return; @@ -827,7 +827,7 @@ class npc_collapsing_star : public CreatureScript me->DespawnOrUnsummon(1); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (_dying) { @@ -847,7 +847,7 @@ class npc_collapsing_star : public CreatureScript bool _dying; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -864,7 +864,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript { } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -886,7 +886,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript } } - void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE + void MovementInform(uint32 movementType, uint32 pointId) override { if (movementType != POINT_MOTION_TYPE) return; @@ -915,7 +915,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript _events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, delay); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { UpdateVictim(); @@ -951,7 +951,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript uint32 _currentPoint; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -968,7 +968,7 @@ class go_celestial_planetarium_access : public GameObjectScript { } - bool GossipHello(Player* player) OVERRIDE + bool GossipHello(Player* player) override { bool hasKey = true; if (LockEntry const* lock = sLockStore.LookupEntry(go->GetGOInfo()->goober.lockId)) @@ -1009,7 +1009,7 @@ class go_celestial_planetarium_access : public GameObjectScript return false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_events.Empty()) return; @@ -1030,7 +1030,7 @@ class go_celestial_planetarium_access : public GameObjectScript EventMap _events; }; - GameObjectAI* GetAI(GameObject* go) const OVERRIDE + GameObjectAI* GetAI(GameObject* go) const override { return GetUlduarAI(go); } @@ -1061,14 +1061,14 @@ class spell_algalon_phase_punch : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(PhasePunchAlphaId[GetStackAmount() - 1]); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_phase_punch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectRemove += AuraEffectRemoveFn(spell_algalon_phase_punch_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_algalon_phase_punch_AuraScript(); } @@ -1104,13 +1104,13 @@ class spell_algalon_arcane_barrage : public SpellScriptLoader targets.remove_if(NotVictimFilter(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_arcane_barrage_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_algalon_arcane_barrage_SpellScript(); } @@ -1149,13 +1149,13 @@ class spell_algalon_trigger_3_adds : public SpellScriptLoader target->AI()->DoAction(ACTION_ACTIVATE_STAR); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_trigger_3_adds_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_algalon_trigger_3_adds_SpellScript(); } @@ -1176,13 +1176,13 @@ class spell_algalon_collapse : public SpellScriptLoader GetTarget()->DealDamage(GetTarget(), GetTarget()->CountPctFromMaxHealth(1), NULL, NODAMAGE); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_collapse_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_algalon_collapse_AuraScript(); } @@ -1197,7 +1197,7 @@ class spell_algalon_big_bang : public SpellScriptLoader { PrepareSpellScript(spell_algalon_big_bang_SpellScript); - bool Load() OVERRIDE + bool Load() override { _targetCount = 0; return true; @@ -1214,7 +1214,7 @@ class spell_algalon_big_bang : public SpellScriptLoader GetCaster()->GetAI()->DoAction(ACTION_ASCEND); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_big_bang_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); AfterCast += SpellCastFn(spell_algalon_big_bang_SpellScript::CheckTargets); @@ -1223,7 +1223,7 @@ class spell_algalon_big_bang : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_algalon_big_bang_SpellScript(); } @@ -1244,13 +1244,13 @@ class spell_algalon_remove_phase : public SpellScriptLoader GetTarget()->RemoveAurasByType(SPELL_AURA_PHASE); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_remove_phase_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_algalon_remove_phase_AuraScript(); } @@ -1272,13 +1272,13 @@ class spell_algalon_cosmic_smash : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectLaunch += SpellEffectFn(spell_algalon_cosmic_smash_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_algalon_cosmic_smash_SpellScript(); } @@ -1303,13 +1303,13 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader SetHitDamage(int32(float(GetHitDamage()) / distance) * 2); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_algalon_cosmic_smash_damage_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_algalon_cosmic_smash_damage_SpellScript(); } @@ -1332,13 +1332,13 @@ class spell_algalon_supermassive_fail : public SpellScriptLoader GetHitPlayer()->ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, ACHIEVEMENT_CRITERIA_CONDITION_NO_SPELL_HIT, GetSpellInfo()->Id, true); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_algalon_supermassive_fail_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_algalon_supermassive_fail_SpellScript(); } @@ -1349,7 +1349,7 @@ class achievement_he_feeds_on_your_tears : public AchievementCriteriaScript public: achievement_he_feeds_on_your_tears() : AchievementCriteriaScript("achievement_he_feeds_on_your_tears") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return !target->GetAI()->GetData(DATA_HAS_FED_ON_TEARS); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 5549ae6e584..348b549e4a8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -146,14 +146,14 @@ class boss_steelbreaker : public CreatureScript uint32 phase; - void Reset() OVERRIDE + void Reset() override { _Reset(); phase = 0; me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_STEELBREAKER_AGGRO); @@ -163,7 +163,7 @@ class boss_steelbreaker : public CreatureScript events.ScheduleEvent(EVENT_FUSION_PUNCH, 15000); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_PHASE_3) return (phase >= 3) ? 1 : 0; @@ -171,7 +171,7 @@ class boss_steelbreaker : public CreatureScript return 0; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -191,7 +191,7 @@ class boss_steelbreaker : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -216,7 +216,7 @@ class boss_steelbreaker : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_STEELBREAKER_SLAY); @@ -225,7 +225,7 @@ class boss_steelbreaker : public CreatureScript DoCast(me, SPELL_ELECTRICAL_CHARGE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -266,7 +266,7 @@ class boss_steelbreaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -283,14 +283,14 @@ class boss_runemaster_molgeim : public CreatureScript uint32 phase; - void Reset() OVERRIDE + void Reset() override { _Reset(); phase = 0; me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_MOLGEIM_AGGRO); @@ -300,7 +300,7 @@ class boss_runemaster_molgeim : public CreatureScript events.ScheduleEvent(EVENT_RUNE_OF_POWER, 20000); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_PHASE_3) return (phase >= 3) ? 1 : 0; @@ -308,7 +308,7 @@ class boss_runemaster_molgeim : public CreatureScript return 0; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -328,7 +328,7 @@ class boss_runemaster_molgeim : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -353,13 +353,13 @@ class boss_runemaster_molgeim : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_MOLGEIM_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -423,7 +423,7 @@ class boss_runemaster_molgeim : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -440,7 +440,7 @@ class boss_stormcaller_brundir : public CreatureScript uint32 phase; - void Reset() OVERRIDE + void Reset() override { _Reset(); phase = 0; @@ -450,7 +450,7 @@ class boss_stormcaller_brundir : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, false); // Reset immumity, Brundir should be stunnable by default } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_PHASE_3) return (phase >= 3) ? 1 : 0; @@ -458,7 +458,7 @@ class boss_stormcaller_brundir : public CreatureScript return 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_BRUNDIR_AGGRO); @@ -469,7 +469,7 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 120000)); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -493,7 +493,7 @@ class boss_stormcaller_brundir : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); @@ -522,13 +522,13 @@ class boss_stormcaller_brundir : public CreatureScript me->GetMotionMaster()->MoveFall(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_BRUNDIR_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -623,7 +623,7 @@ class boss_stormcaller_brundir : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -645,13 +645,13 @@ class spell_shield_of_runes : public SpellScriptLoader caster->CastSpell(caster, SPELL_SHIELD_OF_RUNES_BUFF, false); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_shield_of_runes_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_shield_of_runes_AuraScript(); } @@ -673,13 +673,13 @@ class spell_assembly_meltdown : public SpellScriptLoader Steelbreaker->AI()->DoAction(ACTION_ADD_CHARGE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_assembly_meltdown_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_assembly_meltdown_SpellScript(); } @@ -694,7 +694,7 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader { PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RUNE_OF_SUMMONING_SUMMON)) return false; @@ -713,14 +713,14 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader summ->DespawnOrUnsummon(1); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_assembly_rune_of_summoning_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectRemove += AuraEffectRemoveFn(spell_assembly_rune_of_summoning_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_assembly_rune_of_summoning_AuraScript(); } @@ -731,7 +731,7 @@ class achievement_assembly_i_choose_you : public AchievementCriteriaScript public: achievement_assembly_i_choose_you() : AchievementCriteriaScript("achievement_assembly_i_choose_you") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_PHASE_3); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index fef92443246..847217fa8d5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -112,7 +112,7 @@ class boss_auriaya : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); DefenderGUID = 0; @@ -121,7 +121,7 @@ class boss_auriaya : public CreatureScript nineLives = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -134,13 +134,13 @@ class boss_auriaya : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summons.Summon(summoned); @@ -161,7 +161,7 @@ class boss_auriaya : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -182,7 +182,7 @@ class boss_auriaya : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -195,7 +195,7 @@ class boss_auriaya : public CreatureScript return 0; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { switch (id) { @@ -208,13 +208,13 @@ class boss_auriaya : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -282,7 +282,7 @@ class boss_auriaya : public CreatureScript bool nineLives; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -300,13 +300,13 @@ class npc_auriaya_seeping_trigger : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->DespawnOrUnsummon(600000); DoCast(me, SPELL_SEEPING_ESSENCE); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (instance->GetBossState(BOSS_AURIAYA) != IN_PROGRESS) me->DespawnOrUnsummon(); @@ -316,7 +316,7 @@ class npc_auriaya_seeping_trigger : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_auriaya_seeping_triggerAI(creature); } @@ -334,18 +334,18 @@ class npc_sanctum_sentry : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_RIP, urand(4000, 8000)); events.ScheduleEvent(EVENT_POUNCE, urand(12000, 15000)); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_STRENGHT_PACK, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -380,7 +380,7 @@ class npc_sanctum_sentry : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA))) Auriaya->AI()->DoAction(ACTION_CRAZY_CAT_LADY); @@ -391,7 +391,7 @@ class npc_sanctum_sentry : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sanctum_sentryAI(creature); } @@ -409,13 +409,13 @@ class npc_feral_defender : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_FERAL_POUNCE, 5000); events.ScheduleEvent(EVENT_RUSH, 10000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -455,7 +455,7 @@ class npc_feral_defender : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_SUMMON_ESSENCE); if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA))) @@ -467,7 +467,7 @@ class npc_feral_defender : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_feral_defenderAI(creature); } @@ -499,13 +499,13 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader unitList.remove_if(SanctumSentryCheck()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_strenght_of_the_pack_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_auriaya_strenght_of_the_pack_SpellScript(); } @@ -525,14 +525,14 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader unitList.remove_if(PlayerOrPetCheck()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_auriaya_sentinel_blast_SpellScript(); } @@ -545,7 +545,7 @@ class achievement_nine_lives : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; @@ -565,7 +565,7 @@ class achievement_crazy_cat_lady : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 918da83843a..c567e7f13d7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -230,7 +230,7 @@ class boss_flame_leviathan : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { ASSERT(vehicle); if (!me->isDead()) @@ -263,7 +263,7 @@ class boss_flame_leviathan : public CreatureScript bool Shutout; bool Unbroken; - void Reset() OVERRIDE + void Reset() override { _Reset(); //resets shutdown counter to 0. 2 or 4 depending on raid mode @@ -273,7 +273,7 @@ class boss_flame_leviathan : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); me->SetReactState(REACT_PASSIVE); @@ -323,7 +323,7 @@ class boss_flame_leviathan : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); // Set Field Flags 67108928 = 64 | 67108864 = UNIT_FLAG_UNK_6 | UNIT_FLAG_SKINNABLE @@ -332,7 +332,7 @@ class boss_flame_leviathan : public CreatureScript Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_START_THE_ENGINE) vehicle->InstallAllAccessories(false); @@ -344,7 +344,7 @@ class boss_flame_leviathan : public CreatureScript ++Shutdown; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -362,13 +362,13 @@ class boss_flame_leviathan : public CreatureScript return 0; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { if (id == DATA_UNBROKEN) Unbroken = data ? true : false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -467,13 +467,13 @@ class boss_flame_leviathan : public CreatureScript DoBatteringRamIfReady(); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_PURSUED) _pursueTarget = target->GetGUID(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action && action <= 4) // Tower destruction, debuff leviathan loot and reduce active tower count { @@ -555,7 +555,7 @@ class boss_flame_leviathan : public CreatureScript uint64 _pursueTarget; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -579,7 +579,7 @@ class boss_flame_leviathan_seat : public CreatureScript InstanceScript* instance; Vehicle* vehicle; - void PassengerBoarded(Unit* who, int8 seatId, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 seatId, bool apply) override { if (!me->GetVehicle()) return; @@ -619,7 +619,7 @@ class boss_flame_leviathan_seat : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_flame_leviathan_seatAI(creature); } @@ -638,13 +638,13 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript uint32 NapalmTimer; - void Reset() OVERRIDE + void Reset() override { NapalmTimer = 5*IN_MILLISECONDS; DoCast(me, AURA_STEALTH_DETECTION); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -661,7 +661,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript NapalmTimer -= diff; } - bool CanAIAttack(Unit const* who) const OVERRIDE + bool CanAIAttack(Unit const* who) const override { if (who->GetTypeId() != TypeID::TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() == NPC_SEAT) return false; @@ -669,7 +669,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_flame_leviathan_defense_cannonAI(creature); } @@ -684,13 +684,13 @@ class boss_flame_leviathan_defense_turret : public CreatureScript { boss_flame_leviathan_defense_turretAI(Creature* creature) : TurretAI(creature) { } - void DamageTaken(Unit* who, uint32 &damage) OVERRIDE + void DamageTaken(Unit* who, uint32 &damage) override { if (!CanAIAttack(who)) damage = 0; } - bool CanAIAttack(Unit const* who) const OVERRIDE + bool CanAIAttack(Unit const* who) const override { if (who->GetTypeId() != TypeID::TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() != NPC_SEAT) return false; @@ -698,7 +698,7 @@ class boss_flame_leviathan_defense_turret : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_flame_leviathan_defense_turretAI(creature); } @@ -715,7 +715,7 @@ class boss_flame_leviathan_overload_device : public CreatureScript { } - void OnSpellClick(Unit* /*clicker*/, bool& result) OVERRIDE + void OnSpellClick(Unit* /*clicker*/, bool& result) override { if (!result) return; @@ -735,7 +735,7 @@ class boss_flame_leviathan_overload_device : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_flame_leviathan_overload_deviceAI(creature); } @@ -752,7 +752,7 @@ class boss_flame_leviathan_safety_container : public CreatureScript { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { float x, y, z; me->GetPosition(x, y, z); @@ -761,12 +761,12 @@ class boss_flame_leviathan_safety_container : public CreatureScript me->SetPosition(x, y, z, 0); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_flame_leviathan_safety_containerAI(creature); } @@ -786,13 +786,13 @@ class npc_mechanolift : public CreatureScript uint32 MoveTimer; - void Reset() OVERRIDE + void Reset() override { MoveTimer = 0; me->GetMotionMaster()->MoveRandom(50); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->GetMotionMaster()->MoveTargetedHome(); DoCast(SPELL_DUSTY_EXPLOSION); @@ -804,14 +804,14 @@ class npc_mechanolift : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) if (Creature* container = me->FindNearestCreature(NPC_CONTAINER, 5, true)) container->EnterVehicle(me); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (MoveTimer <= diff) { @@ -829,7 +829,7 @@ class npc_mechanolift : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mechanoliftAI(creature); } @@ -849,21 +849,21 @@ class npc_pool_of_tar : public CreatureScript me->CastSpell(me, SPELL_TAR_PASSIVE, true); } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { damage = 0; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE)) me->CastSpell(me, SPELL_BLAZE, true); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pool_of_tarAI(creature); } @@ -883,13 +883,13 @@ class npc_colossus : public CreatureScript InstanceScript* instance; - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (me->GetHomePosition().IsInDist(&Center, 50.f)) instance->SetData(DATA_COLOSSUS, instance->GetData(DATA_COLOSSUS)+1); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -898,7 +898,7 @@ class npc_colossus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_colossusAI(creature); } @@ -917,7 +917,7 @@ class npc_thorims_hammer : public CreatureScript me->CastSpell(me, AURA_DUMMY_BLUE, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 10, false)) @@ -927,7 +927,7 @@ class npc_thorims_hammer : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!me->HasAura(AURA_DUMMY_BLUE)) me->CastSpell(me, AURA_DUMMY_BLUE, true); @@ -936,7 +936,7 @@ class npc_thorims_hammer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_thorims_hammerAI(creature); } @@ -947,7 +947,7 @@ class npc_mimirons_inferno : public CreatureScript public: npc_mimirons_inferno() : CreatureScript("npc_mimirons_inferno") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mimirons_infernoAI(creature); } @@ -961,16 +961,16 @@ class npc_mimirons_inferno : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } + void WaypointReached(uint32 /*waypointId*/) override { } - void Reset() OVERRIDE + void Reset() override { infernoTimer = 2000; } uint32 infernoTimer; - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -1009,7 +1009,7 @@ class npc_hodirs_fury : public CreatureScript me->CastSpell(me, AURA_DUMMY_GREEN, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 5, false)) @@ -1019,7 +1019,7 @@ class npc_hodirs_fury : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!me->HasAura(AURA_DUMMY_GREEN)) me->CastSpell(me, AURA_DUMMY_GREEN, true); @@ -1028,7 +1028,7 @@ class npc_hodirs_fury : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hodirs_furyAI(creature); } @@ -1048,12 +1048,12 @@ class npc_freyas_ward : public CreatureScript uint32 summonTimer; - void Reset() OVERRIDE + void Reset() override { summonTimer = 5000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (summonTimer <= diff) { @@ -1071,7 +1071,7 @@ class npc_freyas_ward : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_freyas_wardAI(creature); } @@ -1091,12 +1091,12 @@ class npc_freya_ward_summon : public CreatureScript uint32 lashTimer; - void Reset() OVERRIDE + void Reset() override { lashTimer = 5000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1113,7 +1113,7 @@ class npc_freya_ward_summon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_freya_ward_summonAI(creature); } @@ -1134,7 +1134,7 @@ class npc_lorekeeper : public CreatureScript { } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { // Start encounter if (action == ACTION_SPAWN_VEHICLES) @@ -1150,7 +1150,7 @@ class npc_lorekeeper : public CreatureScript } }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->CLOSE_GOSSIP_MENU(); InstanceScript* instance = creature->GetInstanceScript(); @@ -1187,7 +1187,7 @@ class npc_lorekeeper : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetData(BOSS_LEVIATHAN) !=DONE && player) @@ -1200,7 +1200,7 @@ class npc_lorekeeper : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lorekeeperAI(creature); } @@ -1217,7 +1217,7 @@ class npc_brann_bronzebeard : public CreatureScript public: npc_brann_bronzebeard() : CreatureScript("npc_brann_bronzebeard") { } - //bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + //bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override //{ // player->PlayerTalkClass->ClearMenus(); // switch (action) @@ -1240,7 +1240,7 @@ class npc_brann_bronzebeard : public CreatureScript // } // return true; //} - //bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + //bool OnGossipHello(Player* player, Creature* creature) override //{ // InstanceScript* instance = creature->GetInstanceScript(); // if (instance && instance->GetData(BOSS_LEVIATHAN) !=DONE) @@ -1261,7 +1261,7 @@ class go_ulduar_tower : public GameObjectScript public: go_ulduar_tower() : GameObjectScript("go_ulduar_tower") { } - void OnDestroyed(GameObject* go, Player* /*player*/) OVERRIDE + void OnDestroyed(GameObject* go, Player* /*player*/) override { InstanceScript* instance = go->GetInstanceScript(); if (!instance) @@ -1294,7 +1294,7 @@ class achievement_three_car_garage_demolisher : public AchievementCriteriaScript public: achievement_three_car_garage_demolisher() : AchievementCriteriaScript("achievement_three_car_garage_demolisher") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -1311,7 +1311,7 @@ class achievement_three_car_garage_chopper : public AchievementCriteriaScript public: achievement_three_car_garage_chopper() : AchievementCriteriaScript("achievement_three_car_garage_chopper") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -1328,7 +1328,7 @@ class achievement_three_car_garage_siege : public AchievementCriteriaScript public: achievement_three_car_garage_siege() : AchievementCriteriaScript("achievement_three_car_garage_siege") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -1345,7 +1345,7 @@ class achievement_shutout : public AchievementCriteriaScript public: achievement_shutout() : AchievementCriteriaScript("achievement_shutout") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target) if (Creature* leviathan = target->ToCreature()) @@ -1361,7 +1361,7 @@ class achievement_unbroken : public AchievementCriteriaScript public: achievement_unbroken() : AchievementCriteriaScript("achievement_unbroken") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target) if (InstanceScript* instance = target->GetInstanceScript()) @@ -1376,7 +1376,7 @@ class achievement_orbital_bombardment : public AchievementCriteriaScript public: achievement_orbital_bombardment() : AchievementCriteriaScript("achievement_orbital_bombardment") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; @@ -1394,7 +1394,7 @@ class achievement_orbital_devastation : public AchievementCriteriaScript public: achievement_orbital_devastation() : AchievementCriteriaScript("achievement_orbital_devastation") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; @@ -1412,7 +1412,7 @@ class achievement_nuked_from_orbit : public AchievementCriteriaScript public: achievement_nuked_from_orbit() : AchievementCriteriaScript("achievement_nuked_from_orbit") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; @@ -1430,7 +1430,7 @@ class achievement_orbit_uary : public AchievementCriteriaScript public: achievement_orbit_uary() : AchievementCriteriaScript("achievement_orbit_uary") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; @@ -1475,14 +1475,14 @@ class spell_load_into_catapult : public SpellScriptLoader owner->RemoveAurasDueToSpell(SPELL_PASSENGER_LOADED); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_load_into_catapult_AuraScript::OnApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_load_into_catapult_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_load_into_catapult_AuraScript(); } @@ -1541,14 +1541,14 @@ class spell_auto_repair : public SpellScriptLoader instance->SetData(DATA_UNBROKEN, 0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_auto_repair_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); BeforeHit += SpellHitFn(spell_auto_repair_SpellScript::CheckCooldownForTarget); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_auto_repair_SpellScript(); } @@ -1584,14 +1584,14 @@ class spell_systems_shutdown : public SpellScriptLoader owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_systems_shutdown_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_systems_shutdown_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_systems_shutdown_AuraScript(); } @@ -1649,7 +1649,7 @@ class spell_pursue : public SpellScriptLoader { PrepareSpellScript(spell_pursue_SpellScript); - bool Load() OVERRIDE + bool Load() override { _target = NULL; return true; @@ -1696,7 +1696,7 @@ class spell_pursue : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pursue_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pursue_SpellScript::FilterTargetsSubsequently, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -1706,7 +1706,7 @@ class spell_pursue : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pursue_SpellScript(); } @@ -1765,13 +1765,13 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_vehicle_throw_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_vehicle_throw_passenger_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 60b02e386be..db19d773c9c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -232,7 +232,7 @@ class npc_iron_roots : public CreatureScript summonerGUID = 0; } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (summoner->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -242,7 +242,7 @@ class npc_iron_roots : public CreatureScript me->SetInCombatWith(summoner); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* target = ObjectAccessor::GetPlayer(*me, summonerGUID)) { @@ -257,7 +257,7 @@ class npc_iron_roots : public CreatureScript uint64 summonerGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_iron_rootsAI(creature); } @@ -287,7 +287,7 @@ class boss_freya : public CreatureScript bool trioDefeated[2]; bool random[3]; - void Reset() OVERRIDE + void Reset() override { _Reset(); trioWaveCount = 0; @@ -310,13 +310,13 @@ class boss_freya : public CreatureScript random[n] = false; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void DamageTaken(Unit* who, uint32& damage) OVERRIDE + void DamageTaken(Unit* who, uint32& damage) override { if (damage >= me->GetHealth()) { @@ -325,7 +325,7 @@ class boss_freya : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); DoZoneInCombat(); @@ -376,7 +376,7 @@ class boss_freya : public CreatureScript events.ScheduleEvent(EVENT_SUNBEAM, urand(5000, 15000)); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -389,7 +389,7 @@ class boss_freya : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -581,7 +581,7 @@ class boss_freya : public CreatureScript waveCount++; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //! Freya's chest is dynamically spawned on death by different spells. const uint32 summonSpell[2][4] = @@ -619,7 +619,7 @@ class boss_freya : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -648,7 +648,7 @@ class boss_freya : public CreatureScript } } - void SummonedCreatureDies(Creature* summoned, Unit* who) OVERRIDE + void SummonedCreatureDies(Creature* summoned, Unit* who) override { switch (summoned->GetEntry()) { @@ -667,7 +667,7 @@ class boss_freya : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -684,7 +684,7 @@ class boss_elder_brightleaf : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); if (me->HasAura(SPELL_DRAINED_OF_POWER)) @@ -696,13 +696,13 @@ class boss_elder_brightleaf : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_ELDER_SLAY); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { _JustDied(); Talk(SAY_ELDER_DEATH); @@ -717,14 +717,14 @@ class boss_elder_brightleaf : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -767,7 +767,7 @@ class boss_elder_brightleaf : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -788,7 +788,7 @@ class boss_elder_brightleaf : public CreatureScript bool lumberjack; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -805,7 +805,7 @@ class boss_elder_stonebark : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); if (me->HasAura(SPELL_DRAINED_OF_POWER)) @@ -817,13 +817,13 @@ class boss_elder_stonebark : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_ELDER_SLAY); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { _JustDied(); Talk(SAY_ELDER_DEATH); @@ -838,14 +838,14 @@ class boss_elder_stonebark : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } - void DamageTaken(Unit* who, uint32& damage) OVERRIDE + void DamageTaken(Unit* who, uint32& damage) override { if (who == me) return; @@ -858,7 +858,7 @@ class boss_elder_stonebark : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -894,7 +894,7 @@ class boss_elder_stonebark : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -915,7 +915,7 @@ class boss_elder_stonebark : public CreatureScript bool lumberjack; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -932,7 +932,7 @@ class boss_elder_ironbranch : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); if (me->HasAura(SPELL_DRAINED_OF_POWER)) @@ -944,13 +944,13 @@ class boss_elder_ironbranch : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_ELDER_SLAY); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { _JustDied(); Talk(SAY_ELDER_DEATH); @@ -965,14 +965,14 @@ class boss_elder_ironbranch : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -1008,7 +1008,7 @@ class boss_elder_ironbranch : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -1029,7 +1029,7 @@ class boss_elder_ironbranch : public CreatureScript bool lumberjack; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1047,13 +1047,13 @@ class npc_detonating_lasher : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); } - void Reset() OVERRIDE + void Reset() override { lashTimer = 5000; changeTargetTimer = 7500; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1087,7 +1087,7 @@ class npc_detonating_lasher : public CreatureScript uint32 changeTargetTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_detonating_lasherAI(creature); } @@ -1107,12 +1107,12 @@ class npc_ancient_water_spirit : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void Reset() OVERRIDE + void Reset() override { tidalWaveTimer = 10000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1132,7 +1132,7 @@ class npc_ancient_water_spirit : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_FREYA))) { @@ -1147,7 +1147,7 @@ class npc_ancient_water_spirit : public CreatureScript uint8 waveCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ancient_water_spiritAI(creature); } @@ -1167,13 +1167,13 @@ class npc_storm_lasher : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void Reset() OVERRIDE + void Reset() override { lightningLashTimer = 10000; stormboltTimer = 5000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1198,7 +1198,7 @@ class npc_storm_lasher : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_FREYA))) { @@ -1214,7 +1214,7 @@ class npc_storm_lasher : public CreatureScript uint8 waveCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_storm_lasherAI(creature); } @@ -1234,7 +1234,7 @@ class npc_snaplasher : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -1245,7 +1245,7 @@ class npc_snaplasher : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_FREYA))) { @@ -1259,7 +1259,7 @@ class npc_snaplasher : public CreatureScript uint8 waveCount; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_snaplasherAI(creature); } @@ -1276,7 +1276,7 @@ class npc_ancient_conservator : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { natureFuryTimer = 7500; healthySporeTimer = 3500; @@ -1294,12 +1294,12 @@ class npc_ancient_conservator : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoCast(who, SPELL_CONSERVATOR_GRIP, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1330,7 +1330,7 @@ class npc_ancient_conservator : public CreatureScript uint32 healthySporeTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ancient_conservatorAI(creature); } @@ -1352,7 +1352,7 @@ class npc_sun_beam : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sun_beamAI(creature); } @@ -1376,7 +1376,7 @@ class npc_healthy_spore : public CreatureScript lifeTimer = urand(22000, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (lifeTimer <= diff) { @@ -1392,7 +1392,7 @@ class npc_healthy_spore : public CreatureScript uint32 lifeTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_healthy_sporeAI(creature); } @@ -1415,7 +1415,7 @@ class npc_eonars_gift : public CreatureScript DoCast(me, SPELL_EONAR_VISUAL, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (lifeBindersGiftTimer <= diff) { @@ -1432,7 +1432,7 @@ class npc_eonars_gift : public CreatureScript uint32 lifeBindersGiftTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_eonars_giftAI(creature); } @@ -1453,7 +1453,7 @@ class npc_nature_bomb : public CreatureScript DoCast(SPELL_OBJECT_BOMB); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bombTimer <= diff) { @@ -1474,7 +1474,7 @@ class npc_nature_bomb : public CreatureScript uint32 bombTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nature_bombAI(creature); } @@ -1498,7 +1498,7 @@ class npc_unstable_sun_beam : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (despawnTimer <= diff) { @@ -1509,7 +1509,7 @@ class npc_unstable_sun_beam : public CreatureScript despawnTimer -= diff; } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target && spell->Id == SPELL_UNSTABLE_ENERGY) { @@ -1523,7 +1523,7 @@ class npc_unstable_sun_beam : public CreatureScript uint32 despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unstable_sun_beamAI(creature); } @@ -1564,13 +1564,13 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_freya_attuned_to_nature_dose_reduction_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_freya_attuned_to_nature_dose_reduction_SpellScript(); } @@ -1597,13 +1597,13 @@ class spell_freya_iron_roots : public SpellScriptLoader GetCaster()->NearTeleportTo(Roots->GetPositionX(), Roots->GetPositionY(), Roots->GetPositionZ(), GetCaster()->GetOrientation()); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_freya_iron_roots_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_freya_iron_roots_SpellScript(); } @@ -1614,7 +1614,7 @@ class achievement_getting_back_to_nature : public AchievementCriteriaScript public: achievement_getting_back_to_nature() : AchievementCriteriaScript("achievement_getting_back_to_nature") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_GETTING_BACK_TO_NATURE) >= 25; } @@ -1625,7 +1625,7 @@ class achievement_knock_on_wood : public AchievementCriteriaScript public: achievement_knock_on_wood() : AchievementCriteriaScript("achievement_knock_on_wood") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) >= 1; } @@ -1636,7 +1636,7 @@ class achievement_knock_knock_on_wood : public AchievementCriteriaScript public: achievement_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_on_wood") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) >= 2; } @@ -1647,7 +1647,7 @@ class achievement_knock_knock_knock_on_wood : public AchievementCriteriaScript public: achievement_knock_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_knock_on_wood") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) == 3; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 07cf3725f19..f36b4e92f66 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -115,7 +115,7 @@ class boss_general_vezax : public CreatureScript bool animusDead; // Check against getting a HardMode achievement before killing Saronite Animus uint8 vaporCount; - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -125,7 +125,7 @@ class boss_general_vezax : public CreatureScript vaporCount = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -141,7 +141,7 @@ class boss_general_vezax : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -210,19 +210,19 @@ class boss_general_vezax : public CreatureScript DoMeleeAttackIfReady(); } - void SpellHitTarget(Unit* who, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* who, SpellInfo const* spell) override { if (who && who->GetTypeId() == TypeID::TYPEID_PLAYER && spell->Id == SPELL_SHADOW_CRASH_HIT) shadowDodger = false; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); @@ -243,7 +243,7 @@ class boss_general_vezax : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -256,7 +256,7 @@ class boss_general_vezax : public CreatureScript return 0; } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -308,7 +308,7 @@ class boss_general_vezax : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -326,20 +326,20 @@ class boss_saronite_animus : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_VISUAL_SARONITE_ANIMUS); events.Reset(); events.ScheduleEvent(EVENT_PROFOUND_OF_DARKNESS, 3000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Vezax = me->GetCreature(*me, instance->GetData64(BOSS_VEZAX))) Vezax->AI()->DoAction(ACTION_ANIMUS_DIE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -370,7 +370,7 @@ class boss_saronite_animus : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_saronite_animusAI(creature); } @@ -392,13 +392,13 @@ class npc_saronite_vapors : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_RANDOM_MOVE, urand(5000, 7500)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -416,7 +416,7 @@ class npc_saronite_vapors : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { // This can't be on JustDied. In 63322 dummy handler caster needs to be this NPC // if caster == target then damage mods will increase the damage taken @@ -440,7 +440,7 @@ class npc_saronite_vapors : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_saronite_vaporsAI(creature); } @@ -455,7 +455,7 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader { PrepareAuraScript(spell_general_vezax_mark_of_the_faceless_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_THE_FACELESS_DAMAGE)) return false; @@ -468,13 +468,13 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader caster->CastCustomSpell(SPELL_MARK_OF_THE_FACELESS_DAMAGE, SPELLVALUE_BASE_POINT1, aurEff->GetAmount(), GetTarget(), true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_general_vezax_mark_of_the_faceless_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_general_vezax_mark_of_the_faceless_AuraScript(); } @@ -518,7 +518,7 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader { PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SARONITE_VAPORS_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_SARONITE_VAPORS_DAMAGE)) return false; @@ -536,13 +536,13 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_general_vezax_saronite_vapors_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_general_vezax_saronite_vapors_AuraScript(); } @@ -555,7 +555,7 @@ class achievement_shadowdodger : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; @@ -575,7 +575,7 @@ class achievement_smell_saronite : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index bd18e2b3a2b..b24f25f1924 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -194,13 +194,13 @@ class npc_flash_freeze : public CreatureScript uint64 targetGUID; uint32 checkDespawnTimer; - void Reset() OVERRIDE + void Reset() override { targetGUID = 0; checkDespawnTimer = 1000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->GetVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->GetVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; @@ -219,7 +219,7 @@ class npc_flash_freeze : public CreatureScript checkDespawnTimer -= diff; } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { targetGUID = summoner->GetGUID(); me->SetInCombatWith(summoner); @@ -236,7 +236,7 @@ class npc_flash_freeze : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_flash_freezeAI(creature); } @@ -261,7 +261,7 @@ class npc_ice_block : public CreatureScript uint64 targetGUID; - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { targetGUID = summoner->GetGUID(); summoner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); @@ -276,7 +276,7 @@ class npc_ice_block : public CreatureScript } } - void DamageTaken(Unit* who, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* who, uint32& /*damage*/) override { if (Creature* Helper = ObjectAccessor::GetCreature(*me, targetGUID)) { @@ -297,7 +297,7 @@ class npc_ice_block : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ice_blockAI(creature); } @@ -322,7 +322,7 @@ class boss_hodir : public CreatureScript bool iHaveTheCoolestFriends; bool iCouldSayThatThisCacheWasRare; - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -332,7 +332,7 @@ class boss_hodir : public CreatureScript FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -352,13 +352,13 @@ class boss_hodir : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 480000); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { if (damage >= me->GetHealth()) { @@ -388,7 +388,7 @@ class boss_hodir : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -467,7 +467,7 @@ class boss_hodir : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -505,7 +505,7 @@ class boss_hodir : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -527,12 +527,12 @@ class npc_icicle : public CreatureScript uint32 icicleTimer; - void Reset() OVERRIDE + void Reset() override { icicleTimer = 2500; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (icicleTimer <= diff) { @@ -553,7 +553,7 @@ class npc_icicle : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -575,12 +575,12 @@ class npc_snowpacked_icicle : public CreatureScript uint32 despawnTimer; - void Reset() OVERRIDE + void Reset() override { despawnTimer = 12000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (despawnTimer <= diff) { @@ -593,7 +593,7 @@ class npc_snowpacked_icicle : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -611,14 +611,14 @@ class npc_hodir_priest : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_HEAL, urand(4000, 8000)); events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -659,7 +659,7 @@ class npc_hodir_priest : public CreatureScript DoSpellAttackIfReady(SPELL_SMITE); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -670,7 +670,7 @@ class npc_hodir_priest : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -688,13 +688,13 @@ class npc_hodir_shaman : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_STORM_CLOUD, urand(10000, 12500)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -721,7 +721,7 @@ class npc_hodir_shaman : public CreatureScript DoSpellAttackIfReady(SPELL_LAVA_BURST); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -732,7 +732,7 @@ class npc_hodir_shaman : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -750,13 +750,13 @@ class npc_hodir_druid : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_STARLIGHT, urand(15000, 17500)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -782,7 +782,7 @@ class npc_hodir_druid : public CreatureScript DoSpellAttackIfReady(SPELL_WRATH); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -793,7 +793,7 @@ class npc_hodir_druid : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -811,7 +811,7 @@ class npc_hodir_mage : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); summons.DespawnAll(); @@ -819,19 +819,19 @@ class npc_hodir_mage : public CreatureScript events.ScheduleEvent(EVENT_MELT_ICE, 5000); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_TOASTY_FIRE) summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) OVERRIDE + void SummonedCreatureDespawn(Creature* summoned) override { if (summoned->GetEntry() == NPC_TOASTY_FIRE) summons.Despawn(summoned); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -862,7 +862,7 @@ class npc_hodir_mage : public CreatureScript DoSpellAttackIfReady(SPELL_FIREBALL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -874,7 +874,7 @@ class npc_hodir_mage : public CreatureScript SummonList summons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -892,12 +892,12 @@ class npc_toasty_fire : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_SINGED, true); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*who*/, const SpellInfo* spell) override { if (spell->Id == SPELL_BLOCK_OF_ICE || spell->Id == SPELL_ICE_SHARD || spell->Id == SPELL_ICE_SHARD_HIT) { @@ -908,7 +908,7 @@ class npc_toasty_fire : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); }; @@ -954,7 +954,7 @@ class spell_biting_cold : public SpellScriptLoader listOfTargets.push_back(std::make_pair(target->GetGUID(), 1)); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_biting_cold_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } @@ -964,7 +964,7 @@ class spell_biting_cold : public SpellScriptLoader TargetList listOfTargets; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_biting_cold_AuraScript(); } @@ -992,13 +992,13 @@ class spell_biting_cold_dot : public SpellScriptLoader caster->RemoveAuraFromStack(SPELL_BITING_COLD_TRIGGERED); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_biting_cold_dot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_biting_cold_dot_AuraScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 9d017a5792a..a159a123dcb 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -124,7 +124,7 @@ class boss_ignis : public CreatureScript ASSERT(_vehicle); } - void Reset() OVERRIDE + void Reset() override { _Reset(); if (_vehicle) @@ -133,7 +133,7 @@ class boss_ignis : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -149,13 +149,13 @@ class boss_ignis : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_SHATTERED) return _shattered ? 1 : 0; @@ -163,13 +163,13 @@ class boss_ignis : public CreatureScript return 0; } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_IRON_CONSTRUCT) { @@ -183,7 +183,7 @@ class boss_ignis : public CreatureScript summons.Summon(summon); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_REMOVE_BUFF) return; @@ -196,7 +196,7 @@ class boss_ignis : public CreatureScript _firstConstructKill = secondKill; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -285,7 +285,7 @@ class boss_ignis : public CreatureScript bool _shattered; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -303,12 +303,12 @@ class npc_iron_construct : public CreatureScript creature->SetReactState(REACT_PASSIVE); } - void Reset() OVERRIDE + void Reset() override { _brittled = false; } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HasAura(SPELL_BRITTLE) && damage >= 5000) { @@ -321,7 +321,7 @@ class npc_iron_construct : public CreatureScript } } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE + void UpdateAI(uint32 /*uiDiff*/) override { if (!UpdateVictim()) return; @@ -352,7 +352,7 @@ class npc_iron_construct : public CreatureScript bool _brittled; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -371,7 +371,7 @@ class npc_scorch_ground : public CreatureScript creature->SetDisplayId(16925); //model 2 in db cannot overwrite wdb fields } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!_heat) @@ -387,7 +387,7 @@ class npc_scorch_ground : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { _heat = false; DoCast(me, SPELL_GROUND); @@ -395,7 +395,7 @@ class npc_scorch_ground : public CreatureScript _heatTimer = 0; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (_heat) { @@ -419,7 +419,7 @@ class npc_scorch_ground : public CreatureScript bool _heat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -434,7 +434,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader { PrepareAuraScript(spell_ignis_slag_pot_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SLAG_POT_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_SLAG_IMBUED)) @@ -458,14 +458,14 @@ class spell_ignis_slag_pot : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SLAG_IMBUED, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignis_slag_pot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); AfterEffectRemove += AuraEffectRemoveFn(spell_ignis_slag_pot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_ignis_slag_pot_AuraScript(); } @@ -476,7 +476,7 @@ class achievement_ignis_shattered : public AchievementCriteriaScript public: achievement_ignis_shattered() : AchievementCriteriaScript("achievement_ignis_shattered") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target && target->IsAIEnabled) return target->GetAI()->GetData(DATA_SHATTERED); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 27c0899a45c..dc37af313a5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -120,7 +120,7 @@ class boss_kologarn : public CreatureScript bool left, right; uint64 eyebeamTarget; - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -138,14 +138,14 @@ class boss_kologarn : public CreatureScript _EnterCombat(); } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); eyebeamTarget = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); DoCast(SPELL_KOLOGARN_PACIFY); @@ -155,13 +155,13 @@ class boss_kologarn : public CreatureScript _JustDied(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { bool isEncounterInProgress = instance->GetBossState(BOSS_KOLOGARN) == IN_PROGRESS; if (who->GetEntry() == NPC_LEFT_ARM) @@ -211,7 +211,7 @@ class boss_kologarn : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { switch (summon->GetEntry()) { @@ -245,7 +245,7 @@ class boss_kologarn : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -321,7 +321,7 @@ class boss_kologarn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -348,13 +348,13 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL, NULL, originalCaster); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ulduar_rubble_summonSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ulduar_rubble_summonSpellScript(); } @@ -390,7 +390,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader { PrepareSpellScript(spell_ulduar_stone_grip_cast_target_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (GetCaster()->GetTypeId() != TypeID::TYPEID_UNIT) return false; @@ -423,7 +423,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader unitList = _unitList; } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -435,7 +435,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader std::list _unitList; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ulduar_stone_grip_cast_target_SpellScript(); } @@ -469,13 +469,13 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ulduar_cancel_stone_gripSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ulduar_cancel_stone_gripSpellScript(); } @@ -507,13 +507,13 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader GetHitPlayer()->UpdateObjectVisibility(false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ulduar_squeezed_lifeless_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ulduar_squeezed_lifeless_SpellScript(); } @@ -544,13 +544,13 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader rubbleStalker->CastSpell(rubbleStalker, SPELL_STONE_GRIP_CANCEL, true); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_absorb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_ulduar_stone_grip_absorb_AuraScript(); } @@ -597,14 +597,14 @@ class spell_ulduar_stone_grip : public SpellScriptLoader caster->Relocate(oldPos); } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_AuraScript::OnRemoveVehicle, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_AuraScript::OnRemoveStun, EFFECT_2, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_ulduar_stone_grip_AuraScript(); } @@ -624,13 +624,13 @@ class spell_kologarn_stone_shout : public SpellScriptLoader unitList.remove_if(PlayerOrPetCheck()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kologarn_stone_shout_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_kologarn_stone_shout_SpellScript(); } @@ -651,14 +651,14 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); OnEffectHitTarget += SpellEffectFn(spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_kologarn_summon_focused_eyebeam_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index cc86b00041d..7d8833f5216 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -101,13 +101,13 @@ class spell_ulduar_proximity_mines : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_TRIGGER_MISSILE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_ulduar_proximity_minesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_ulduar_proximity_minesSpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index b001571d84a..c2ed40491f9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -195,13 +195,13 @@ class boss_razorscale_controller : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetReactState(REACT_PASSIVE); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch (spell->Id) { @@ -226,12 +226,12 @@ class boss_razorscale_controller : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (instance->GetBossState(BOSS_RAZORSCALE) != IN_PROGRESS) return; @@ -250,7 +250,7 @@ class boss_razorscale_controller : public CreatureScript } } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { events.Update(Diff); @@ -301,7 +301,7 @@ class boss_razorscale_controller : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_razorscale_controllerAI(creature); } @@ -312,7 +312,7 @@ class go_razorscale_harpoon : public GameObjectScript public: go_razorscale_harpoon() : GameObjectScript("go_razorscale_harpoon") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); if (ObjectAccessor::GetCreature(*go, instance ? instance->GetData64(BOSS_RAZORSCALE) : 0)) @@ -342,7 +342,7 @@ class boss_razorscale : public CreatureScript bool PermaGround; bool Enraged; - void Reset() OVERRIDE + void Reset() override { _Reset(); me->SetCanFly(true); @@ -354,7 +354,7 @@ class boss_razorscale : public CreatureScript commander->AI()->DoAction(ACTION_COMMANDER_RESET); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_RAZORSCALE_CONTROL) : 0)) @@ -369,20 +369,20 @@ class boss_razorscale : public CreatureScript events.ScheduleEvent(EVENT_FLIGHT, 0, 0, PHASE_GROUND); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_RAZORSCALE_CONTROL) : 0)) controller->AI()->Reset(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_HARPOON_TRIGGER) ++HarpoonCounter; } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == EFFECT_MOTION_TYPE && id == 1) { @@ -392,7 +392,7 @@ class boss_razorscale : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_QUICK_SHAVE) if (FlyCount <= 2) @@ -401,7 +401,7 @@ class boss_razorscale : public CreatureScript return 0; } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!UpdateVictim()) return; @@ -569,7 +569,7 @@ class boss_razorscale : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -582,7 +582,7 @@ class boss_razorscale : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -610,7 +610,7 @@ class npc_expedition_commander : public CreatureScript Creature* Engineer[4]; Creature* Defender[4]; - void Reset() OVERRIDE + void Reset() override { AttackStartTimer = 0; Phase = 0; @@ -618,7 +618,7 @@ class npc_expedition_commander : public CreatureScript summons.clear(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Greet && me->IsWithinDistInMap(who, 10.0f) && who->GetTypeId() == TypeID::TYPEID_PLAYER) @@ -628,12 +628,12 @@ class npc_expedition_commander : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summons.push_back(summoned->GetGUID()); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -647,7 +647,7 @@ class npc_expedition_commander : public CreatureScript } } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (AttackStartTimer <= Diff) { @@ -707,7 +707,7 @@ class npc_expedition_commander : public CreatureScript } }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -720,7 +720,7 @@ class npc_expedition_commander : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetBossState(BOSS_RAZORSCALE) == NOT_STARTED) @@ -736,7 +736,7 @@ class npc_expedition_commander : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_expedition_commanderAI(creature); } @@ -761,7 +761,7 @@ class npc_mole_machine_trigger : public CreatureScript bool GobSummoned; bool NpcSummoned; - void Reset() OVERRIDE + void Reset() override { SummonGobTimer = 2000; SummonNpcTimer = 6000; @@ -770,7 +770,7 @@ class npc_mole_machine_trigger : public CreatureScript NpcSummoned = false; } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!GobSummoned && SummonGobTimer <= Diff) { @@ -810,13 +810,13 @@ class npc_mole_machine_trigger : public CreatureScript DissapearTimer -= Diff; } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->DoZoneInCombat(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mole_machine_triggerAI(creature); } @@ -835,13 +835,13 @@ class npc_devouring_flame : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PACIFIED); } - void Reset() OVERRIDE + void Reset() override { DoCast(SPELL_FLAME_GROUND); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_devouring_flameAI(creature); } @@ -859,13 +859,13 @@ class npc_darkrune_watcher : public CreatureScript uint32 ChainTimer; uint32 LightTimer; - void Reset() OVERRIDE + void Reset() override { ChainTimer = urand(10000, 15000); LightTimer = urand(1000, 3000); } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!UpdateVictim()) return; @@ -890,7 +890,7 @@ class npc_darkrune_watcher : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_darkrune_watcherAI(creature); } @@ -907,25 +907,25 @@ class npc_darkrune_guardian : public CreatureScript uint32 StormTimer; - void Reset() OVERRIDE + void Reset() override { StormTimer = urand(3000, 6000); killedByBreath = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return type == DATA_IRON_DWARF_MEDIUM_RARE ? killedByBreath : 0; } - void SetData(uint32 type, uint32 value) OVERRIDE + void SetData(uint32 type, uint32 value) override { if (type == DATA_IRON_DWARF_MEDIUM_RARE) killedByBreath = value; } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!UpdateVictim()) return; @@ -945,7 +945,7 @@ class npc_darkrune_guardian : public CreatureScript bool killedByBreath; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_darkrune_guardianAI(creature); } @@ -964,14 +964,14 @@ class npc_darkrune_sentinel : public CreatureScript uint32 WhirlTimer; uint32 ShoutTimer; - void Reset() OVERRIDE + void Reset() override { HeroicTimer = urand(4000, 8000); WhirlTimer = urand(20000, 25000); ShoutTimer = urand(15000, 30000); } - void UpdateAI(uint32 Diff) OVERRIDE + void UpdateAI(uint32 Diff) override { if (!UpdateVictim()) return; @@ -1004,7 +1004,7 @@ class npc_darkrune_sentinel : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_darkrune_sentinelAI(creature); } @@ -1031,13 +1031,13 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader caster->SummonCreature(entry, summonLocation->GetPositionX(), summonLocation->GetPositionY(), GROUND_Z, 0.0f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 20000); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_razorscale_devouring_flame_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_razorscale_devouring_flame_SpellScript(); } @@ -1062,13 +1062,13 @@ class spell_razorscale_flame_breath : public SpellScriptLoader target->AI()->SetData(DATA_IRON_DWARF_MEDIUM_RARE, 1); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_razorscale_flame_breath_SpellScript::CheckDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_razorscale_flame_breath_SpellScript(); } @@ -1081,7 +1081,7 @@ class achievement_iron_dwarf_medium_rare : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->IsAIEnabled && target->GetAI()->GetData(DATA_IRON_DWARF_MEDIUM_RARE); } @@ -1092,7 +1092,7 @@ class achievement_quick_shave : public AchievementCriteriaScript public: achievement_quick_shave() : AchievementCriteriaScript("achievement_quick_shave") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (target) if (Creature* razorscale = target->ToCreature()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 59ebfa2ddc0..3db3cd718d7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -52,36 +52,36 @@ class boss_thorim : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { Talk(SAY_WIPE); _EnterEvadeMode(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); _JustDied(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); _EnterCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -94,7 +94,7 @@ class boss_thorim : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index fffc53d6eef..857b1b5e7fe 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -195,7 +195,7 @@ class boss_xt002 : public CreatureScript public: boss_xt002() : CreatureScript("boss_xt002") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -206,7 +206,7 @@ class boss_xt002 : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -227,7 +227,7 @@ class boss_xt002 : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); _EnterCombat(); @@ -244,7 +244,7 @@ class boss_xt002 : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -254,25 +254,25 @@ class boss_xt002 : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); _JustDied(); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override { if (!_hardMode && _phase == 1 && !HealthAbovePct(100 - 25 * (_heartExposed+1))) ExposeHeart(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -325,7 +325,7 @@ class boss_xt002 : public CreatureScript DoMeleeAttackIfReady(); } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { if (apply && who->GetEntry() == NPC_XS013_SCRAPBOT) { @@ -338,7 +338,7 @@ class boss_xt002 : public CreatureScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -353,7 +353,7 @@ class boss_xt002 : public CreatureScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -462,9 +462,9 @@ class npc_xt002_heart : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Creature* xt002 = _instance ? me->GetCreature(*me, _instance->GetData64(BOSS_XT002)) : NULL; if (!xt002 || !xt002->AI()) @@ -478,7 +478,7 @@ class npc_xt002_heart : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_xt002_heartAI(creature); } @@ -494,7 +494,7 @@ class npc_scrapbot : public CreatureScript public: npc_scrapbot() : CreatureScript("npc_scrapbot") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scrapbotAI(creature); } @@ -506,7 +506,7 @@ class npc_scrapbot : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); @@ -516,7 +516,7 @@ class npc_scrapbot : public CreatureScript me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_rangeCheckTimer <= diff) { @@ -551,7 +551,7 @@ class npc_pummeller : public CreatureScript public: npc_pummeller() : CreatureScript("npc_pummeller") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pummellerAI(creature); } @@ -563,7 +563,7 @@ class npc_pummeller : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _arcingSmashTimer = TIMER_ARCING_SMASH; _trampleTimer = TIMER_TRAMPLE; @@ -577,7 +577,7 @@ class npc_pummeller : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -653,7 +653,7 @@ class npc_boombot : public CreatureScript public: npc_boombot() : CreatureScript("npc_boombot") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_boombotAI(creature); } @@ -665,7 +665,7 @@ class npc_boombot : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _boomed = false; @@ -682,7 +682,7 @@ class npc_boombot : public CreatureScript me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f); } - void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*who*/, uint32& damage) override { if (damage >= (me->GetHealth() - me->GetMaxHealth() * 0.5f) && !_boomed) { @@ -707,7 +707,7 @@ class npc_boombot : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -732,7 +732,7 @@ class npc_life_spark : public CreatureScript public: npc_life_spark() : CreatureScript("npc_life_spark") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_life_sparkAI(creature); } @@ -743,13 +743,13 @@ class npc_life_spark : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { DoCast(me, RAID_MODE(SPELL_STATIC_CHARGED_10, SPELL_STATIC_CHARGED_25)); _shockTimer = 0; // first one is immediate. } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -779,7 +779,7 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader { PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_LIFE_SPARK)) return false; @@ -794,13 +794,13 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader player->CastSpell(player, SPELL_SUMMON_LIFE_SPARK, true); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_xt002_searing_light_spawn_life_spark_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_xt002_searing_light_spawn_life_spark_AuraScript(); } @@ -815,7 +815,7 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader { PrepareAuraScript(spell_xt002_gravity_bomb_aura_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_VOID_ZONE)) return false; @@ -845,14 +845,14 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader xt002->GetAI()->SetData(DATA_GRAVITY_BOMB_CASUALTY, 1); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_xt002_gravity_bomb_aura_AuraScript::OnPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); AfterEffectRemove += AuraEffectRemoveFn(spell_xt002_gravity_bomb_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_xt002_gravity_bomb_aura_AuraScript(); } @@ -878,13 +878,13 @@ class spell_xt002_gravity_bomb_damage : public SpellScriptLoader caster->GetAI()->SetData(DATA_GRAVITY_BOMB_CASUALTY, 1); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_xt002_gravity_bomb_damage_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_xt002_gravity_bomb_damage_SpellScript(); } @@ -899,7 +899,7 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader { PrepareSpellScript(spell_xt002_heart_overload_periodic_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ENERGY_ORB)) return false; @@ -945,13 +945,13 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_xt002_heart_overload_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_xt002_heart_overload_periodic_SpellScript(); } @@ -976,7 +976,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(GetHitDamage())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -984,7 +984,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_xt002_tympanic_tantrum_SpellScript(); } @@ -1009,13 +1009,13 @@ class spell_xt002_submerged : public SpellScriptLoader target->SetByteValue(UNIT_FIELD_ANIM_TIER, 0, UNIT_STAND_STATE_SUBMERGED); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_xt002_submerged_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_xt002_submerged_SpellScript(); } @@ -1040,13 +1040,13 @@ class spell_xt002_stand : public SpellScriptLoader target->SetByteValue(UNIT_FIELD_ANIM_TIER, 0, UNIT_STAND_STATE_STAND); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_xt002_stand_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_xt002_stand_SpellScript(); } @@ -1057,7 +1057,7 @@ class achievement_nerf_engineering : public AchievementCriteriaScript public: achievement_nerf_engineering() : AchievementCriteriaScript("achievement_nerf_engineering") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target || !target->GetAI()) return false; @@ -1071,7 +1071,7 @@ class achievement_heartbreaker : public AchievementCriteriaScript public: achievement_heartbreaker() : AchievementCriteriaScript("achievement_heartbreaker") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target || !target->GetAI()) return false; @@ -1085,7 +1085,7 @@ class achievement_nerf_gravity_bombs : public AchievementCriteriaScript public: achievement_nerf_gravity_bombs() : AchievementCriteriaScript("achievement_nerf_gravity_bombs") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target || !target->GetAI()) return false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 096fccdeb2c..830ca7092c7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -433,7 +433,7 @@ class boss_voice_of_yogg_saron : public CreatureScript SetCombatMovement(false); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { // TODO: MoveInLineOfSight doesn't work for such a big distance @@ -441,7 +441,7 @@ class boss_voice_of_yogg_saron : public CreatureScript me->SetInCombatWithZone(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { BossAI::EnterEvadeMode(); @@ -462,7 +462,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.SetPhase(PHASE_ONE); @@ -485,7 +485,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (Creature* sara = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SARA))) sara->SetInCombatWith(me); @@ -504,7 +504,7 @@ class boss_voice_of_yogg_saron : public CreatureScript events.ScheduleEvent(EVENT_EXTINGUISH_ALL_LIFE, 900000); // 15 minutes } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { // don't despawn Yogg-Saron's corpse, remove him from SummonList! if (Creature* yogg = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_YOGG_SARON))) @@ -513,7 +513,7 @@ class boss_voice_of_yogg_saron : public CreatureScript BossAI::JustDied(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -588,7 +588,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -618,7 +618,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { switch (summon->GetEntry()) { @@ -654,7 +654,7 @@ class boss_voice_of_yogg_saron : public CreatureScript bool _illusionShattered; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -690,7 +690,7 @@ class boss_sara : public CreatureScript _linkData.erase(player1); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (_events.IsInPhase(PHASE_ONE) && damage >= me->GetHealth()) { @@ -708,7 +708,7 @@ class boss_sara : public CreatureScript } } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (!roll_chance_i(30) || _events.IsInPhase(PHASE_TRANSFORM)) return; @@ -729,13 +729,13 @@ class boss_sara : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER && !me->IsInEvadeMode()) Talk(SAY_SARA_KILL); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_SARA_AGGRO); _events.ScheduleEvent(EVENT_SARAS_FERVOR, 5000, 0, PHASE_ONE); @@ -743,7 +743,7 @@ class boss_sara : public CreatureScript _events.ScheduleEvent(EVENT_SARAS_ANGER, urand(15000, 25000), 0, PHASE_ONE); } - void Reset() OVERRIDE + void Reset() override { me->RemoveAllAuras(); me->SetReactState(REACT_PASSIVE); @@ -752,7 +752,7 @@ class boss_sara : public CreatureScript _events.SetPhase(PHASE_ONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) return; @@ -829,7 +829,7 @@ class boss_sara : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->SetReactState(REACT_PASSIVE); @@ -858,7 +858,7 @@ class boss_sara : public CreatureScript voice->AI()->JustSummoned(summon); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -876,7 +876,7 @@ class boss_sara : public CreatureScript std::map _linkData; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -891,7 +891,7 @@ class boss_yogg_saron : public CreatureScript { boss_yogg_saronAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.SetPhase(PHASE_TWO); @@ -913,13 +913,13 @@ class boss_yogg_saron : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_IN_THE_MAWS_OF_THE_OLD_GOD) me->AddLootMode(32); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_YOGG_SARON_DEATH); @@ -943,7 +943,7 @@ class boss_yogg_saron : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -979,7 +979,7 @@ class boss_yogg_saron : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -1004,7 +1004,7 @@ class boss_yogg_saron : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1019,14 +1019,14 @@ class boss_brain_of_yogg_saron : public CreatureScript { boss_brain_of_yogg_saronAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()), _summons(creature) { } - void Reset() OVERRIDE + void Reset() override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_MATCH_HEALTH); _summons.DespawnAll(); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(30, damage) && !me->HasAura(SPELL_BRAIN_HURT_VISUAL)) { @@ -1050,9 +1050,9 @@ class boss_brain_of_yogg_saron : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -1089,7 +1089,7 @@ class boss_brain_of_yogg_saron : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { _summons.Summon(summon); } @@ -1100,7 +1100,7 @@ class boss_brain_of_yogg_saron : public CreatureScript uint8 _tentaclesKilled; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1115,7 +1115,7 @@ class npc_ominous_cloud : public CreatureScript { npc_ominous_cloudAI(Creature* creature) : PassiveAI(creature) { } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_OMINOUS_CLOUD_VISUAL); } @@ -1135,9 +1135,9 @@ class npc_ominous_cloud : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { Movement::MoveSplineInit init(me); FillCirclePath(YoggSaronSpawnPos, me->GetDistance2d(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY()), me->GetPositionZ(), init.Path(), action); @@ -1147,7 +1147,7 @@ class npc_ominous_cloud : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1162,18 +1162,18 @@ class npc_guardian_of_yogg_saron : public CreatureScript { npc_guardian_of_yogg_saronAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCastAOE(SPELL_SHADOW_NOVA); DoCastAOE(SPELL_SHADOW_NOVA_2); } - void Reset() OVERRIDE + void Reset() override { _events.ScheduleEvent(EVENT_DARK_VOLLEY, urand(10000, 15000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1199,7 +1199,7 @@ class npc_guardian_of_yogg_saron : public CreatureScript DoMeleeAttackIfReady(); } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (summoner->GetEntry() != NPC_OMINOUS_CLOUD) return; @@ -1214,7 +1214,7 @@ class npc_guardian_of_yogg_saron : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1232,14 +1232,14 @@ class npc_corruptor_tentacle : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_TENTACLE_VOID_ZONE); DoCastAOE(SPELL_ERUPT); _events.ScheduleEvent(EVENT_CAST_RANDOM_SPELL, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1271,7 +1271,7 @@ class npc_corruptor_tentacle : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1289,24 +1289,24 @@ class npc_constrictor_tentacle : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_TENTACLE_VOID_ZONE_2); DoCastAOE(SPELL_ERUPT); } - void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override { if (!apply) passenger->RemoveAurasDueToSpell(SPELL_SQUEEZE); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { UpdateVictim(); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* voice = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_VOICE_OF_YOGG_SARON))) voice->AI()->JustSummoned(me); @@ -1316,7 +1316,7 @@ class npc_constrictor_tentacle : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1334,7 +1334,7 @@ class npc_crusher_tentacle : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_CRUSH); DoCast(me, SPELL_TENTACLE_VOID_ZONE); @@ -1345,7 +1345,7 @@ class npc_crusher_tentacle : public CreatureScript _events.ScheduleEvent(EVENT_DIMINISH_POWER, urand(6000, 8000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1377,7 +1377,7 @@ class npc_crusher_tentacle : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1392,24 +1392,24 @@ class npc_influence_tentacle : public CreatureScript { npc_influence_tentacleAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void Reset() OVERRIDE + void Reset() override { DoCast(me, me->GetEntry() == NPC_SUIT_OF_ARMOR ? SPELL_NONDESCRIPT_1 : SPELL_NONDESCRIPT_2); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* brain = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_BRAIN_OF_YOGG_SARON))) brain->AI()->DoAction(ACTION_TENTACLE_KILLED); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1426,7 +1426,7 @@ class npc_descend_into_madness : public CreatureScript { npc_descend_into_madnessAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void OnSpellClick(Unit* clicker, bool& result) OVERRIDE + void OnSpellClick(Unit* clicker, bool& result) override { if (!result) return; @@ -1434,13 +1434,13 @@ class npc_descend_into_madness : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1455,20 +1455,20 @@ class npc_immortal_guardian : public CreatureScript { npc_immortal_guardianAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { DoCast(me, SPELL_EMPOWERED); DoCast(me, SPELL_RECENTLY_SPAWNED); _events.ScheduleEvent(EVENT_DRAIN_LIFE, urand(3000, 13000)); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(1, damage)) damage = me->GetHealth() - me->CountPctFromMaxHealth(1); // or set immune to damage? should be done here or in SPELL_WEAKENED spell script? } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1498,7 +1498,7 @@ class npc_immortal_guardian : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1513,13 +1513,13 @@ class npc_observation_ring_keeper : public CreatureScript { npc_observation_ring_keeperAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { DoCast(SPELL_SIMPLE_TELEPORT_KEEPERS); // not visible here DoCast(SPELL_KEEPER_ACTIVE); } - void sGossipSelect(Player* player, uint32 sender, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 sender, uint32 /*action*/) override { if (sender != 10333) return; @@ -1547,10 +1547,10 @@ class npc_observation_ring_keeper : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1565,12 +1565,12 @@ class npc_yogg_saron_keeper : public CreatureScript { npc_yogg_saron_keeperAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { DoCast(SPELL_SIMPLE_TELEPORT_KEEPERS); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.SetPhase(PHASE_ONE); @@ -1591,7 +1591,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { switch (me->GetEntry()) { @@ -1612,7 +1612,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) return; @@ -1637,7 +1637,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -1673,7 +1673,7 @@ class npc_yogg_saron_keeper : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1688,7 +1688,7 @@ class npc_yogg_saron_illusions : public CreatureScript { npc_yogg_saron_illusionsAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { switch (_instance->GetData(DATA_ILLUSION)) { @@ -1721,7 +1721,7 @@ class npc_yogg_saron_illusions : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1794,7 +1794,7 @@ class npc_yogg_saron_illusions : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1809,7 +1809,7 @@ class npc_garona : public CreatureScript { npc_garonaAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); @@ -1822,7 +1822,7 @@ class npc_garona : public CreatureScript _events.ScheduleEvent(EVENT_STORMWIND_ROLEPLAY_6, 52700); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1857,7 +1857,7 @@ class npc_garona : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1872,12 +1872,12 @@ class npc_turned_champion : public CreatureScript { npc_turned_championAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { DoCast(SPELL_VERTEX_COLOR_BLACK); } - void MovementInform(uint32 type, uint32 pointId) OVERRIDE + void MovementInform(uint32 type, uint32 pointId) override { if (type != POINT_MOTION_TYPE || pointId != 0) return; @@ -1885,7 +1885,7 @@ class npc_turned_champion : public CreatureScript me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { if (action != ACTION_START_ROLEPLAY) return; @@ -1895,7 +1895,7 @@ class npc_turned_champion : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1910,17 +1910,17 @@ class npc_laughing_skull : public CreatureScript { npc_laughing_skullAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_PASSIVE); DoCast(me, SPELL_LUNATIC_GAZE_SKULL); } // don't evade, otherwise the Lunatic Gaze aura is removed - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUlduarAI(creature); } @@ -1941,13 +1941,13 @@ class spell_yogg_saron_target_selectors : public SpellScriptLoader // 63744, GetCaster()->CastSpell(target, uint32(GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_target_selectors_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_target_selectors_SpellScript(); } @@ -1993,7 +1993,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 { PrepareSpellScript(spell_yogg_saron_psychosis_SpellScript); - bool Load() OVERRIDE + bool Load() override { _stacks = GetSpellInfo()->Id == SPELL_PSYCHOSIS ? 9 : 12; return true; @@ -2005,7 +2005,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 targets.remove_if(Skyfire::UnitAuraCheck(true, SPELL_ILLUSION_ROOM)); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2013,7 +2013,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_psychosis_SpellScript(); } @@ -2037,7 +2037,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 targets.remove_if(Skyfire::UnitAuraCheck(true, SPELL_ILLUSION_ROOM)); } - void Register() OVERRIDE + void Register() override { if (m_scriptSpellId == SPELL_MALADY_OF_THE_MIND) { @@ -2054,7 +2054,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 { PrepareAuraScript(spell_yogg_saron_malady_of_the_mind_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MALADY_OF_THE_MIND_JUMP)) return false; @@ -2076,18 +2076,18 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 GetTarget()->CastSpell(GetTarget(), SPELL_MALADY_OF_THE_MIND_JUMP); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_malady_of_the_mind_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_MOD_FEAR, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_malady_of_the_mind_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_malady_of_the_mind_AuraScript(); } @@ -2116,7 +2116,7 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 ai->SetLinkBetween(targets.front()->GetGUID(), targets.back()->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_brain_link_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } @@ -2126,7 +2126,7 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 { PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BRAIN_LINK_DAMAGE)) return false; @@ -2173,19 +2173,19 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 GetTarget()->CastSpell(linked, (GetTarget()->GetDistance(linked) > (float)aurEff->GetAmount()) ? SPELL_BRAIN_LINK_DAMAGE : SPELL_BRAIN_LINK_NO_DAMAGE, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_brain_link_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_brain_link_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_brain_link_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_brain_link_AuraScript(); } @@ -2203,13 +2203,13 @@ class spell_yogg_saron_brain_link_damage : public SpellScriptLoader // 6380 PrepareSpellScript(spell_yogg_saron_brain_link_damage_SpellScript); - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_brain_link_damage_SpellScript::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_brain_link_damage_SpellScript(); } @@ -2224,7 +2224,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030 { PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GUARDIAN_1)) return false; @@ -2243,13 +2243,13 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030 } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_boil_ominously_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_boil_ominously_SpellScript(); } @@ -2276,14 +2276,14 @@ class spell_yogg_saron_shadow_beacon : public SpellScriptLoader // 64465 target->SetEntry(NPC_IMMORTAL_GUARDIAN); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_shadow_beacon_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_shadow_beacon_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_shadow_beacon_AuraScript(); } @@ -2304,13 +2304,13 @@ class spell_yogg_saron_empowering_shadows_range_check : public SpellScriptLoader target->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_empowering_shadows_range_check_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_empowering_shadows_range_check_SpellScript(); } @@ -2325,7 +2325,7 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader { PrepareSpellScript(spell_yogg_saron_empowering_shadows_missile_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_EMPOWERING_SHADOWS)) return false; @@ -2338,13 +2338,13 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader target->CastSpell((Unit*)NULL, SPELL_EMPOWERING_SHADOWS, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_empowering_shadows_missile_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_empowering_shadows_missile_SpellScript(); } @@ -2360,7 +2360,7 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader // 64 { PrepareAuraScript(spell_yogg_saron_constrictor_tentacle_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CONSTRICTOR_TENTACLE_SUMMON)) return false; @@ -2372,13 +2372,13 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader // 64 GetTarget()->CastSpell(GetTarget(), SPELL_CONSTRICTOR_TENTACLE_SUMMON); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_constrictor_tentacle_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_constrictor_tentacle_AuraScript(); } @@ -2393,7 +2393,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 { PrepareSpellScript(spell_yogg_saron_lunge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SQUEEZE)) return false; @@ -2409,13 +2409,13 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_lunge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_lunge_SpellScript(); } @@ -2437,13 +2437,13 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125 vehicle->Kill(vehicle); // should tentacle die or just release its target? } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_squeeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_squeeze_AuraScript(); } @@ -2466,13 +2466,13 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader // 64148 GetTarget()->InterruptSpell(CURRENT_CHANNELED_SPELL); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_yogg_saron_diminsh_power_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_diminsh_power_AuraScript(); } @@ -2488,7 +2488,7 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 { PrepareAuraScript(spell_yogg_saron_empowered_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_EMPOWERED_BUFF)) return false; @@ -2517,14 +2517,14 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 target->CastSpell(target, SPELL_WEAKENED, true); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_empowered_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_empowered_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_empowered_AuraScript(); } @@ -2545,13 +2545,13 @@ class spell_yogg_saron_match_health : public SpellScriptLoader // 64069 target->SetHealth(target->CountPctFromMaxHealth((int32)GetCaster()->GetHealthPct())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_match_health_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_match_health_SpellScript(); } @@ -2572,13 +2572,13 @@ class spell_yogg_saron_shattered_illusion : public SpellScriptLoader // 65238 target->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_shattered_illusion_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_shattered_illusion_SpellScript(); } @@ -2593,7 +2593,7 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader / { PrepareAuraScript(spell_yogg_saron_death_ray_warning_visual_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DEATH_RAY_PERIODIC)) return false; @@ -2613,13 +2613,13 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader / } } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_death_ray_warning_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_death_ray_warning_visual_AuraScript(); } @@ -2634,7 +2634,7 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader / { PrepareSpellScript(spell_yogg_saron_cancel_illusion_room_aura_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TELEPORT_BACK_TO_MAIN_ROOM)) return false; @@ -2650,13 +2650,13 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader / } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_cancel_illusion_room_aura_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_cancel_illusion_room_aura_SpellScript(); } @@ -2676,13 +2676,13 @@ class spell_yogg_saron_nondescript : public SpellScriptLoader // 64010, 6401 GetTarget()->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_nondescript_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_nondescript_AuraScript(); } @@ -2697,7 +2697,7 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader // 64012 { PrepareSpellScript(spell_yogg_saron_revealed_tentacle_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TENTACLE_VOID_ZONE)) return false; @@ -2716,13 +2716,13 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader // 64012 } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_revealed_tentacle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_revealed_tentacle_SpellScript(); } @@ -2737,7 +2737,7 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 { PrepareAuraScript(spell_yogg_saron_grim_reprisal_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GRIM_REPRISAL_DAMAGE)) return false; @@ -2750,13 +2750,13 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 GetTarget()->CastCustomSpell(SPELL_GRIM_REPRISAL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetDamageInfo()->GetAttacker(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_yogg_saron_grim_reprisal_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_grim_reprisal_AuraScript(); } @@ -2771,7 +2771,7 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader // 64059 { PrepareSpellScript(spell_yogg_saron_induce_madness_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TELEPORT_BACK_TO_MAIN_ROOM)) return false; @@ -2799,14 +2799,14 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader // 64059 voice->AI()->DoAction(ACTION_TOGGLE_SHATTERED_ILLUSION); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_induce_madness_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); AfterCast += SpellCastFn(spell_yogg_saron_induce_madness_SpellScript::ClearShatteredIllusion); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_induce_madness_SpellScript(); } @@ -2828,7 +2828,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 GetSpell()->SetSpellValue(SPELLVALUE_AURA_STACK, 100); } - void Register() OVERRIDE + void Register() override { BeforeCast += SpellCastFn(spell_yogg_saron_sanity_SpellScript::ModSanityStacks); } @@ -2838,7 +2838,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 { PrepareAuraScript(spell_yogg_saron_sanity_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LOW_SANITY_SCREEN_EFFECT)) return false; @@ -2870,19 +2870,19 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 caster->CastSpell(GetTarget(), SPELL_INSANE, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_sanity_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_sanity_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_sanity_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_sanity_AuraScript(); } @@ -2897,7 +2897,7 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 { PrepareAuraScript(spell_yogg_saron_insane_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_INSANE_VISUAL)) return false; @@ -2919,14 +2919,14 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 GetTarget()->Kill(GetTarget()); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_insane_AuraScript::OnApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_insane_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_insane_AuraScript(); } @@ -2947,13 +2947,13 @@ class spell_yogg_saron_insane_periodic : public SpellScriptLoader // 64555 GetCaster()->CastSpell(target, uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_insane_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_insane_periodic_SpellScript(); } @@ -2982,7 +2982,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 { PrepareSpellScript(spell_yogg_saron_lunatic_gaze_SpellScript); - bool Load() OVERRIDE + bool Load() override { _stacks = GetSpellInfo()->Id == SPELL_LUNATIC_GAZE_DAMAGE ? 4 : 2; return true; @@ -2993,7 +2993,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 targets.remove_if(LunaticGazeTargetSelector(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -3001,7 +3001,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_lunatic_gaze_SpellScript(); } @@ -3023,13 +3023,13 @@ class spell_yogg_saron_keeper_aura : public SpellScriptLoader // 62650, 6267 return true; } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_yogg_saron_keeper_aura_AuraScript::CanApply); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_keeper_aura_AuraScript(); } @@ -3051,13 +3051,13 @@ class spell_yogg_saron_hate_to_zero : public SpellScriptLoader // 63984 target->getThreatManager().modifyThreatPercent(GetCaster(), -100); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_hate_to_zero_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_hate_to_zero_SpellScript(); } @@ -3087,13 +3087,13 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader return SpellCastResult::SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript(); } @@ -3114,13 +3114,13 @@ class spell_yogg_saron_titanic_storm : public SpellScriptLoader // 64172 GetCaster()->Kill(target); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_titanic_storm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_yogg_saron_titanic_storm_SpellScript(); } @@ -3135,7 +3135,7 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // { PrepareAuraScript(spell_yogg_saron_hodirs_protective_gaze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FLASH_FREEZE)) return false; @@ -3161,14 +3161,14 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // PreventDefaultAction(); } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_yogg_saron_hodirs_protective_gaze_AuraScript::CanApply); OnEffectAbsorb += AuraEffectAbsorbFn(spell_yogg_saron_hodirs_protective_gaze_AuraScript::OnAbsorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_yogg_saron_hodirs_protective_gaze_AuraScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 6159749108a..22cf5bcf5fd 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -114,7 +114,7 @@ class instance_ulduar : public InstanceMapScript std::set mRubbleSpawns; - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(MAX_ENCOUNTER); LoadDoorData(doorData); @@ -172,13 +172,13 @@ class instance_ulduar : public InstanceMapScript memset(_summonYSKeeper, false, sizeof(_summonYSKeeper)); } - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE + void FillInitialWorldStates(WorldStateBuilder& builder) override { builder.AppendState(WORLD_STATE_ALGALON_TIMER_ENABLED, _algalonTimer && _algalonTimer <= 60); builder.AppendState(WORLD_STATE_ALGALON_DESPAWN_TIMER, std::min(_algalonTimer, 60)); } - void OnPlayerEnter(Player* player) OVERRIDE + void OnPlayerEnter(Player* player) override { if (!TeamInInstance) TeamInInstance = player->GetTeam(); @@ -226,7 +226,7 @@ class instance_ulduar : public InstanceMapScript instance->SummonCreature(NPC_MIMIRON_YS, YSKeepersPos[3]); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (!TeamInInstance) { @@ -419,7 +419,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { switch (creature->GetEntry()) { @@ -445,7 +445,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* gameObject) OVERRIDE + void OnGameObjectCreate(GameObject* gameObject) override { switch (gameObject->GetEntry()) { @@ -555,7 +555,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* gameObject) OVERRIDE + void OnGameObjectRemove(GameObject* gameObject) override { switch (gameObject->GetEntry()) { @@ -580,7 +580,7 @@ class instance_ulduar : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -607,7 +607,7 @@ class instance_ulduar : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE + void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) override { // Flame Leviathan's Tower Event triggers Creature* FlameLeviathan = instance->GetCreature(LeviathanGUID); @@ -641,7 +641,7 @@ class instance_ulduar : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -748,7 +748,7 @@ class instance_ulduar : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -796,11 +796,11 @@ class instance_ulduar : public InstanceMapScript } } - void SetData64(uint32 /*type*/, uint64 /*data*/) OVERRIDE + void SetData64(uint32 /*type*/, uint64 /*data*/) override { } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -914,7 +914,7 @@ class instance_ulduar : public InstanceMapScript return 0; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -935,7 +935,7 @@ class instance_ulduar : public InstanceMapScript return 0; } - bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const*, Unit const* /* = NULL */, uint32 /* = 0 */) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteriaId, Player const*, Unit const* /* = NULL */, uint32 /* = 0 */) override { switch (criteriaId) { @@ -970,7 +970,7 @@ class instance_ulduar : public InstanceMapScript return false; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -984,7 +984,7 @@ class instance_ulduar : public InstanceMapScript return saveStream.str(); } - void Load(char const* strIn) OVERRIDE + void Load(char const* strIn) override { if (!strIn) { @@ -1050,7 +1050,7 @@ class instance_ulduar : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (_events.Empty()) return; @@ -1089,7 +1089,7 @@ class instance_ulduar : public InstanceMapScript uint32 _maxWeaponItemLevel; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ulduar_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp index e39a4d8c42b..56e3c615426 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp @@ -52,7 +52,7 @@ class ulduar_teleporter : public GameObjectScript public: ulduar_teleporter() : GameObjectScript("ulduar_teleporter") { } - bool OnGossipSelect(Player* player, GameObject* /*gameObject*/, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* /*gameObject*/, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (sender != GOSSIP_SENDER_MAIN) @@ -95,7 +95,7 @@ class ulduar_teleporter : public GameObjectScript return true; } - bool OnGossipHello(Player* player, GameObject* gameObject) OVERRIDE + bool OnGossipHello(Player* player, GameObject* gameObject) override { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Expedition Base Camp", GOSSIP_SENDER_MAIN, BASE_CAMP); if (InstanceScript* instance = gameObject->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 34e0003851f..1871adde093 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -113,7 +113,7 @@ class boss_ingvar_the_plunderer : public CreatureScript _isUndead = false; } - void Reset() OVERRIDE + void Reset() override { _isUndead = false; @@ -128,7 +128,7 @@ class boss_ingvar_the_plunderer : public CreatureScript events.ScheduleEvent(EVENT_SMASH, urand(12, 17)*IN_MILLISECONDS, 0, PHASE_HUMAN); } - void DamageTaken(Unit* /*doneBy*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*doneBy*/, uint32& damage) override { if (damage >= me->GetHealth() && events.IsInPhase(PHASE_HUMAN)) { @@ -147,7 +147,7 @@ class boss_ingvar_the_plunderer : public CreatureScript damage = 0; } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { if (actionId == ACTION_START_PHASE_2) StartZombiePhase(); @@ -163,7 +163,7 @@ class boss_ingvar_the_plunderer : public CreatureScript Talk(SAY_AGGRO_2); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -171,7 +171,7 @@ class boss_ingvar_the_plunderer : public CreatureScript Talk(SAY_AGGRO_1); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH_2); @@ -186,12 +186,12 @@ class boss_ingvar_the_plunderer : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_AXE, 30*IN_MILLISECONDS, 0, PHASE_UNDEAD); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(_isUndead ? SAY_SLAY_1 : SAY_SLAY_2); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() && !events.IsInPhase(PHASE_EVENT)) return; @@ -260,7 +260,7 @@ class boss_ingvar_the_plunderer : public CreatureScript bool _isUndead; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -278,7 +278,7 @@ class npc_annhylde_the_caller : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); @@ -290,7 +290,7 @@ class npc_annhylde_the_caller : public CreatureScript me->GetMotionMaster()->MovePoint(1, x, y, z+15); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -315,11 +315,11 @@ class npc_annhylde_the_caller : public CreatureScript } } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -356,7 +356,7 @@ class npc_annhylde_the_caller : public CreatureScript float x, y, z; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -374,7 +374,7 @@ class npc_ingvar_throw_dummy : public CreatureScript public: npc_ingvar_throw_dummy() : CreatureScript("npc_ingvar_throw_dummy") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ingvar_throw_dummyAI(creature); } @@ -385,7 +385,7 @@ class npc_ingvar_throw_dummy : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { if (Creature* target = me->FindNearestCreature(NPC_THROW_TARGET, 50.0f)) { @@ -398,7 +398,7 @@ class npc_ingvar_throw_dummy : public CreatureScript me->DisappearAndDie(); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == EFFECT_MOTION_TYPE && id == POINT_TARGET) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 76a17470e90..477e2324ce3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -88,14 +88,14 @@ class npc_frost_tomb : public CreatureScript _instance = creature->GetInstanceScript(); } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { DoCast(summoner, SPELL_FROST_TOMB, true); } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* keleseth = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_PRINCE_KELESETH))) keleseth->AI()->SetData(DATA_ON_THE_ROCKS, false); @@ -105,7 +105,7 @@ class npc_frost_tomb : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -120,7 +120,7 @@ class boss_keleseth : public CreatureScript { boss_kelesethAI(Creature* creature) : BossAI(creature, DATA_PRINCE_KELESETH) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_SHADOWBOLT, urand(2, 3)*IN_MILLISECONDS); @@ -130,7 +130,7 @@ class boss_keleseth : public CreatureScript onTheRocks = true; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); Talk(SAY_START_COMBAT); @@ -151,19 +151,19 @@ class boss_keleseth : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == DATA_ON_THE_ROCKS) onTheRocks = value; } - uint32 GetData(uint32 data) const OVERRIDE + uint32 GetData(uint32 data) const override { if (data == DATA_ON_THE_ROCKS) return onTheRocks; @@ -171,7 +171,7 @@ class boss_keleseth : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -224,7 +224,7 @@ class boss_keleseth : public CreatureScript bool onTheRocks; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -239,13 +239,13 @@ class npc_vrykul_skeleton : public CreatureScript { npc_vrykul_skeletonAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_DECREPIFY, urand(4, 6) * IN_MILLISECONDS); } - void DamageTaken(Unit* /*doneBy*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*doneBy*/, uint32& damage) override { if (damage >= me->GetHealth()) { @@ -268,7 +268,7 @@ class npc_vrykul_skeleton : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -315,7 +315,7 @@ class npc_vrykul_skeleton : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -339,13 +339,13 @@ class spell_frost_tomb : public SpellScriptLoader creature->DespawnOrUnsummon(1000); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_frost_tomb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_frost_tomb_AuraScript(); } @@ -356,7 +356,7 @@ class achievement_on_the_rocks : public AchievementCriteriaScript public: achievement_on_the_rocks() : AchievementCriteriaScript("achievement_on_the_rocks") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { return target && target->IsAIEnabled && target->GetAI()->GetData(DATA_ON_THE_ROCKS); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 9d5d8ca9874..3a682dfde81 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -92,7 +92,7 @@ class boss_skarvald_the_constructor : public CreatureScript bool Dalronn_isDead; bool Enraged; - void Reset() OVERRIDE + void Reset() override { Charge_Timer = 5000; StoneStrike_Timer = 10000; @@ -106,7 +106,7 @@ class boss_skarvald_the_constructor : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!ghost) { @@ -115,7 +115,7 @@ class boss_skarvald_the_constructor : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (!Enraged && !ghost && me->HealthBelowPctDamaged(15, damage)) { @@ -124,12 +124,12 @@ class boss_skarvald_the_constructor : public CreatureScript } } - void DoAction(int32 /*actionId*/) OVERRIDE + void DoAction(int32 /*actionId*/) override { summons.DespawnAll(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (!ghost) { @@ -158,13 +158,13 @@ class boss_skarvald_the_constructor : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (!ghost && who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(YELL_SKARVALD_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -222,7 +222,7 @@ class boss_skarvald_the_constructor : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -247,7 +247,7 @@ class boss_dalronn_the_controller : public CreatureScript uint32 AggroYell_Timer; bool Skarvald_isDead; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 1000; Debilitate_Timer = 5000; @@ -262,7 +262,7 @@ class boss_dalronn_the_controller : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!ghost) { @@ -271,12 +271,12 @@ class boss_dalronn_the_controller : public CreatureScript } } - void DoAction(int32 /*actionId*/) OVERRIDE + void DoAction(int32 /*actionId*/) override { summons.DespawnAll(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (!ghost) { @@ -305,13 +305,13 @@ class boss_dalronn_the_controller : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (!ghost && who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(YELL_DALRONN_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -401,7 +401,7 @@ class boss_dalronn_the_controller : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 5b78e194f90..f18328ea251 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -54,7 +54,7 @@ class instance_utgarde_keep : public InstanceMapScript IngvarGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -77,7 +77,7 @@ class instance_utgarde_keep : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { switch (creature->GetEntry()) { @@ -90,7 +90,7 @@ class instance_utgarde_keep : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -139,7 +139,7 @@ class instance_utgarde_keep : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -152,7 +152,7 @@ class instance_utgarde_keep : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -171,7 +171,7 @@ class instance_utgarde_keep : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -194,7 +194,7 @@ class instance_utgarde_keep : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -208,7 +208,7 @@ class instance_utgarde_keep : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -252,7 +252,7 @@ class instance_utgarde_keep : public InstanceMapScript uint64 IngvarGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_utgarde_keep_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index f8076511923..8874133dd33 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -49,7 +49,7 @@ class npc_dragonflayer_forge_master : public CreatureScript _forgeId = 0; } - void Reset() OVERRIDE + void Reset() override { if (!_forgeId) _forgeId = GetForgeMasterType(); @@ -61,7 +61,7 @@ class npc_dragonflayer_forge_master : public CreatureScript _instance->SetData(DATA_FORGE_1 + _forgeId - 1, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!_forgeId) _forgeId = GetForgeMasterType(); @@ -70,7 +70,7 @@ class npc_dragonflayer_forge_master : public CreatureScript _instance->SetData(DATA_FORGE_1 + _forgeId - 1, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!_forgeId) _forgeId = GetForgeMasterType(); @@ -81,7 +81,7 @@ class npc_dragonflayer_forge_master : public CreatureScript me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!_forgeId) _forgeId = GetForgeMasterType(); @@ -116,7 +116,7 @@ class npc_dragonflayer_forge_master : public CreatureScript uint8 _forgeId; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetUtgardeKeepAI(creature); } @@ -136,7 +136,7 @@ class spell_ticking_time_bomb : public SpellScriptLoader { PrepareAuraScript(spell_ticking_time_bomb_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TICKING_TIME_BOMB_EXPLODE)) return false; @@ -149,13 +149,13 @@ class spell_ticking_time_bomb : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_TICKING_TIME_BOMB_EXPLODE, true); } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_ticking_time_bomb_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_ticking_time_bomb_AuraScript(); } @@ -175,7 +175,7 @@ class spell_fixate : public SpellScriptLoader { PrepareSpellScript(spell_fixate_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FIXATE_TRIGGER)) return false; @@ -187,13 +187,13 @@ class spell_fixate : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), SPELL_FIXATE_TRIGGER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_fixate_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_fixate_SpellScript(); } @@ -231,7 +231,7 @@ class npc_enslaved_proto_drake : public CreatureScript _setData = false; } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_REND, urand(2000, 3000)); @@ -239,7 +239,7 @@ class npc_enslaved_proto_drake : public CreatureScript _events.ScheduleEvent(EVENT_KNOCKAWAY, urand(3500, 6000)); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == WAYPOINT_MOTION_TYPE && id == POINT_LAST) { @@ -247,7 +247,7 @@ class npc_enslaved_proto_drake : public CreatureScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == TYPE_PROTODRAKE_AT && data == DATA_PROTODRAKE_MOVE && !_setData && me->GetDistance(protodrakeCheckPos) < 5.0f) { @@ -257,7 +257,7 @@ class npc_enslaved_proto_drake : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -296,7 +296,7 @@ class npc_enslaved_proto_drake : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enslaved_proto_drakeAI(creature); } @@ -311,7 +311,7 @@ class spell_uk_second_wind_proc : public SpellScriptLoader { PrepareAuraScript(spell_uk_second_wind_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_UK_SECOUND_WIND_TRIGGER)) return false; @@ -333,14 +333,14 @@ class spell_uk_second_wind_proc : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_UK_SECOUND_WIND_TRIGGER, SPELLVALUE_BASE_POINT0, 5, GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_uk_second_wind_proc_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_uk_second_wind_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_uk_second_wind_proc_AuraScript(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index b9c794fa55d..4ee49a48d1f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -92,7 +92,7 @@ class boss_palehoof : public CreatureScript public: boss_palehoof() : CreatureScript("boss_palehoof") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_palehoofAI(creature); } @@ -114,7 +114,7 @@ class boss_palehoof : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { /// There is a good reason to store them like this, we are going to shuffle the order. for (uint32 i = PHASE_FRENZIED_WORGEN; i < PHASE_NONE; ++i) @@ -166,12 +166,12 @@ class boss_palehoof : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -188,7 +188,7 @@ class boss_palehoof : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (currentPhase != PHASE_GORTOK_PALEHOOF) return; @@ -223,7 +223,7 @@ class boss_palehoof : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //Talk(SAY_DEATH); if (instance) @@ -233,7 +233,7 @@ class boss_palehoof : public CreatureScript temp->DisappearAndDie(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } @@ -263,7 +263,7 @@ class boss_palehoof : public CreatureScript currentPhase = move; } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -286,7 +286,7 @@ class npc_ravenous_furbolg : public CreatureScript public: npc_ravenous_furbolg() : CreatureScript("npc_ravenous_furbolg") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ravenous_furbolgAI(creature); } @@ -304,7 +304,7 @@ class npc_ravenous_furbolg : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiChainLightingTimer = 5000; uiCrazedTimer = 10000; @@ -321,7 +321,7 @@ class npc_ravenous_furbolg : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -348,7 +348,7 @@ class npc_ravenous_furbolg : public CreatureScript DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -365,7 +365,7 @@ class npc_ravenous_furbolg : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -375,7 +375,7 @@ class npc_ravenous_furbolg : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -398,7 +398,7 @@ class npc_frenzied_worgen : public CreatureScript public: npc_frenzied_worgen() : CreatureScript("npc_frenzied_worgen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frenzied_worgenAI(creature); } @@ -416,7 +416,7 @@ class npc_frenzied_worgen : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiMortalWoundTimer = 5000; uiEnrage1Timer = 15000; @@ -433,7 +433,7 @@ class npc_frenzied_worgen : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -460,7 +460,7 @@ class npc_frenzied_worgen : public CreatureScript DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -479,7 +479,7 @@ class npc_frenzied_worgen : public CreatureScript instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -489,7 +489,7 @@ class npc_frenzied_worgen : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -513,7 +513,7 @@ class npc_ferocious_rhino : public CreatureScript public: npc_ferocious_rhino() : CreatureScript("npc_ferocious_rhino") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ferocious_rhinoAI(creature); } @@ -531,7 +531,7 @@ class npc_ferocious_rhino : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiStompTimer = 10000; uiGoreTimer = 15000; @@ -548,7 +548,7 @@ class npc_ferocious_rhino : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -576,7 +576,7 @@ class npc_ferocious_rhino : public CreatureScript DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -593,7 +593,7 @@ class npc_ferocious_rhino : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -603,7 +603,7 @@ class npc_ferocious_rhino : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -632,7 +632,7 @@ class npc_massive_jormungar : public CreatureScript public: npc_massive_jormungar() : CreatureScript("npc_massive_jormungar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_massive_jormungarAI(creature); } @@ -650,7 +650,7 @@ class npc_massive_jormungar : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiAcidSpitTimer = 3000; uiAcidSplatterTimer = 12000; @@ -667,7 +667,7 @@ class npc_massive_jormungar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -696,7 +696,7 @@ class npc_massive_jormungar : public CreatureScript DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -713,7 +713,7 @@ class npc_massive_jormungar : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -723,7 +723,7 @@ class npc_massive_jormungar : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -737,7 +737,7 @@ class npc_palehoof_orb : public CreatureScript public: npc_palehoof_orb() : CreatureScript("npc_palehoof_orb") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_palehoof_orbAI(creature); } @@ -753,7 +753,7 @@ class npc_palehoof_orb : public CreatureScript uint32 SummonTimer; Phase currentPhase; - void Reset() OVERRIDE + void Reset() override { currentPhase = PHASE_NONE; SummonTimer = 5000; @@ -763,7 +763,7 @@ class npc_palehoof_orb : public CreatureScript me->SetSpeed(MOVE_FLIGHT, 0.5f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (currentPhase == PHASE_NONE) return; @@ -796,7 +796,7 @@ class npc_palehoof_orb : public CreatureScript } else SummonTimer -= diff; } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -825,7 +825,7 @@ class go_palehoof_sphere : public GameObjectScript public: go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index ce77e1e86e2..5dbb1e43dff 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -163,7 +163,7 @@ class boss_skadi : public CreatureScript public: boss_skadi() : CreatureScript("boss_skadi") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_skadiAI(creature); } @@ -193,7 +193,7 @@ class boss_skadi : public CreatureScript CombatPhase Phase; - void Reset() OVERRIDE + void Reset() override { triggersGUID.clear(); @@ -218,7 +218,7 @@ class boss_skadi : public CreatureScript } } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { me->SetCanFly(false); me->Dismount(); @@ -227,7 +227,7 @@ class boss_skadi : public CreatureScript me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -249,7 +249,7 @@ class boss_skadi : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -272,14 +272,14 @@ class boss_skadi : public CreatureScript Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) OVERRIDE + void SummonedCreatureDespawn(Creature* summoned) override { if (summoned->GetEntry() == NPC_GRAUF) m_uiGraufGUID = 0; Summons.Despawn(summoned); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_HARPOON_DAMAGE) { @@ -305,7 +305,7 @@ class boss_skadi : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { switch (Phase) { @@ -410,7 +410,7 @@ class boss_skadi : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); Summons.DespawnAll(); @@ -418,7 +418,7 @@ class boss_skadi : public CreatureScript instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } @@ -471,7 +471,7 @@ class go_harpoon_launcher : public GameObjectScript public: go_harpoon_launcher() : GameObjectScript("go_harpoon_launcher") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 7b35cc05039..afcc58d1c7d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -117,7 +117,7 @@ class boss_svala : public CreatureScript public: boss_svala() : CreatureScript("boss_svala") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_svalaAI(creature); } @@ -153,7 +153,7 @@ class boss_svala : public CreatureScript bool sacrificed; - void Reset() OVERRIDE + void Reset() override { sacrificed = false; SetCombatMovement(true); @@ -177,7 +177,7 @@ class boss_svala : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -188,7 +188,7 @@ class boss_svala : public CreatureScript instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == NPC_RITUAL_CHANNELER) summon->CastSpell(summon, SPELL_SUMMONED_VIS, true); @@ -196,12 +196,12 @@ class boss_svala : public CreatureScript summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who) @@ -223,13 +223,13 @@ class boss_svala : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim != me) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Phase == SACRIFICING) SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); @@ -244,7 +244,7 @@ class boss_svala : public CreatureScript Talk(SAY_DEATH); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override { if (spell->Id == SPELL_RITUAL_STRIKE_EFF_1 && Phase != NORMAL && Phase != SVALADEAD) { @@ -256,7 +256,7 @@ class boss_svala : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Phase == IDLE) return; @@ -458,7 +458,7 @@ class npc_ritual_channeler : public CreatureScript public: npc_ritual_channeler() : CreatureScript("npc_ritual_channeler") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ritual_channelerAI(creature); } @@ -475,7 +475,7 @@ class npc_ritual_channeler : public CreatureScript InstanceScript* instance; uint32 paralyzeTimer; - void Reset() OVERRIDE + void Reset() override { paralyzeTimer = 1600; if (instance) @@ -483,7 +483,7 @@ class npc_ritual_channeler : public CreatureScript DoCast(me, SPELL_SHADOWS_IN_THE_DARK); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -507,7 +507,7 @@ class npc_spectator : public CreatureScript public: npc_spectator() : CreatureScript("npc_spectator") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spectatorAI(creature); } @@ -516,9 +516,9 @@ class npc_spectator : public CreatureScript { npc_spectatorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void MovementInform(uint32 motionType, uint32 pointId) OVERRIDE + void MovementInform(uint32 motionType, uint32 pointId) override { if (motionType == POINT_MOTION_TYPE) { @@ -563,13 +563,13 @@ class spell_paralyze_pinnacle : public SpellScriptLoader unitList.remove_if(RitualTargetCheck(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_paralyze_pinnacle_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_paralyze_pinnacle_SpellScript(); } @@ -587,25 +587,25 @@ class npc_scourge_hulk : public CreatureScript uint32 mightyBlow; uint32 volatileInfection; - void Reset() OVERRIDE + void Reset() override { mightyBlow = urand(4000, 9000); volatileInfection = urand(10000, 14000); killedByRitualStrike = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return type == DATA_INCREDIBLE_HULK ? killedByRitualStrike : 0; } - void DamageTaken(Unit* attacker, uint32 &damage) OVERRIDE + void DamageTaken(Unit* attacker, uint32 &damage) override { if (damage >= me->GetHealth() && attacker->GetEntry() == NPC_SVALA_SORROWGRAVE) killedByRitualStrike = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -635,7 +635,7 @@ class npc_scourge_hulk : public CreatureScript bool killedByRitualStrike; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_scourge_hulkAI(creature); } @@ -646,7 +646,7 @@ class achievement_incredible_hulk : public AchievementCriteriaScript public: achievement_incredible_hulk() : AchievementCriteriaScript("achievement_incredible_hulk") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { return target && target->IsAIEnabled && target->GetAI()->GetData(DATA_INCREDIBLE_HULK); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index afa37794147..3c81cdae515 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -106,7 +106,7 @@ class boss_ymiron : public CreatureScript public: boss_ymiron() : CreatureScript("boss_ymiron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ymironAI(creature); } @@ -160,7 +160,7 @@ class boss_ymiron : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { m_bIsWalking = false; m_bIsPause = false; @@ -192,7 +192,7 @@ class boss_ymiron : public CreatureScript instance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -200,13 +200,13 @@ class boss_ymiron : public CreatureScript instance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); } - void SpellHitTarget(Unit* who, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* who, SpellInfo const* spell) override { if (who && who->GetTypeId() == TypeID::TYPEID_PLAYER && spell->Id == 59302) kingsBane = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_KINGS_BANE) return kingsBane ? 1 : 0; @@ -214,7 +214,7 @@ class boss_ymiron : public CreatureScript return 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (m_bIsWalking) { @@ -372,7 +372,7 @@ class boss_ymiron : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -383,7 +383,7 @@ class boss_ymiron : public CreatureScript instance->SetData(DATA_KING_YMIRON_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } @@ -406,7 +406,7 @@ class achievement_kings_bane : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index a104a8dfa5c..f51c364f8d8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -43,7 +43,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript public: instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_pinnacle(map); } @@ -74,7 +74,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript std::string str_data; - void Initialize() OVERRIDE + void Initialize() override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) m_auiEncounter[i] = NOT_STARTED; @@ -98,7 +98,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript uiSacrificedPlayer = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -107,7 +107,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -124,7 +124,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -147,7 +147,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -173,7 +173,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript SaveToDB(); } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { switch (type) { @@ -183,7 +183,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -195,7 +195,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -216,7 +216,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -230,7 +230,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index ffead2cbacc..02c16b2506a 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -79,7 +79,7 @@ class boss_archavon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); @@ -90,7 +90,7 @@ class boss_archavon : public CreatureScript } // Below UpdateAI may need review/debug. - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -135,7 +135,7 @@ class boss_archavon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_archavonAI(creature); } @@ -157,7 +157,7 @@ class npc_archavon_warder : public CreatureScript EventMap events; - void Reset() OVERRIDE + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_ROCK_SHOWER, 2000); @@ -165,12 +165,12 @@ class npc_archavon_warder : public CreatureScript events.ScheduleEvent(EVENT_WHIRL, 7500); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -206,7 +206,7 @@ class npc_archavon_warder : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_archavon_warderAI(creature); } @@ -222,7 +222,7 @@ class spell_archavon_rock_shards : public SpellScriptLoader { PrepareSpellScript(spell_archavon_rock_shards_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROCK_SHARDS_VISUAL_L) || !sSpellMgr->GetSpellInfo(SPELL_ROCK_SHARDS_VISUAL_R) @@ -246,13 +246,13 @@ class spell_archavon_rock_shards : public SpellScriptLoader caster->CastSpell((Unit*)NULL, SPELL_ROCK_SHARDS_DAMAGE_R, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_archavon_rock_shards_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_archavon_rock_shards_SpellScript(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index bc3016d8e1a..6900fe172a6 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -83,7 +83,7 @@ class boss_emalon : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _Reset(); @@ -91,7 +91,7 @@ class boss_emalon : public CreatureScript me->SummonCreature(NPC_TEMPEST_MINION, TempestMinions[i], TempSummonType::TEMPSUMMON_CORPSE_DESPAWN, 0); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { BossAI::JustSummoned(summoned); @@ -100,7 +100,7 @@ class boss_emalon : public CreatureScript summoned->AI()->AttackStart(me->GetVictim()); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!summons.empty()) { @@ -120,7 +120,7 @@ class boss_emalon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -169,7 +169,7 @@ class boss_emalon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_emalonAI(creature); } @@ -190,13 +190,13 @@ class npc_tempest_minion : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.Reset(); OverchargedTimer = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* emalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { @@ -208,7 +208,7 @@ class npc_tempest_minion : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); @@ -220,7 +220,7 @@ class npc_tempest_minion : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -269,7 +269,7 @@ class npc_tempest_minion : public CreatureScript uint32 OverchargedTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tempest_minionAI(creature); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 97d2b2dd81c..08f5966e31c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -64,7 +64,7 @@ class boss_koralon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_BURNING_FURY); @@ -76,7 +76,7 @@ class boss_koralon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -115,7 +115,7 @@ class boss_koralon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_koralonAI(creature); } @@ -135,12 +135,12 @@ class npc_flame_warder : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); @@ -148,7 +148,7 @@ class npc_flame_warder : public CreatureScript events.ScheduleEvent(EVENT_FW_METEOR_FISTS, 10000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -179,7 +179,7 @@ class npc_flame_warder : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_flame_warderAI(creature); } @@ -194,7 +194,7 @@ class spell_koralon_meteor_fists : public SpellScriptLoader { PrepareAuraScript(spell_koralon_meteor_fists_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_METEOR_FISTS_DAMAGE)) return false; @@ -207,13 +207,13 @@ class spell_koralon_meteor_fists : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_koralon_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_koralon_meteor_fists_AuraScript(); } @@ -228,7 +228,7 @@ class spell_koralon_meteor_fists_damage : public SpellScriptLoader { PrepareSpellScript(spell_koralon_meteor_fists_damage_SpellScript); - bool Load() OVERRIDE + bool Load() override { _chainTargets = 0; return true; @@ -245,7 +245,7 @@ class spell_koralon_meteor_fists_damage : public SpellScriptLoader SetHitDamage(GetHitDamage() / (_chainTargets + 1)); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_koralon_meteor_fists_damage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_TARGET_ENEMY); OnHit += SpellHitFn(spell_koralon_meteor_fists_damage_SpellScript::CalculateSplitDamage); @@ -255,7 +255,7 @@ class spell_koralon_meteor_fists_damage : public SpellScriptLoader uint8 _chainTargets; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_koralon_meteor_fists_damage_SpellScript(); } @@ -270,7 +270,7 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader { PrepareAuraScript(spell_flame_warder_meteor_fists_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FW_METEOR_FISTS_DAMAGE)) return false; @@ -283,13 +283,13 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_flame_warder_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_flame_warder_meteor_fists_AuraScript(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index b71895c365b..72b39da955c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -67,7 +67,7 @@ class boss_toravon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_FROZEN_MALLET); @@ -78,7 +78,7 @@ class boss_toravon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -114,7 +114,7 @@ class boss_toravon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_toravonAI(creature); } @@ -132,12 +132,12 @@ class npc_frost_warder : public CreatureScript { npc_frost_warderAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { events.Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); @@ -146,7 +146,7 @@ class npc_frost_warder : public CreatureScript events.ScheduleEvent(EVENT_FROST_BLAST, 5000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -169,7 +169,7 @@ class npc_frost_warder : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frost_warderAI(creature); } @@ -189,18 +189,18 @@ class npc_frozen_orb : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { done = false; killTimer = 60000; // if after this time there is no victim -> destroy! } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!done) { @@ -224,7 +224,7 @@ class npc_frozen_orb : public CreatureScript bool done; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frozen_orbAI(creature); } @@ -252,7 +252,7 @@ class npc_frozen_orb_stalker : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (spawned) return; @@ -277,7 +277,7 @@ class npc_frozen_orb_stalker : public CreatureScript bool spawned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frozen_orb_stalkerAI(creature); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 7b91ef3e6fb..6182203d93f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -47,7 +47,7 @@ class instance_vault_of_archavon : public InstanceMapScript KoralonDeath = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -62,7 +62,7 @@ class instance_vault_of_archavon : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -77,7 +77,7 @@ class instance_vault_of_archavon : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -106,7 +106,7 @@ class instance_vault_of_archavon : public InstanceMapScript return true; } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) OVERRIDE + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { switch (criteria_id) { @@ -136,7 +136,7 @@ class instance_vault_of_archavon : public InstanceMapScript time_t KoralonDeath; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_vault_of_archavon_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index d40701156f5..50e6c18c094 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -51,7 +51,7 @@ class boss_cyanigosa : public CreatureScript public: boss_cyanigosa() : CreatureScript("boss_cyanigosa") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_cyanigosaAI(creature); } @@ -71,7 +71,7 @@ class boss_cyanigosa : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiArcaneVacuumTimer = 10000; uiBlizzardTimer = 15000; @@ -82,7 +82,7 @@ class boss_cyanigosa : public CreatureScript instance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -90,10 +90,10 @@ class boss_cyanigosa : public CreatureScript instance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance && instance->GetData(DATA_REMOVE_NPC) == 1) { @@ -143,7 +143,7 @@ class boss_cyanigosa : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -151,7 +151,7 @@ class boss_cyanigosa : public CreatureScript instance->SetData(DATA_CYANIGOSA_EVENT, DONE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -168,7 +168,7 @@ class achievement_defenseless : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 6887763ff2e..22a48ae92ed 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -50,7 +50,7 @@ class boss_erekem : public CreatureScript public: boss_erekem() : CreatureScript("boss_erekem") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_erekemAI(creature); } @@ -70,7 +70,7 @@ class boss_erekem : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiBloodlustTimer = 15000; uiChainHealTimer = 0; @@ -97,7 +97,7 @@ class boss_erekem : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -124,7 +124,7 @@ class boss_erekem : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); DoCast(me, SPELL_EARTH_SHIELD); @@ -145,10 +145,10 @@ class boss_erekem : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -209,7 +209,7 @@ class boss_erekem : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -228,7 +228,7 @@ class boss_erekem : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -266,7 +266,7 @@ class npc_erekem_guard : public CreatureScript public: npc_erekem_guard() : CreatureScript("npc_erekem_guard") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_erekem_guardAI(creature); } @@ -284,14 +284,14 @@ class npc_erekem_guard : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiStrikeTimer = urand(4000, 8000); uiHowlingScreechTimer = urand(8000, 13000); uiGushingWoundTimer = urand(1000, 3000); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -305,10 +305,10 @@ class npc_erekem_guard : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 1f1c00a2562..874cdfbc452 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -79,7 +79,7 @@ class boss_ichoron : public CreatureScript public: boss_ichoron() : CreatureScript("boss_ichoron") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_ichoronAI(creature); } @@ -102,7 +102,7 @@ class boss_ichoron : public CreatureScript SummonList m_waterElements; - void Reset() OVERRIDE + void Reset() override { bIsExploded = false; bIsFrenzy = false; @@ -122,7 +122,7 @@ class boss_ichoron : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -143,7 +143,7 @@ class boss_ichoron : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -157,7 +157,7 @@ class boss_ichoron : public CreatureScript } } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { if (!me->IsAlive()) return; @@ -201,7 +201,7 @@ class boss_ichoron : public CreatureScript me->GetMotionMaster()->MoveChase(me->GetVictim()); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_DEHYDRATION) return dehydration ? 1 : 0; @@ -209,10 +209,10 @@ class boss_ichoron : public CreatureScript return 0; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -280,7 +280,7 @@ class boss_ichoron : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -307,7 +307,7 @@ class boss_ichoron : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned) { @@ -318,7 +318,7 @@ class boss_ichoron : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summoned) OVERRIDE + void SummonedCreatureDespawn(Creature* summoned) override { if (summoned) { @@ -327,7 +327,7 @@ class boss_ichoron : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -342,7 +342,7 @@ class npc_ichor_globule : public CreatureScript public: npc_ichor_globule() : CreatureScript("npc_ichor_globule") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ichor_globuleAI(creature); } @@ -358,18 +358,18 @@ class npc_ichor_globule : public CreatureScript uint32 uiRangeCheck_Timer; - void Reset() OVERRIDE + void Reset() override { uiRangeCheck_Timer = 1000; DoCast(me, SPELL_WATER_GLOBULE); } - void AttackStart(Unit* /*who*/) OVERRIDE + void AttackStart(Unit* /*who*/) override { return; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (uiRangeCheck_Timer < uiDiff) { @@ -390,7 +390,7 @@ class npc_ichor_globule : public CreatureScript else uiRangeCheck_Timer -= uiDiff; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { DoCast(me, SPELL_SPLASH); if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON))) @@ -407,7 +407,7 @@ class achievement_dehydration : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 1e74926400a..8ad0e2f3dda 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -38,7 +38,7 @@ class boss_lavanthor : public CreatureScript public: boss_lavanthor() : CreatureScript("boss_lavanthor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lavanthorAI(creature); } @@ -57,7 +57,7 @@ class boss_lavanthor : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiFireboltTimer = 1000; uiFlameBreathTimer = 5000; @@ -72,7 +72,7 @@ class boss_lavanthor : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) { @@ -89,7 +89,7 @@ class boss_lavanthor : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -103,10 +103,10 @@ class boss_lavanthor : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -142,7 +142,7 @@ class boss_lavanthor : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 4f6d27eedaa..328490a0545 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -34,7 +34,7 @@ class boss_moragg : public CreatureScript public: boss_moragg() : CreatureScript("boss_moragg") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_moraggAI(creature); } @@ -51,7 +51,7 @@ class boss_moragg : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiOpticLinkTimer = 10000; uiCorrosiveSalivaTimer = 5000; @@ -65,7 +65,7 @@ class boss_moragg : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) { @@ -82,7 +82,7 @@ class boss_moragg : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -96,10 +96,10 @@ class boss_moragg : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -120,7 +120,7 @@ class boss_moragg : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 4a8ee1768fc..8ce6202d33a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -64,7 +64,7 @@ class boss_xevozz : public CreatureScript public: boss_xevozz() : CreatureScript("boss_xevozz") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_xevozzAI(creature); } @@ -82,7 +82,7 @@ class boss_xevozz : public CreatureScript uint32 uiArcaneBarrageVolley_Timer; uint32 uiArcaneBuffet_Timer; - void Reset() OVERRIDE + void Reset() override { if (instance) { @@ -113,7 +113,7 @@ class boss_xevozz : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->SetSpeed(MOVE_RUN, 0.5f); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -123,7 +123,7 @@ class boss_xevozz : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -137,7 +137,7 @@ class boss_xevozz : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) @@ -155,10 +155,10 @@ class boss_xevozz : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) @@ -196,7 +196,7 @@ class boss_xevozz : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -216,7 +216,7 @@ class boss_xevozz : public CreatureScript } } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -231,7 +231,7 @@ class npc_ethereal_sphere : public CreatureScript public: npc_ethereal_sphere() : CreatureScript("npc_ethereal_sphere") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ethereal_sphereAI(creature); } @@ -248,13 +248,13 @@ class npc_ethereal_sphere : public CreatureScript uint32 uiSummonPlayers_Timer; uint32 uiRangeCheck_Timer; - void Reset() OVERRIDE + void Reset() override { uiSummonPlayers_Timer = urand(33000, 35000); uiRangeCheck_Timer = 1000; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 1f8fa14cdfc..b0b7ee7acb3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -59,7 +59,7 @@ class boss_zuramat : public CreatureScript public: boss_zuramat() : CreatureScript("boss_zuramat") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_zuramatAI(creature); } @@ -78,7 +78,7 @@ class boss_zuramat : public CreatureScript uint32 SpellShroudOfDarknessTimer; bool voidDance; - void Reset() OVERRIDE + void Reset() override { if (instance) { @@ -94,7 +94,7 @@ class boss_zuramat : public CreatureScript voidDance = true; } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -108,7 +108,7 @@ class boss_zuramat : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); if (instance) @@ -126,10 +126,10 @@ class boss_zuramat : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -157,13 +157,13 @@ class boss_zuramat : public CreatureScript DoMeleeAttackIfReady(); } - void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) OVERRIDE + void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) override { if (summoned->GetEntry() == NPC_VOID_SENTRY) voidDance = false; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_VOID_DANCE) return voidDance ? 1 : 0; @@ -171,7 +171,7 @@ class boss_zuramat : public CreatureScript return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -190,7 +190,7 @@ class boss_zuramat : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -198,7 +198,7 @@ class boss_zuramat : public CreatureScript Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->AI()->AttackStart(me->GetVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); @@ -212,7 +212,7 @@ class achievement_void_dance : public AchievementCriteriaScript public: achievement_void_dance() : AchievementCriteriaScript("achievement_void_dance") { } - bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*player*/, Unit* target) override { if (!target) return false; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 885d987f512..e1ed73a1066 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -108,7 +108,7 @@ class instance_violet_hold : public InstanceMapScript public: instance_violet_hold() : InstanceMapScript("instance_violet_hold", 608) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_violet_hold_InstanceMapScript(map); } @@ -171,7 +171,7 @@ class instance_violet_hold : public InstanceMapScript std::string str_data; - void Initialize() OVERRIDE + void Initialize() override { uiMoragg = 0; uiErekem = 0; @@ -221,7 +221,7 @@ class instance_violet_hold : public InstanceMapScript memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -230,7 +230,7 @@ class instance_violet_hold : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -275,7 +275,7 @@ class instance_violet_hold : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -313,7 +313,7 @@ class instance_violet_hold : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -411,7 +411,7 @@ class instance_violet_hold : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { switch (type) { @@ -424,7 +424,7 @@ class instance_violet_hold : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -445,7 +445,7 @@ class instance_violet_hold : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -621,7 +621,7 @@ class instance_violet_hold : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -638,7 +638,7 @@ class instance_violet_hold : public InstanceMapScript return str_data; } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -687,7 +687,7 @@ class instance_violet_hold : public InstanceMapScript return true; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (!instance->HavePlayers()) return; @@ -826,7 +826,7 @@ class instance_violet_hold : public InstanceMapScript } } - void ProcessEvent(WorldObject* /*go*/, uint32 uiEventId) OVERRIDE + void ProcessEvent(WorldObject* /*go*/, uint32 uiEventId) override { switch (uiEventId) { diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 8a6709b4cda..0961e8813c0 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -263,7 +263,7 @@ class npc_sinclari_vh : public CreatureScript public: npc_sinclari_vh() : CreatureScript("npc_sinclari_vh") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -285,7 +285,7 @@ class npc_sinclari_vh : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -308,7 +308,7 @@ class npc_sinclari_vh : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sinclariAI(creature); } @@ -325,7 +325,7 @@ class npc_sinclari_vh : public CreatureScript uint8 uiPhase; uint32 uiTimer; - void Reset() OVERRIDE + void Reset() override { uiPhase = 0; uiTimer = 0; @@ -349,7 +349,7 @@ class npc_sinclari_vh : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { ScriptedAI::UpdateAI(uiDiff); @@ -428,7 +428,7 @@ class npc_azure_saboteur : public CreatureScript public: npc_azure_saboteur() : CreatureScript("npc_azure_saboteur") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_saboteurAI(creature); } @@ -447,7 +447,7 @@ class npc_azure_saboteur : public CreatureScript bool bHasGotMovingPoints; uint32 uiBoss; - void Reset() OVERRIDE + void Reset() override { if (instance && !uiBoss) uiBoss = instance->GetData(DATA_WAVE_COUNT) == 6 ? instance->GetData(DATA_FIRST_BOSS) : instance->GetData(DATA_SECOND_BOSS); @@ -456,7 +456,7 @@ class npc_azure_saboteur : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (uiBoss) { @@ -487,7 +487,7 @@ class npc_azure_saboteur : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); @@ -551,7 +551,7 @@ class npc_teleportation_portal_vh : public CreatureScript public: npc_teleportation_portal_vh() : CreatureScript("npc_teleportation_portal_vh") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_teleportation_portalAI(creature); } @@ -573,18 +573,18 @@ class npc_teleportation_portal_vh : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { uiSpawnTimer = 10000; bPortalGuardianOrKeeperOrEliteSpawn = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) //Massive usage of instance, global check return; @@ -659,20 +659,20 @@ class npc_teleportation_portal_vh : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_WAVE_COUNT, instance->GetData(DATA_WAVE_COUNT)+1); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { listOfMobs.Summon(summoned); if (instance) instance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); } - void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) override { listOfMobs.Despawn(summoned); if (instance) @@ -698,7 +698,7 @@ struct violet_hold_trashAI : public npc_escortAI uint32 portalLocationID; uint32 secondPortalRouteID; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (portalLocationID) { @@ -729,7 +729,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void UpdateAI(uint32) OVERRIDE + void UpdateAI(uint32) override { if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); @@ -786,7 +786,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1); @@ -806,7 +806,7 @@ class npc_azure_invader : public CreatureScript public: npc_azure_invader() : CreatureScript("npc_azure_invader") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_invaderAI(creature); } @@ -823,7 +823,7 @@ class npc_azure_invader : public CreatureScript uint32 uiBrutalStrikeTimer; uint32 uiSunderArmorTimer; - void Reset() OVERRIDE + void Reset() override { uiCleaveTimer = 5000; uiImpaleTimer = 4000; @@ -831,7 +831,7 @@ class npc_azure_invader : public CreatureScript uiSunderArmorTimer = 4000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -883,7 +883,7 @@ class npc_azure_binder : public CreatureScript public: npc_azure_binder() : CreatureScript("npc_azure_binder") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_binderAI(creature); } @@ -900,7 +900,7 @@ class npc_azure_binder : public CreatureScript uint32 uiFrostNovaTimer; uint32 uiFrostboltTimer; - void Reset() OVERRIDE + void Reset() override { uiArcaneExplosionTimer = 5000; uiArcainBarrageTimer = 4000; @@ -908,7 +908,7 @@ class npc_azure_binder : public CreatureScript uiFrostboltTimer = 4000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -960,7 +960,7 @@ class npc_azure_mage_slayer : public CreatureScript public: npc_azure_mage_slayer() : CreatureScript("npc_azure_mage_slayer") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_mage_slayerAI(creature); } @@ -975,13 +975,13 @@ class npc_azure_mage_slayer : public CreatureScript uint32 uiArcaneEmpowermentTimer; uint32 uiSpellLockTimer; - void Reset() OVERRIDE + void Reset() override { uiArcaneEmpowermentTimer = 5000; uiSpellLockTimer = 5000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1019,7 +1019,7 @@ class npc_azure_raider : public CreatureScript public: npc_azure_raider() : CreatureScript("npc_azure_raider") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_raiderAI(creature); } @@ -1034,13 +1034,13 @@ class npc_azure_raider : public CreatureScript uint32 uiConcussionBlowTimer; uint32 uiMagicReflectionTimer; - void Reset() OVERRIDE + void Reset() override { uiConcussionBlowTimer = 5000; uiMagicReflectionTimer = 8000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1077,14 +1077,14 @@ class npc_azure_stalker : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _backstabTimer = 1300; _tacticalBlinkTimer = 8000; _tacticalBlinkCast =false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1124,7 +1124,7 @@ class npc_azure_stalker : public CreatureScript bool _tacticalBlinkCast; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_stalkerAI(creature); } @@ -1147,7 +1147,7 @@ class npc_azure_spellbreaker : public CreatureScript uint32 uiChainsOfIceTimer; uint32 uiConeOfColdTimer; - void Reset() OVERRIDE + void Reset() override { uiArcaneBlastTimer = 5000; uiSlowTimer = 4000; @@ -1155,7 +1155,7 @@ class npc_azure_spellbreaker : public CreatureScript uiConeOfColdTimer = 4000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1203,7 +1203,7 @@ class npc_azure_spellbreaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_spellbreakerAI(creature); } @@ -1214,7 +1214,7 @@ class npc_azure_captain : public CreatureScript public: npc_azure_captain() : CreatureScript("npc_azure_captain") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_captainAI(creature); } @@ -1229,13 +1229,13 @@ class npc_azure_captain : public CreatureScript uint32 uiMortalStrikeTimer; uint32 uiWhirlwindTimer; - void Reset() OVERRIDE + void Reset() override { uiMortalStrikeTimer = 5000; uiWhirlwindTimer = 8000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1265,7 +1265,7 @@ class npc_azure_sorceror : public CreatureScript public: npc_azure_sorceror() : CreatureScript("npc_azure_sorceror") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_azure_sorcerorAI(creature); } @@ -1281,14 +1281,14 @@ class npc_azure_sorceror : public CreatureScript uint32 uiArcaneStreamTimerStartingValueHolder; uint32 uiManaDetonationTimer; - void Reset() OVERRIDE + void Reset() override { uiArcaneStreamTimer = 4000; uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer; uiManaDetonationTimer = 5000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1328,7 +1328,7 @@ class npc_violet_hold_arcane_sphere : public CreatureScript uint32 DespawnTimer; - void Reset() OVERRIDE + void Reset() override { DespawnTimer = 3000; @@ -1336,9 +1336,9 @@ class npc_violet_hold_arcane_sphere : public CreatureScript DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit * /*who*/) OVERRIDE { } + void EnterCombat(Unit * /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (DespawnTimer <= diff) me->Kill(me); @@ -1347,7 +1347,7 @@ class npc_violet_hold_arcane_sphere : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_violet_hold_arcane_sphereAI(creature); } @@ -1358,7 +1358,7 @@ class go_activation_crystal : public GameObjectScript public: go_activation_crystal() : GameObjectScript("go_activation_crystal") { } - bool OnGossipHello(Player * /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player * /*player*/, GameObject* go) override { go->EventInform(EVENT_ACTIVATE_CRYSTAL); return false; diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index f967148ee39..dbb9b866edc 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -36,7 +36,7 @@ class npc_four_car_garage : public CreatureScript { npc_four_car_garageAI(Creature* creature) : NullCreatureAI(creature) { } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { if (apply) { @@ -67,7 +67,7 @@ class npc_four_car_garage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_four_car_garageAI(creature); } diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 79ac1837319..4efe2e512b8 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -72,14 +72,14 @@ class npc_sinkhole_kill_credit : public CreatureScript uint8 phase; uint64 casterGuid; - void Reset() OVERRIDE + void Reset() override { phaseTimer = 500; phase = 0; casterGuid = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (phase || spell->Id != SPELL_SET_CART) return; @@ -92,9 +92,9 @@ class npc_sinkhole_kill_credit : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!phase) return; @@ -158,7 +158,7 @@ class npc_sinkhole_kill_credit : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_sinkhole_kill_creditAI(creature); } @@ -177,7 +177,7 @@ class npc_khunok_the_behemoth : public CreatureScript { npc_khunok_the_behemothAI(Creature* creature) : ScriptedAI(creature) { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); @@ -199,7 +199,7 @@ class npc_khunok_the_behemoth : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_khunok_the_behemothAI(creature); } @@ -221,7 +221,7 @@ class npc_keristrasza : public CreatureScript public: npc_keristrasza() : CreatureScript("npc_keristrasza") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -234,7 +234,7 @@ class npc_keristrasza : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -267,7 +267,7 @@ class npc_corastrasza : public CreatureScript public: npc_corastrasza() : CreatureScript("npc_corastrasza") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -279,7 +279,7 @@ class npc_corastrasza : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -311,7 +311,7 @@ class npc_iruk : public CreatureScript public: npc_iruk() : CreatureScript("npc_iruk") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_SPIRITS_WATCH_OVER_US) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -320,7 +320,7 @@ class npc_iruk : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -354,12 +354,12 @@ class npc_nerubar_victim : public CreatureScript { npc_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Player* player = killer->ToPlayer(); if (!player) @@ -379,7 +379,7 @@ class npc_nerubar_victim : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nerubar_victimAI(creature); } @@ -412,7 +412,7 @@ class npc_jenny : public CreatureScript bool setCrateNumber; - void Reset() OVERRIDE + void Reset() override { if (!setCrateNumber) setCrateNumber = true; @@ -431,12 +431,12 @@ class npc_jenny : public CreatureScript } } - void DamageTaken(Unit* /*pDone_by*/, uint32& /*uiDamage*/) OVERRIDE + void DamageTaken(Unit* /*pDone_by*/, uint32& /*uiDamage*/) override { DoCast(me, SPELL_DROP_CRATE, true); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (setCrateNumber) { @@ -452,7 +452,7 @@ class npc_jenny : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_jennyAI(creature); } @@ -471,7 +471,7 @@ class npc_fezzix_geartwist : public CreatureScript { npc_fezzix_geartwistAI(Creature* creature) : ScriptedAI(creature) { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); @@ -492,7 +492,7 @@ class npc_fezzix_geartwist : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fezzix_geartwistAI(creature); } @@ -546,7 +546,7 @@ class npc_nesingwary_trapper : public CreatureScript uint8 phase; uint32 phaseTimer; - void Reset() OVERRIDE + void Reset() override { me->SetVisible(false); phaseTimer = 2500; @@ -554,11 +554,11 @@ class npc_nesingwary_trapper : public CreatureScript go_caribouGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(LootState::GO_JUST_DEACTIVATED); @@ -573,7 +573,7 @@ class npc_nesingwary_trapper : public CreatureScript go_caribou->SetGoState(GOState::GO_STATE_READY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (phaseTimer <= diff) { @@ -637,7 +637,7 @@ class npc_nesingwary_trapper : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nesingwary_trapperAI(creature); } @@ -674,7 +674,7 @@ class npc_lurgglbr : public CreatureScript uint32 IntroTimer; uint32 IntroPhase; - void Reset() OVERRIDE + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -683,7 +683,7 @@ class npc_lurgglbr : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -698,7 +698,7 @@ class npc_lurgglbr : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IntroPhase) { @@ -754,12 +754,12 @@ class npc_lurgglbr : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lurgglbrAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS) { @@ -822,18 +822,18 @@ class npc_nexus_drake_hatchling : public CreatureScript uint64 HarpoonerGUID; bool WithRedDragonBlood; - void Reset() OVERRIDE + void Reset() override { WithRedDragonBlood = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->IsValidAttackTarget(who)) AttackStart(who); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_DRAKE_HARPOON && caster->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -843,7 +843,7 @@ class npc_nexus_drake_hatchling : public CreatureScript WithRedDragonBlood = true; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { FollowerAI::MoveInLineOfSight(who); @@ -867,7 +867,7 @@ class npc_nexus_drake_hatchling : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD)) { @@ -897,7 +897,7 @@ class npc_nexus_drake_hatchling : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nexus_drake_hatchlingAI(creature); } @@ -971,7 +971,7 @@ class npc_thassarian : public CreatureScript uint32 phase; uint32 phaseTimer; - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); me->RemoveStandFlags(UNIT_STAND_STATE_SIT); @@ -990,7 +990,7 @@ class npc_thassarian : public CreatureScript phaseTimer = 0; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -1023,7 +1023,7 @@ class npc_thassarian : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -1201,7 +1201,7 @@ class npc_thassarian : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* talbot = me->GetCreature(*me, talbotGUID)) talbot->RemoveFromWorld(); @@ -1217,7 +1217,7 @@ class npc_thassarian : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1230,7 +1230,7 @@ class npc_thassarian : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -1243,7 +1243,7 @@ class npc_thassarian : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_thassarianAI(creature); } @@ -1262,12 +1262,12 @@ class npc_image_lich_king : public CreatureScript { npc_image_lich_kingAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } - void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 uiType, uint32 /*uiId*/) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1278,7 +1278,7 @@ class npc_image_lich_king : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_image_lich_kingAI(creature); } @@ -1297,7 +1297,7 @@ class npc_general_arlos : public CreatureScript { npc_general_arlosAI(Creature* creature) : ScriptedAI(creature) { } - void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 uiType, uint32 /*uiId*/) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1310,7 +1310,7 @@ class npc_general_arlos : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_general_arlosAI(creature); } @@ -1347,7 +1347,7 @@ class npc_counselor_talbot : public CreatureScript uint32 deflectionTimer; uint32 soulBlastTimer; - void Reset() OVERRIDE + void Reset() override { leryssaGUID = 0; arlosGUID = 0; @@ -1356,7 +1356,7 @@ class npc_counselor_talbot : public CreatureScript deflectionTimer = urand(20000, 25000); soulBlastTimer = urand(12000, 18000); } - void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 uiType, uint32 /*uiId*/) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1366,7 +1366,7 @@ class npc_counselor_talbot : public CreatureScript CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->talbotInPosition = true; } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (bCheck) { @@ -1404,7 +1404,7 @@ class npc_counselor_talbot : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (!leryssaGUID || !arlosGUID) return; @@ -1428,7 +1428,7 @@ class npc_counselor_talbot : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_counselor_talbotAI(creature); } @@ -1459,7 +1459,7 @@ class npc_leryssa : public CreatureScript uint32 phase; uint32 phaseTimer; - void MovementInform(uint32 type, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*uiId*/) override { if (type != POINT_MOTION_TYPE) return; @@ -1488,7 +1488,7 @@ class npc_leryssa : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { ScriptedAI::UpdateAI(uiDiff); @@ -1557,7 +1557,7 @@ class npc_leryssa : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_leryssaAI(creature); } @@ -1588,19 +1588,19 @@ class npc_beryl_sorcerer : public CreatureScript bool bEnslaved; - void Reset() OVERRIDE + void Reset() override { me->SetReactState(REACT_AGGRESSIVE); bEnslaved = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->IsValidAttackTarget(who)) AttackStart(who); } - void SpellHit(Unit* pCaster, const SpellInfo* pSpell) OVERRIDE + void SpellHit(Unit* pCaster, const SpellInfo* pSpell) override { if (pSpell->Id == SPELL_ARCANE_CHAINS && pCaster->GetTypeId() == TypeID::TYPEID_PLAYER && !HealthAbovePct(50) && !bEnslaved) { @@ -1617,7 +1617,7 @@ class npc_beryl_sorcerer : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { FollowerAI::MoveInLineOfSight(who); @@ -1629,7 +1629,7 @@ class npc_beryl_sorcerer : public CreatureScript } } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE + void UpdateAI(uint32 /*uiDiff*/) override { if (!UpdateVictim()) return; @@ -1638,7 +1638,7 @@ class npc_beryl_sorcerer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_beryl_sorcererAI(creature); } @@ -1673,7 +1673,7 @@ class npc_imprisoned_beryl_sorcerer : public CreatureScript uint32 rebuff; - void Reset() OVERRIDE + void Reset() override { if (me->GetReactState() != REACT_PASSIVE) me->SetReactState(REACT_PASSIVE); @@ -1681,7 +1681,7 @@ class npc_imprisoned_beryl_sorcerer : public CreatureScript rebuff = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { UpdateVictim(); @@ -1699,11 +1699,11 @@ class npc_imprisoned_beryl_sorcerer : public CreatureScript DoMeleeAttackIfReady(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* unit, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* unit, const SpellInfo* spell) override { if (spell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -1748,7 +1748,7 @@ class npc_imprisoned_beryl_sorcerer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_imprisoned_beryl_sorcererAI(creature); } @@ -1774,7 +1774,7 @@ class npc_mootoo_the_younger : public CreatureScript public: npc_mootoo_the_younger() : CreatureScript("npc_mootoo_the_younger") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPING_THE_MIST) { @@ -1798,18 +1798,18 @@ class npc_mootoo_the_younger : public CreatureScript { npc_mootoo_the_youngerAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE + void Reset() override { SetDespawnAtFar(false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player=GetPlayerForEscort()) player->FailQuest(QUEST_ESCAPING_THE_MIST); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -1840,7 +1840,7 @@ class npc_mootoo_the_younger : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mootoo_the_youngerAI(creature); } @@ -1864,7 +1864,7 @@ class npc_bonker_togglevolt : public CreatureScript public: npc_bonker_togglevolt() : CreatureScript("npc_bonker_togglevolt") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_GET_ME_OUTA_HERE) { @@ -1880,19 +1880,19 @@ class npc_bonker_togglevolt : public CreatureScript npc_bonker_togglevoltAI(Creature* creature) : npc_escortAI(creature) { } uint32 Bonker_agro; - void Reset() OVERRIDE + void Reset() override { Bonker_agro=0; SetDespawnAtFar(false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_GET_ME_OUTA_HERE); } - void UpdateEscortAI(const uint32 /*diff*/) OVERRIDE + void UpdateEscortAI(const uint32 /*diff*/) override { if (GetAttack() && UpdateVictim()) { @@ -1906,7 +1906,7 @@ class npc_bonker_togglevolt : public CreatureScript else Bonker_agro=0; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -1921,7 +1921,7 @@ class npc_bonker_togglevolt : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bonker_togglevoltAI(creature); } @@ -1980,7 +1980,7 @@ class npc_trapped_mammoth_calf : public CreatureScript uint32 uiTimer; bool bStarted; - void Reset() OVERRIDE + void Reset() override { uiTimer = 1500; bStarted = false; @@ -1997,7 +1997,7 @@ class npc_trapped_mammoth_calf : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bStarted) { @@ -2012,13 +2012,13 @@ class npc_trapped_mammoth_calf : public CreatureScript } } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { if (param == 1) bStarted = true; } - void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 uiType, uint32 /*uiId*/) override { if (uiType != POINT_MOTION_TYPE) return; @@ -2038,7 +2038,7 @@ class npc_trapped_mammoth_calf : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_trapped_mammoth_calfAI(creature); } @@ -2066,7 +2066,7 @@ class npc_magmoth_crusher : public CreatureScript { npc_magmoth_crusherAI(Creature* creature) : ScriptedAI(creature) { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Player* player = killer->ToPlayer(); if (!player) @@ -2083,7 +2083,7 @@ class npc_magmoth_crusher : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_magmoth_crusherAI(creature); } @@ -2113,12 +2113,12 @@ class npc_seaforium_depth_charge : public CreatureScript uint32 uiExplosionTimer; - void Reset() OVERRIDE + void Reset() override { uiExplosionTimer = urand(5000, 10000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (uiExplosionTimer < diff) { @@ -2141,7 +2141,7 @@ class npc_seaforium_depth_charge : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_seaforium_depth_chargeAI(creature); } @@ -2168,12 +2168,12 @@ class npc_valiance_keep_cannoneer : public CreatureScript uint32 uiTimer; - void Reset() OVERRIDE + void Reset() override { uiTimer = urand(13000, 18000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (uiTimer <= diff) { @@ -2192,7 +2192,7 @@ class npc_valiance_keep_cannoneer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_valiance_keep_cannoneerAI(creature); } @@ -2226,16 +2226,16 @@ class npc_warmage_coldarra : public CreatureScript uint32 m_uiTimer; //Timer until recast - void Reset() OVERRIDE + void Reset() override { m_uiTimer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (m_uiTimer <= uiDiff) { @@ -2297,7 +2297,7 @@ class npc_warmage_coldarra : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_warmage_coldarraAI(creature); } @@ -2353,7 +2353,7 @@ class npc_hidden_cultist : public CreatureScript uint64 uiPlayerGUID; - void Reset() OVERRIDE + void Reset() override { if (uiEmoteState) me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, uiEmoteState); @@ -2371,7 +2371,7 @@ class npc_hidden_cultist : public CreatureScript me->RestoreFaction(); } - void DoAction(int32 /*iParam*/) OVERRIDE + void DoAction(int32 /*iParam*/) override { me->StopMoving(); me->SetUInt32Value(UNIT_FIELD_NPC_FLAGS, 0); @@ -2381,7 +2381,7 @@ class npc_hidden_cultist : public CreatureScript uiEventPhase = 1; } - void SetGUID(uint64 uiGuid, int32 /*iId*/) OVERRIDE + void SetGUID(uint64 uiGuid, int32 /*iId*/) override { uiPlayerGUID = uiGuid; } @@ -2393,7 +2393,7 @@ class npc_hidden_cultist : public CreatureScript me->AI()->AttackStart(player); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (uiEventTimer && uiEventTimer <= uiDiff) { @@ -2454,12 +2454,12 @@ class npc_hidden_cultist : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hidden_cultistAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { uint32 uiGossipText = 0; const char* charGossipItem; @@ -2494,7 +2494,7 @@ class npc_hidden_cultist : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index 8942fe9ffd2..bbaf6a5aade 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -61,12 +61,12 @@ class npc_warmage_violetstand : public CreatureScript uint64 uiTargetGUID; - void Reset() OVERRIDE + void Reset() override { uiTargetGUID = 0; } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE + void UpdateAI(uint32 /*uiDiff*/) override { if (me->IsNonMeleeSpellCasted(false)) return; @@ -106,7 +106,7 @@ class npc_warmage_violetstand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_warmage_violetstandAI(creature); } diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 5ab403acfd2..b6f10b172bb 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -67,13 +67,13 @@ class npc_mageguard_dalaran : public CreatureScript creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void Reset()OVERRIDE { } + void Reset()override { } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void AttackStart(Unit* /*who*/)OVERRIDE { } + void AttackStart(Unit* /*who*/)override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || !who->IsInWorld() || who->GetZoneId() != 4395) @@ -121,10 +121,10 @@ class npc_mageguard_dalaran : public CreatureScript return; } - void UpdateAI(uint32 /*diff*/)OVERRIDE { } + void UpdateAI(uint32 /*diff*/)override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mageguard_dalaranAI(creature); } diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 6204ed4ee45..e578208cbe9 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -56,7 +56,7 @@ class npc_alexstrasza_wr_gate : public CreatureScript public: npc_alexstrasza_wr_gate() : CreatureScript("npc_alexstrasza_wr_gate") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -68,7 +68,7 @@ class npc_alexstrasza_wr_gate : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -134,13 +134,13 @@ class spell_q12096_q12092_dummy : public SpellScriptLoader // Strengthen the Anc } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12096_q12092_dummy_SpellScript(); } @@ -166,13 +166,13 @@ class spell_q12096_q12092_bark : public SpellScriptLoader // Bark of the Walkers lothalor->DespawnOrUnsummon(4000); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_bark_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12096_q12092_bark_SpellScript(); } @@ -209,7 +209,7 @@ class npc_wyrmrest_defender : public CreatureScript public: npc_wyrmrest_defender() : CreatureScript("npc_wyrmrest_defender") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_DEFENDING_WYRMREST_TEMPLE) == QUEST_STATUS_INCOMPLETE) { @@ -222,7 +222,7 @@ class npc_wyrmrest_defender : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -245,7 +245,7 @@ class npc_wyrmrest_defender : public CreatureScript uint32 RenewRecoveryChecker; - void Reset() OVERRIDE + void Reset() override { hpWarningReady = true; renewRecoveryCanCheck = false; @@ -253,7 +253,7 @@ class npc_wyrmrest_defender : public CreatureScript RenewRecoveryChecker = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Check system for Health Warning should happen first time whenever get under 30%, // after it should be able to happen only after recovery of last renew is fully done (20 sec), @@ -275,7 +275,7 @@ class npc_wyrmrest_defender : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch (spell->Id) { @@ -299,7 +299,7 @@ class npc_wyrmrest_defender : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wyrmrest_defenderAI(creature); } diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 45656c64de2..6035f424ec1 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -66,7 +66,7 @@ class npc_emily : public CreatureScript { npc_emilyAI(Creature* creature) : npc_escortAI(creature) { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 50.0f)) summoned->AI()->AttackStart(Mrfloppy); @@ -74,7 +74,7 @@ class npc_emily : public CreatureScript summoned->AI()->AttackStart(me->GetVictim()); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -175,12 +175,12 @@ class npc_emily : public CreatureScript } } - void EnterCombat(Unit* /*Who*/) OVERRIDE + void EnterCombat(Unit* /*Who*/) override { Talk(SAY_RANDOMAGGRO); } - void Reset() OVERRIDE + void Reset() override { _mrfloppyGUID = 0; _RavenousworgGUID = 0; @@ -191,7 +191,7 @@ class npc_emily : public CreatureScript uint64 _mrfloppyGUID; }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_PERILOUS_ADVENTURE) { @@ -205,7 +205,7 @@ class npc_emily : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_emilyAI(creature); } @@ -221,9 +221,9 @@ class npc_mrfloppy : public CreatureScript { npc_mrfloppyAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* Who) OVERRIDE + void EnterCombat(Unit* Who) override { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { @@ -241,19 +241,19 @@ class npc_mrfloppy : public CreatureScript } } - void EnterEvadeMode() OVERRIDE { } + void EnterEvadeMode() override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mrfloppyAI(creature); } @@ -283,19 +283,19 @@ class npc_outhouse_bunny : public CreatureScript { npc_outhouse_bunnyAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _counter = 0; _gender = 0; } - void SetData(uint32 Type, uint32 Data) OVERRIDE + void SetData(uint32 Type, uint32 Data) override { if (Type == 1) _gender = Data; } - void SpellHit(Unit* Caster, const SpellInfo* Spell) OVERRIDE + void SpellHit(Unit* Caster, const SpellInfo* Spell) override { if (Spell->Id == SPELL_OUTHOUSE_GROANS) { @@ -322,7 +322,7 @@ class npc_outhouse_bunny : public CreatureScript uint8 _gender; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_outhouse_bunnyAI(creature); } @@ -345,12 +345,12 @@ class npc_tallhorn_stag : public CreatureScript { npc_tallhorn_stagAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _phase = 1; } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (_phase == 1) { @@ -368,7 +368,7 @@ class npc_tallhorn_stag : public CreatureScript uint8 _phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tallhorn_stagAI(creature); } @@ -397,7 +397,7 @@ class npc_amberpine_woodsman : public CreatureScript { npc_amberpine_woodsmanAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { if (me->FindNearestCreature(NPC_TALLHORN_STAG, 0.2f)) { @@ -407,7 +407,7 @@ class npc_amberpine_woodsman : public CreatureScript _events.ScheduleEvent(EVENT_WOODSMAN_1, 0); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -433,7 +433,7 @@ class npc_amberpine_woodsman : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_amberpine_woodsmanAI(creature); } @@ -463,19 +463,19 @@ class npc_wounded_skirmisher : public CreatureScript { npc_wounded_skirmisherAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _despawnTimer = 5000; _playerGUID = 0; } - void MovementInform(uint32, uint32 id) OVERRIDE + void MovementInform(uint32, uint32 id) override { if (id == 1) me->DespawnOrUnsummon(_despawnTimer); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TypeID::TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(QUEST_OVERWHELMED) == QUEST_STATUS_INCOMPLETE) @@ -492,7 +492,7 @@ class npc_wounded_skirmisher : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -504,7 +504,7 @@ class npc_wounded_skirmisher : public CreatureScript uint32 _despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wounded_skirmisherAI(creature); } @@ -542,7 +542,7 @@ class npc_venture_co_straggler : public CreatureScript { npc_venture_co_stragglerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _playerGUID = 0; @@ -550,7 +550,7 @@ class npc_venture_co_straggler : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -592,7 +592,7 @@ class npc_venture_co_straggler : public CreatureScript DoMeleeAttackIfReady(); } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_SMOKE_BOMB && caster->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -609,7 +609,7 @@ class npc_venture_co_straggler : public CreatureScript uint64 _playerGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_venture_co_stragglerAI(creature); } @@ -657,7 +657,7 @@ class npc_lake_frog : public CreatureScript { npc_lake_frogAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _following = false; _runningScript = false; @@ -665,7 +665,7 @@ class npc_lake_frog : public CreatureScript me->RemoveFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_following) if (!me->HasAura(SPELL_FROG_LOVE)) @@ -704,7 +704,7 @@ class npc_lake_frog : public CreatureScript } } - void ReceiveEmote(Player* player, uint32 emote) OVERRIDE + void ReceiveEmote(Player* player, uint32 emote) override { if (_following || _runningScript) return; @@ -734,7 +734,7 @@ class npc_lake_frog : public CreatureScript } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { DoCast(player, SPELL_SUMMON_ASHWOOD_BRAND); } @@ -745,7 +745,7 @@ class npc_lake_frog : public CreatureScript bool _runningScript; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lake_frogAI(creature); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 24aeb4cc000..f63ef3ed82c 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -54,7 +54,7 @@ class npc_apothecary_hanes : public CreatureScript public: npc_apothecary_hanes() : CreatureScript("npc_apothecary_hanes") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TRAIL_OF_FIRE) { @@ -77,19 +77,19 @@ class npc_apothecary_hanes : public CreatureScript npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature){ } uint32 PotTimer; - void Reset() OVERRIDE + void Reset() override { SetDespawnAtFar(false); PotTimer = 10000; //10 sec cooldown on potion } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_TRAIL_OF_FIRE); } - void UpdateEscortAI(const uint32 diff) OVERRIDE + void UpdateEscortAI(const uint32 diff) override { if (HealthBelowPct(75)) { @@ -103,7 +103,7 @@ class npc_apothecary_hanes : public CreatureScript DoMeleeAttackIfReady(); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -153,7 +153,7 @@ class npc_apothecary_hanes : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_Apothecary_HanesAI(creature); } @@ -177,7 +177,7 @@ class npc_plaguehound_tracker : public CreatureScript { npc_plaguehound_trackerAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE + void Reset() override { uint64 summonerGUID = 0; @@ -193,7 +193,7 @@ class npc_plaguehound_tracker : public CreatureScript Start(false, false, summonerGUID); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { if (waypointId != 26) return; @@ -202,7 +202,7 @@ class npc_plaguehound_tracker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_plaguehound_trackerAI(creature); } @@ -231,7 +231,7 @@ class npc_razael_and_lyana : public CreatureScript public: npc_razael_and_lyana() : CreatureScript("npc_razael_and_lyana") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -260,7 +260,7 @@ class npc_razael_and_lyana : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -304,7 +304,7 @@ class npc_daegarn : public CreatureScript public: npc_daegarn() : CreatureScript("npc_daegarn") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_DEFEAT_AT_RING) { @@ -323,7 +323,7 @@ class npc_daegarn : public CreatureScript bool bEventInProgress; uint64 uiPlayerGUID; - void Reset() OVERRIDE + void Reset() override { bEventInProgress = false; uiPlayerGUID = 0; @@ -339,7 +339,7 @@ class npc_daegarn : public CreatureScript SummonGladiator(NPC_FIRJUS); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID)) { @@ -360,7 +360,7 @@ class npc_daegarn : public CreatureScript me->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30*IN_MILLISECONDS); } - void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) OVERRIDE + void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) override { uint32 uiEntry = 0; @@ -377,7 +377,7 @@ class npc_daegarn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_daegarnAI(creature); } diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index d52175bbd8d..a23de082c0f 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -55,7 +55,7 @@ class npc_arete : public CreatureScript public: npc_arete() : CreatureScript("npc_arete") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -71,7 +71,7 @@ class npc_arete : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -132,7 +132,7 @@ class npc_squire_david : public CreatureScript public: npc_squire_david() : CreatureScript("npc_squire_david") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_H) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE)//We need more info about it. @@ -145,7 +145,7 @@ class npc_squire_david : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -184,13 +184,13 @@ class npc_argent_valiant : public CreatureScript uint32 uiChargeTimer; uint32 uiShieldBreakerTimer; - void Reset() OVERRIDE + void Reset() override { uiChargeTimer = 7000; uiShieldBreakerTimer = 10000; } - void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 uiType, uint32 /*uiId*/) override { if (uiType != POINT_MOTION_TYPE) return; @@ -198,7 +198,7 @@ class npc_argent_valiant : public CreatureScript me->setFaction(14); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) OVERRIDE + void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override { if (uiDamage > me->GetHealth() && pDoneBy->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -211,7 +211,7 @@ class npc_argent_valiant : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -232,7 +232,7 @@ class npc_argent_valiant : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_argent_valiantAI(creature); } @@ -263,7 +263,7 @@ class npc_guardian_pavilion : public CreatureScript SetCombatMovement(false); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->GetAreaId() != AREA_SUNREAVER_PAVILION && me->GetAreaId() != AREA_SILVER_COVENANT_PAVILION) @@ -282,7 +282,7 @@ class npc_guardian_pavilion : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_guardian_pavilionAI(creature); } @@ -308,7 +308,7 @@ class npc_vereth_the_cunning : public CreatureScript { npc_vereth_the_cunningAI(Creature* creature) : ScriptedAI(creature) { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { ScriptedAI::MoveInLineOfSight(who); @@ -326,7 +326,7 @@ class npc_vereth_the_cunning : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_vereth_the_cunningAI(creature); } @@ -374,7 +374,7 @@ class npc_tournament_training_dummy : public CreatureScript EventMap events; bool isVulnerable; - void Reset() OVERRIDE + void Reset() override { me->SetControlled(true, UNIT_STATE_STUNNED); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true); @@ -395,7 +395,7 @@ class npc_tournament_training_dummy : public CreatureScript events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5000); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (!_EnterEvadeMode()) return; @@ -403,13 +403,13 @@ class npc_tournament_training_dummy : public CreatureScript Reset(); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { damage = 0; events.RescheduleEvent(EVENT_DUMMY_RESET, 10000); } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { switch (me->GetEntry()) { @@ -439,7 +439,7 @@ class npc_tournament_training_dummy : public CreatureScript isVulnerable = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -481,10 +481,10 @@ class npc_tournament_training_dummy : public CreatureScript me->SetControlled(true, UNIT_STATE_STUNNED); } - void MoveInLineOfSight(Unit* /*who*/)OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/)override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tournament_training_dummyAI(creature); } @@ -604,7 +604,7 @@ class npc_blessed_banner : public CreatureScript uint64 guidMason[3]; uint64 guidHalof; - void Reset() OVERRIDE + void Reset() override { me->setRegeneratingHealth(false); DoCast(SPELL_THREAT_PULSE); @@ -612,23 +612,23 @@ class npc_blessed_banner : public CreatureScript events.ScheduleEvent(EVENT_SPAWN, 3000); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustSummoned(Creature* Summoned) OVERRIDE + void JustSummoned(Creature* Summoned) override { Summons.Summon(Summoned); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Summons.DespawnAll(); me->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -859,7 +859,7 @@ class npc_blessed_banner : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_blessed_bannerAI(creature); } @@ -897,12 +897,12 @@ class npc_frostbrood_skytalon : public CreatureScript EventMap events; - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { me->GetMotionMaster()->MovePoint(POINT_GRAB_DECOY, summoner->GetPositionX(), summoner->GetPositionY(), summoner->GetPositionZ()); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -913,7 +913,7 @@ class npc_frostbrood_skytalon : public CreatureScript DoCast(summoner, SPELL_GRAB); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { VehicleAI::UpdateAI(diff); events.Update(diff); @@ -930,7 +930,7 @@ class npc_frostbrood_skytalon : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { switch (spell->Id) { @@ -945,7 +945,7 @@ class npc_frostbrood_skytalon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_frostbrood_skytalonAI(creature); } @@ -995,7 +995,7 @@ class npc_margrave_dhakar : public CreatureScript { npc_margrave_dhakarAI(Creature* creature) : ScriptedAI(creature) , _summons(me), _lichKingGuid(0) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, EMOTE_STATE_NONE); @@ -1004,7 +1004,7 @@ class npc_margrave_dhakar : public CreatureScript _summons.DespawnAll(); } - void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 sender, uint32 action) override { if (player->GetQuestStatus(QUEST_FLESH_GIANT_CHAMPION) == QUEST_STATUS_INCOMPLETE && !player->IsInCombat()) { @@ -1016,7 +1016,7 @@ class npc_margrave_dhakar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1110,7 +1110,7 @@ class npc_margrave_dhakar : public CreatureScript uint64 _lichKingGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_margrave_dhakarAI(creature); } @@ -1125,7 +1125,7 @@ class npc_morbidus : public CreatureScript { npc_morbidusAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { if (Creature* dhakar = me->FindNearestCreature(NPC_DHAKAR, 50.0f, true)) dhakar->AI()->Reset(); @@ -1137,7 +1137,7 @@ class npc_morbidus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_morbidusAI(creature); } diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 19af6dc9bb4..06f82630c5e 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -70,7 +70,7 @@ class npc_injured_rainspeaker_oracle : public CreatureScript uint64 c_guid; - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); // if we will have other way to assign this to only one npc remove this part @@ -81,7 +81,7 @@ class npc_injured_rainspeaker_oracle : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -118,7 +118,7 @@ class npc_injured_rainspeaker_oracle : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -131,7 +131,7 @@ class npc_injured_rainspeaker_oracle : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -144,7 +144,7 @@ class npc_injured_rainspeaker_oracle : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -165,13 +165,13 @@ class npc_injured_rainspeaker_oracle : public CreatureScript return true; } - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/) OVERRIDE + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/) override { creature->AI()->Talk(SAY_QUEST_ACCEPT_IRO); return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_injured_rainspeaker_oracleAI(creature); } @@ -201,7 +201,7 @@ class npc_vekjik : public CreatureScript public: npc_vekjik() : CreatureScript("npc_vekjik") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -217,7 +217,7 @@ class npc_vekjik : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -262,7 +262,7 @@ class npc_avatar_of_freya : public CreatureScript public: npc_avatar_of_freya() : CreatureScript("npc_avatar_of_freya") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -274,7 +274,7 @@ class npc_avatar_of_freya : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -311,7 +311,7 @@ class npc_bushwhacker : public CreatureScript { } - void InitializeAI() OVERRIDE + void InitializeAI() override { if (me->isDead()) return; @@ -323,7 +323,7 @@ class npc_bushwhacker : public CreatureScript Reset(); } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE + void UpdateAI(uint32 /*uiDiff*/) override { if (!UpdateVictim()) return; @@ -332,7 +332,7 @@ class npc_bushwhacker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bushwhackerAI(creature); } @@ -372,7 +372,7 @@ class npc_engineer_helice : public CreatureScript uint32 m_uiChatTimer; - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); @@ -411,12 +411,12 @@ class npc_engineer_helice : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { m_uiChatTimer = 4000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -425,7 +425,7 @@ class npc_engineer_helice : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -441,12 +441,12 @@ class npc_engineer_helice : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_engineer_heliceAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_DISASTER) { @@ -507,7 +507,7 @@ class npc_jungle_punch_target : public CreatureScript { npc_jungle_punch_targetAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { sayTimer = 3500; sayStep = 0; @@ -517,7 +517,7 @@ class npc_jungle_punch_target : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -582,7 +582,7 @@ class npc_jungle_punch_target : public CreatureScript timer -= diff; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (phase) proceedCwEvent(diff); @@ -603,7 +603,7 @@ class npc_jungle_punch_target : public CreatureScript sayTimer -= diff; } - void SpellHit(Unit* caster, SpellInfo const* spellInfo) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { if (spellInfo->Id != SPELL_OFFER) return; @@ -637,7 +637,7 @@ class npc_jungle_punch_target : public CreatureScript uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_jungle_punch_targetAI(creature); } @@ -682,12 +682,12 @@ class npc_adventurous_dwarf : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_adventurous_dwarfAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_12634) != QUEST_STATUS_INCOMPLETE) return false; @@ -705,7 +705,7 @@ class npc_adventurous_dwarf : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); uint32 spellId = 0; @@ -800,13 +800,13 @@ class spell_q12620_the_lifewarden_wrath : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12620_the_lifewarden_wrath_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12620_the_lifewarden_wrath_SpellScript(); } @@ -923,14 +923,14 @@ class spell_q12589_shoot_rjr : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_q12589_shoot_rjr_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_q12589_shoot_rjr_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12589_shoot_rjr_SpellScript(); } @@ -960,7 +960,7 @@ class npc_haiphoon : public CreatureScript { npc_haiphoonAI(Creature* creature) : VehicleAI(creature) { } - void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (target == me) return; @@ -976,7 +976,7 @@ class npc_haiphoon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_haiphoonAI(creature); } @@ -1014,13 +1014,13 @@ class npc_vics_flying_machine : public CreatureScript { npc_vics_flying_machineAI(Creature* creature) : VehicleAI(creature) { } - void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override { if (apply && passenger->GetTypeId() == TypeID::TYPEID_PLAYER) me->GetMotionMaster()->MovePath(NPC_PLANE, false); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != WAYPOINT_MOTION_TYPE) return; @@ -1056,7 +1056,7 @@ class npc_vics_flying_machine : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_LAND) { @@ -1069,10 +1069,10 @@ class npc_vics_flying_machine : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_vics_flying_machineAI(creature); } diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 1a2f4b174dc..5ba7956305f 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -51,7 +51,7 @@ class npc_injured_goblin : public CreatureScript { npc_injured_goblinAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -68,18 +68,18 @@ class npc_injured_goblin : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void Reset() OVERRIDE { } + void Reset() override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Player* player = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING) && player) player->FailQuest(QUEST_BITTER_DEPARTURE); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); if (!UpdateVictim()) @@ -87,7 +87,7 @@ class npc_injured_goblin : public CreatureScript DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 sender, uint32 action) override { if (sender == GOSSIP_ID && action == GOSSIP_OPTION_ID) { @@ -98,12 +98,12 @@ class npc_injured_goblin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_injured_goblinAI(creature); } - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE) creature->AI()->Talk(SAY_QUEST_ACCEPT); @@ -127,7 +127,7 @@ class npc_roxi_ramrocket : public CreatureScript public: npc_roxi_ramrocket() : CreatureScript("npc_roxi_ramrocket") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { //Quest Menu if (creature->IsQuestGiver()) @@ -146,7 +146,7 @@ class npc_roxi_ramrocket : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -185,18 +185,18 @@ class npc_brunnhildar_prisoner : public CreatureScript bool freed; - void Reset() OVERRIDE + void Reset() override { freed = false; me->CastSpell(me, SPELL_ICE_PRISON, true); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Reset(); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!freed) return; @@ -205,7 +205,7 @@ class npc_brunnhildar_prisoner : public CreatureScript me->DespawnOrUnsummon(); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id != SPELL_ICE_LANCE) return; @@ -220,7 +220,7 @@ class npc_brunnhildar_prisoner : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_brunnhildar_prisonerAI(creature); } @@ -257,12 +257,12 @@ class npc_freed_protodrake : public CreatureScript EventMap events; - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_CHECK_AREA, 5000); } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != WAYPOINT_MOTION_TYPE) return; @@ -272,7 +272,7 @@ class npc_freed_protodrake : public CreatureScript events.ScheduleEvent(EVENT_REACHED_HOME, 2000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -313,7 +313,7 @@ class npc_freed_protodrake : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_freed_protodrakeAI(creature); } @@ -328,11 +328,11 @@ class npc_icefang : public CreatureScript { npc_icefangAI(Creature* creature) : npc_escortAI(creature) { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void EnterEvadeMode() OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } + void EnterCombat(Unit* /*who*/) override { } + void EnterEvadeMode() override { } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -341,19 +341,19 @@ class npc_icefang : public CreatureScript } } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE + void WaypointReached(uint32 /*waypointId*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { } - void OnCharmed(bool /*apply*/) OVERRIDE + void OnCharmed(bool /*apply*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -362,7 +362,7 @@ class npc_icefang : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_icefangAI(creature); } @@ -383,7 +383,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript public: npc_hyldsmeet_protodrakeAI(Creature* creature) : CreatureAI(creature), _accessoryRespawnTimer(0), _vehicleKit(creature->GetVehicleKit()) { } - void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply) OVERRIDE + void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply) override { if (apply) return; @@ -392,7 +392,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript _accessoryRespawnTimer = 5 * MINUTE * IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //! We need to manually reinstall accessories because the vehicle itself is friendly to players, //! so EnterEvadeMode is never triggered. The accessory on the other hand is hostile and killable. @@ -410,7 +410,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript Vehicle* _vehicleKit; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hyldsmeet_protodrakeAI(creature); } @@ -430,13 +430,13 @@ class spell_close_rift : public SpellScriptLoader { PrepareAuraScript(spell_close_rift_AuraScript); - bool Load() OVERRIDE + bool Load() override { _counter = 0; return true; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { return sSpellMgr->GetSpellInfo(SPELL_DESPAWN_RIFT); } @@ -447,7 +447,7 @@ class spell_close_rift : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_DESPAWN_RIFT, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_close_rift_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -456,7 +456,7 @@ class spell_close_rift : public SpellScriptLoader uint8 _counter; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_close_rift_AuraScript(); } diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 0197640ad35..017b91c1324 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -119,7 +119,7 @@ class npc_wg_demolisher_engineer : public CreatureScript public: npc_wg_demolisher_engineer() : CreatureScript("npc_wg_demolisher_engineer") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -142,7 +142,7 @@ class npc_wg_demolisher_engineer : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->CLOSE_GOSSIP_MENU(); @@ -190,7 +190,7 @@ class npc_wg_spirit_guide : public CreatureScript public: npc_wg_spirit_guide() : CreatureScript("npc_wg_spirit_guide") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -208,7 +208,7 @@ class npc_wg_spirit_guide : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->CLOSE_GOSSIP_MENU(); @@ -228,14 +228,14 @@ class npc_wg_spirit_guide : public CreatureScript { npc_wg_spirit_guideAI(Creature* creature) : ScriptedAI(creature) { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!me->HasUnitState(UNIT_STATE_CASTING)) DoCast(me, SPELL_CHANNEL_SPIRIT_HEAL); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wg_spirit_guideAI(creature); } @@ -246,7 +246,7 @@ class npc_wg_queue : public CreatureScript public: npc_wg_queue() : CreatureScript("npc_wg_queue") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -275,7 +275,7 @@ class npc_wg_queue : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); @@ -304,7 +304,7 @@ class go_wg_vehicle_teleporter : public GameObjectScript { go_wg_vehicle_teleporterAI(GameObject* gameObject) : GameObjectAI(gameObject), _checkTimer(1000) { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_checkTimer <= diff) { @@ -325,7 +325,7 @@ class go_wg_vehicle_teleporter : public GameObjectScript uint32 _checkTimer; }; - GameObjectAI* GetAI(GameObject* go) const OVERRIDE + GameObjectAI* GetAI(GameObject* go) const override { return new go_wg_vehicle_teleporterAI(go); } @@ -336,7 +336,7 @@ class npc_wg_quest_giver : public CreatureScript public: npc_wg_quest_giver() : CreatureScript("npc_wg_quest_giver") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); if (!wintergrasp) @@ -448,7 +448,7 @@ class spell_wintergrasp_force_building : public SpellScriptLoader { PrepareSpellScript(spell_wintergrasp_force_building_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BUILD_CATAPULT_FORCE) || !sSpellMgr->GetSpellInfo(SPELL_BUILD_DEMOLISHER_FORCE) @@ -464,13 +464,13 @@ class spell_wintergrasp_force_building : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue(), false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_force_building_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_wintergrasp_force_building_SpellScript(); } @@ -491,13 +491,13 @@ class spell_wintergrasp_grab_passenger : public SpellScriptLoader target->CastSpell(GetCaster(), SPELL_RIDE_WG_VEHICLE, false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_grab_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_wintergrasp_grab_passenger_SpellScript(); } @@ -508,7 +508,7 @@ class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript public: achievement_wg_didnt_stand_a_chance() : AchievementCriteriaScript("achievement_wg_didnt_stand_a_chance") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (!target) return false; @@ -551,13 +551,13 @@ class spell_wintergrasp_defender_teleport : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_wintergrasp_defender_teleport_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_wintergrasp_defender_teleport_SpellScript(); } @@ -582,13 +582,13 @@ class spell_wintergrasp_defender_teleport_trigger : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_defender_teleport_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_wintergrasp_defender_teleport_trigger_SpellScript(); } diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 75aa220ecb9..1c402e3f5d4 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -52,7 +52,7 @@ class npc_drakuru_shackles : public CreatureScript { npc_drakuru_shacklesAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _rageclawGUID = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -90,7 +90,7 @@ class npc_drakuru_shackles : public CreatureScript me->setDeathState(DeathState::DEAD); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_UNLOCK_SHACKLE) { @@ -112,7 +112,7 @@ class npc_drakuru_shackles : public CreatureScript uint64 _rageclawGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_drakuru_shacklesAI(creature); } @@ -138,16 +138,16 @@ class npc_captured_rageclaw : public CreatureScript { npc_captured_rageclawAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->setFaction(35); DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void MoveInLineOfSight(Unit* /*who*/)OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/)override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_FREE_RAGECLAW) { @@ -163,7 +163,7 @@ class npc_captured_rageclaw : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_captured_rageclawAI(creature); } @@ -272,7 +272,7 @@ class npc_gurgthock : public CreatureScript { npc_gurgthockAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _summonGUID = 0; _playerGUID = 0; @@ -288,12 +288,12 @@ class npc_gurgthock : public CreatureScript _removeFlag = false; } - void SetGUID(uint64 guid, int32 /*id*/) OVERRIDE + void SetGUID(uint64 guid, int32 /*id*/) override { _playerGUID = guid; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { _removeFlag = true; me->RemoveFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); @@ -331,7 +331,7 @@ class npc_gurgthock : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { ScriptedAI::UpdateAI(diff); @@ -440,7 +440,7 @@ class npc_gurgthock : public CreatureScript uint32 uiQuest; }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { switch (quest->GetQuestId()) { @@ -467,7 +467,7 @@ class npc_gurgthock : public CreatureScript return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_gurgthockAI(creature); } @@ -501,7 +501,7 @@ class npc_orinoko_tuskbreaker : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void Reset() OVERRIDE + void Reset() override { _summoned = false; _battleShout = false; @@ -512,13 +512,13 @@ class npc_orinoko_tuskbreaker : public CreatureScript _affectedGUID = 0; } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (Creature* whisker = me->GetCreature(*me, _whiskerGUID)) whisker->RemoveFromWorld(); } - void MovementInform(uint32 type, uint32 /*pointId*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*pointId*/) override { if (type != EFFECT_MOTION_TYPE) return; @@ -529,12 +529,12 @@ class npc_orinoko_tuskbreaker : public CreatureScript uiBattleShoutTimer = 7000; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { DoCast(who, SPELL_IMPALE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -568,7 +568,7 @@ class npc_orinoko_tuskbreaker : public CreatureScript DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { switch (summon->GetEntry()) { @@ -585,7 +585,7 @@ class npc_orinoko_tuskbreaker : public CreatureScript } } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (_whiskerGUID) if (Creature* whisker = me->GetCreature(*me, _whiskerGUID)) @@ -605,7 +605,7 @@ class npc_orinoko_tuskbreaker : public CreatureScript uint64 _whiskerGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_orinoko_tuskbreakerAI(creature); } @@ -636,7 +636,7 @@ class npc_korrak_bloodrager : public CreatureScript SetDespawnAtEnd(false); } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->SetReactState(REACT_PASSIVE); @@ -645,7 +645,7 @@ class npc_korrak_bloodrager : public CreatureScript _uppercutTimer = 12000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -657,12 +657,12 @@ class npc_korrak_bloodrager : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_GROW); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); @@ -691,7 +691,7 @@ class npc_korrak_bloodrager : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER, killer); @@ -702,7 +702,7 @@ class npc_korrak_bloodrager : public CreatureScript uint32 _uppercutTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_korrak_bloodragerAI(creature); } @@ -728,13 +728,13 @@ class npc_yggdras : public CreatureScript { npc_yggdrasAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _cleaveTimer = 9000; _corrodeFleshTimer = 6000; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -772,7 +772,7 @@ class npc_yggdras : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Unit* summoner = me->ToTempSummon()->GetSummoner()) { @@ -794,7 +794,7 @@ class npc_yggdras : public CreatureScript uint32 _corrodeFleshTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_yggdrasAI(creature); } @@ -828,7 +828,7 @@ class npc_stinkbeard : public CreatureScript SetDespawnAtEnd(false); } - void Reset() OVERRIDE + void Reset() override { me->AddAura(SPELL_THUNDERBLADE, me); uiKnockAwayTimer = 10000; @@ -837,7 +837,7 @@ class npc_stinkbeard : public CreatureScript _thunderClap = false; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -849,7 +849,7 @@ class npc_stinkbeard : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -911,7 +911,7 @@ class npc_stinkbeard : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, killer); @@ -926,7 +926,7 @@ class npc_stinkbeard : public CreatureScript uint32 uiStinkyBeardTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stinkbeardAI(creature); } @@ -954,7 +954,7 @@ class npc_elemental_lord : public CreatureScript bool bAddAttack; - void Reset() OVERRIDE + void Reset() override { uiBossRandom = 0; uiSpellInfo = 0; @@ -963,7 +963,7 @@ class npc_elemental_lord : public CreatureScript bAddAttack = false; } - void SetData(uint32 uiData, uint32 uiValue) OVERRIDE + void SetData(uint32 uiData, uint32 uiValue) override { if (uiData == 1) { @@ -989,7 +989,7 @@ class npc_elemental_lord : public CreatureScript } } - void EnterCombat(Unit* unit) OVERRIDE + void EnterCombat(Unit* unit) override { if (!SummonList.empty()) for (std::list::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) @@ -1002,7 +1002,7 @@ class npc_elemental_lord : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -1053,7 +1053,7 @@ class npc_elemental_lord : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (!SummonList.empty()) for (std::list::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) @@ -1070,7 +1070,7 @@ class npc_elemental_lord : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_elemental_lordAI(creature); } @@ -1089,7 +1089,7 @@ class npc_fiend_elemental : public CreatureScript { npc_fiend_elementalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { if (me->GetPositionZ() >= 287.0f) me->GetMotionMaster()->MoveIdle(); @@ -1098,7 +1098,7 @@ class npc_fiend_elemental : public CreatureScript _missleTimer = urand(2000, 7000); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -1106,13 +1106,13 @@ class npc_fiend_elemental : public CreatureScript AttackStartNoMove(who); } - void SetData(uint32 Data, uint32 Value) OVERRIDE + void SetData(uint32 Data, uint32 Value) override { if (Data == 1) _spell = Boss[Value].uiAddSpell; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1135,7 +1135,7 @@ class npc_fiend_elemental : public CreatureScript uint32 _spell; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fiend_elementalAI(creature); } @@ -1154,14 +1154,14 @@ class npc_released_offspring_harkoa : public CreatureScript { npc_released_offspring_harkoaAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { float x, y, z; me->GetClosePoint(x, y, z, me->GetObjectSize() / 3, 25.0f); me->GetMotionMaster()->MovePoint(0, x, y, z); } - void MovementInform(uint32 Type, uint32 /*uiId*/) OVERRIDE + void MovementInform(uint32 Type, uint32 /*uiId*/) override { if (Type != POINT_MOTION_TYPE) return; @@ -1169,7 +1169,7 @@ class npc_released_offspring_harkoa : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_released_offspring_harkoaAI(creature); } @@ -1200,14 +1200,14 @@ class npc_crusade_recruit : public CreatureScript { npc_crusade_recruitAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, EMOTE_STATE_COWER); _heading = me->GetOrientation(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1235,7 +1235,7 @@ class npc_crusade_recruit : public CreatureScript return; } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { _events.ScheduleEvent(EVENT_RECRUIT_1, 100); player->CLOSE_GOSSIP_MENU(); @@ -1248,7 +1248,7 @@ class npc_crusade_recruit : public CreatureScript float _heading; // Store creature heading }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crusade_recruitAI(creature); } @@ -1271,7 +1271,7 @@ class go_scourge_enclosure : public GameObjectScript public: go_scourge_enclosure() : GameObjectScript("go_scourge_enclosure") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) @@ -1431,12 +1431,12 @@ class npc_alchemist_finklestein : public CreatureScript { npc_alchemist_finklesteinAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _events.ScheduleEvent(EVENT_TURN_TO_POT, urand(15000, 26000)); } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == 1 && data == 1) switch (_getingredienttry) @@ -1459,7 +1459,7 @@ class npc_alchemist_finklestein : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -1515,7 +1515,7 @@ class npc_alchemist_finklestein : public CreatureScript } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); DoCast(player, SPELL_ALCHEMIST_APPRENTICE_INVISBUFF); @@ -1530,7 +1530,7 @@ class npc_alchemist_finklestein : public CreatureScript uint8 _getingredienttry; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_alchemist_finklesteinAI(creature); } @@ -1541,7 +1541,7 @@ class go_finklesteins_cauldron : public GameObjectScript public: go_finklesteins_cauldron() : GameObjectScript("go_finklesteins_cauldron") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { player->CastSpell(player, SPELL_POT_CHECK); return true; @@ -1586,7 +1586,7 @@ class spell_random_ingredient_aura : public SpellScriptLoader { PrepareAuraScript(spell_random_ingredient_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RANDOM_INGREDIENT_EASY) || !sSpellMgr->GetSpellInfo(SPELL_RANDOM_INGREDIENT_MEDIUM) || !sSpellMgr->GetSpellInfo(SPELL_RANDOM_INGREDIENT_HARD)) return false; @@ -1609,13 +1609,13 @@ class spell_random_ingredient_aura : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_random_ingredient_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_random_ingredient_aura_AuraScript(); } @@ -1634,7 +1634,7 @@ class spell_random_ingredient : public SpellScriptLoader { PrepareSpellScript(spell_random_ingredient_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FETCH_KNOTROOT) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PICKLED_EAGLE_EGG) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SPECKLED_GUANO) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_WITHERED_BATWING) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SEASONED_SLIDER_CIDER) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PULVERIZED_GARGOYLE_TEETH) || @@ -1674,13 +1674,13 @@ class spell_random_ingredient : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_random_ingredient_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_random_ingredient_SpellScript(); } @@ -1699,7 +1699,7 @@ class spell_pot_check : public SpellScriptLoader { PrepareSpellScript(spell_pot_check_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FETCH_KNOTROOT) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PICKLED_EAGLE_EGG) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SPECKLED_GUANO) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_WITHERED_BATWING) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SEASONED_SLIDER_CIDER) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PULVERIZED_GARGOYLE_TEETH) || @@ -1768,13 +1768,13 @@ class spell_pot_check : public SpellScriptLoader player->DestroyItemCount(FetchIngredients[i][2], 1, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pot_check_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pot_check_SpellScript(); } @@ -1805,13 +1805,13 @@ class spell_fetch_ingredient_aura : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_fetch_ingredient_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_fetch_ingredient_aura_AuraScript(); } @@ -1835,17 +1835,17 @@ class npc_storm_cloud : public CreatureScript { npc_storm_cloudAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->CastSpell(me, STORM_VISUAL, true); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Reset(); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id != GYMERS_GRAB) return; @@ -1859,7 +1859,7 @@ class npc_storm_cloud : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_storm_cloudAI(creature); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index a5fbdf2d6cd..70fc24eb9c8 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -367,7 +367,7 @@ class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript public: OutdoorPvP_hellfire_peninsula() : OutdoorPvPScript("outdoorpvp_hp") { } - OutdoorPvP* GetOutdoorPvP() const OVERRIDE + OutdoorPvP* GetOutdoorPvP() const override { return new OutdoorPvPHP(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index f61baf2aa96..6b8e4369e0d 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -91,13 +91,13 @@ class OPvPCapturePointHP : public OPvPCapturePoint { public: OPvPCapturePointHP(OutdoorPvP* pvp, OutdoorPvPHPTowerType type); - void ChangeState() OVERRIDE; - void SendChangePhase() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void ChangeState() override; + void SendChangePhase() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player* player) OVERRIDE; - void HandlePlayerLeave(Player* player) OVERRIDE; + bool HandlePlayerEnter(Player* player) override; + void HandlePlayerLeave(Player* player) override; private: OutdoorPvPHPTowerType m_TowerType; @@ -108,13 +108,13 @@ class OutdoorPvPHP : public OutdoorPvP public: OutdoorPvPHP(); - bool SetupOutdoorPvP() OVERRIDE; - void HandlePlayerEnterZone(Player* player, uint32 zone) OVERRIDE; - void HandlePlayerLeaveZone(Player* player, uint32 zone) OVERRIDE; - bool Update(uint32 diff) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void SendRemoveWorldStates(Player* player) OVERRIDE; - void HandleKillImpl(Player* player, Unit* killed) OVERRIDE; + bool SetupOutdoorPvP() override; + void HandlePlayerEnterZone(Player* player, uint32 zone) override; + void HandlePlayerLeaveZone(Player* player, uint32 zone) override; + bool Update(uint32 diff) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void SendRemoveWorldStates(Player* player) override; + void HandleKillImpl(Player* player, Unit* killed) override; uint32 GetAllianceTowersControlled() const; void SetAllianceTowersControlled(uint32 count); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index e0cb1f432ad..190039f7513 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -665,7 +665,7 @@ class OutdoorPvP_nagrand : public OutdoorPvPScript public: OutdoorPvP_nagrand() : OutdoorPvPScript("outdoorpvp_na") { } - OutdoorPvP* GetOutdoorPvP() const OVERRIDE + OutdoorPvP* GetOutdoorPvP() const override { return new OutdoorPvPNA(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index 1b46eca0287..ecc083a15e8 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -257,16 +257,16 @@ class OPvPCapturePointNA : public OPvPCapturePoint public: OPvPCapturePointNA(OutdoorPvP* pvp); - bool Update(uint32 diff) OVERRIDE; - void ChangeState() OVERRIDE; - void SendChangePhase() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + bool Update(uint32 diff) override; + void ChangeState() override; + void SendChangePhase() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player* player) OVERRIDE; - void HandlePlayerLeave(Player* player) OVERRIDE; - bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) OVERRIDE; - int32 HandleOpenGo(Player* player, uint64 guid) OVERRIDE; + bool HandlePlayerEnter(Player* player) override; + void HandlePlayerLeave(Player* player) override; + bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) override; + int32 HandleOpenGo(Player* player, uint64 guid) override; uint32 GetAliveGuardsCount(); uint32 GetControllingFaction() const; @@ -299,13 +299,13 @@ class OutdoorPvPNA : public OutdoorPvP public: OutdoorPvPNA(); - bool SetupOutdoorPvP() OVERRIDE; - void HandlePlayerEnterZone(Player* player, uint32 zone) OVERRIDE; - void HandlePlayerLeaveZone(Player* player, uint32 zone) OVERRIDE; - bool Update(uint32 diff) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void SendRemoveWorldStates(Player* player) OVERRIDE; - void HandleKillImpl(Player* player, Unit* killed) OVERRIDE; + bool SetupOutdoorPvP() override; + void HandlePlayerEnterZone(Player* player, uint32 zone) override; + void HandlePlayerLeaveZone(Player* player, uint32 zone) override; + bool Update(uint32 diff) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void SendRemoveWorldStates(Player* player) override; + void HandleKillImpl(Player* player, Unit* killed) override; private: OPvPCapturePointNA * m_obj; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 76eff2fbf7e..2da4e0b4fdc 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -248,7 +248,7 @@ class OutdoorPvP_silithus : public OutdoorPvPScript public: OutdoorPvP_silithus() : OutdoorPvPScript("outdoorpvp_si") { } - OutdoorPvP* GetOutdoorPvP() const OVERRIDE + OutdoorPvP* GetOutdoorPvP() const override { return new OutdoorPvPSI(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h index 328c649e934..340c4a2ad33 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h @@ -58,15 +58,15 @@ class OutdoorPvPSI : public OutdoorPvP public: OutdoorPvPSI(); - bool SetupOutdoorPvP() OVERRIDE; - void HandlePlayerEnterZone(Player* player, uint32 zone) OVERRIDE; - void HandlePlayerLeaveZone(Player* player, uint32 zone) OVERRIDE; - bool Update(uint32 diff) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void SendRemoveWorldStates(Player* player) OVERRIDE; - bool HandleAreaTrigger(Player* player, uint32 trigger) OVERRIDE; - bool HandleDropFlag(Player* player, uint32 spellId) OVERRIDE; - bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) OVERRIDE; + bool SetupOutdoorPvP() override; + void HandlePlayerEnterZone(Player* player, uint32 zone) override; + void HandlePlayerLeaveZone(Player* player, uint32 zone) override; + bool Update(uint32 diff) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void SendRemoveWorldStates(Player* player) override; + bool HandleAreaTrigger(Player* player, uint32 trigger) override; + bool HandleDropFlag(Player* player, uint32 spellId) override; + bool HandleCustomSpell(Player* player, uint32 spellId, GameObject* go) override; void UpdateWorldState(); private: diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 4c920d352b5..b3d88d5804c 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -364,7 +364,7 @@ class OutdoorPvP_terokkar_forest : public OutdoorPvPScript public: OutdoorPvP_terokkar_forest() : OutdoorPvPScript("outdoorpvp_tf") { } - OutdoorPvP* GetOutdoorPvP() const OVERRIDE + OutdoorPvP* GetOutdoorPvP() const override { return new OutdoorPvPTF(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index 9dc17e74abe..b7b205983c3 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -127,14 +127,14 @@ class OPvPCapturePointTF : public OPvPCapturePoint { public: OPvPCapturePointTF(OutdoorPvP* pvp, OutdoorPvPTF_TowerType type); - bool Update(uint32 diff) OVERRIDE; - void ChangeState() OVERRIDE; - void SendChangePhase() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + bool Update(uint32 diff) override; + void ChangeState() override; + void SendChangePhase() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player* player) OVERRIDE; - void HandlePlayerLeave(Player* player) OVERRIDE; + bool HandlePlayerEnter(Player* player) override; + void HandlePlayerLeave(Player* player) override; void UpdateTowerState(); protected: @@ -146,12 +146,12 @@ class OutdoorPvPTF : public OutdoorPvP { public: OutdoorPvPTF(); - bool SetupOutdoorPvP() OVERRIDE; - void HandlePlayerEnterZone(Player* player, uint32 zone) OVERRIDE; - void HandlePlayerLeaveZone(Player* player, uint32 zone) OVERRIDE; - bool Update(uint32 diff) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void SendRemoveWorldStates(Player* player) OVERRIDE; + bool SetupOutdoorPvP() override; + void HandlePlayerEnterZone(Player* player, uint32 zone) override; + void HandlePlayerLeaveZone(Player* player, uint32 zone) override; + bool Update(uint32 diff) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void SendRemoveWorldStates(Player* player) override; uint32 GetAllianceTowersControlled() const; void SetAllianceTowersControlled(uint32 count); uint32 GetHordeTowersControlled() const; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index e65b55ba15d..c55e0d6a9ee 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -459,7 +459,7 @@ class OutdoorPvP_zangarmarsh : public OutdoorPvPScript public: OutdoorPvP_zangarmarsh() : OutdoorPvPScript("outdoorpvp_zm") { } - OutdoorPvP* GetOutdoorPvP() const OVERRIDE + OutdoorPvP* GetOutdoorPvP() const override { return new OutdoorPvPZM(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index 42c2012b751..f62d7242486 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -173,13 +173,13 @@ class OPvPCapturePointZM_Beacon : public OPvPCapturePoint public: OPvPCapturePointZM_Beacon(OutdoorPvP* pvp, ZM_BeaconType type); - void ChangeState() OVERRIDE; - void SendChangePhase() OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + void ChangeState() override; + void SendChangePhase() override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; // used when player is activated/inactivated in the area - bool HandlePlayerEnter(Player* player) OVERRIDE; - void HandlePlayerLeave(Player* player) OVERRIDE; + bool HandlePlayerEnter(Player* player) override; + void HandlePlayerLeave(Player* player) override; void UpdateTowerState(); protected: @@ -199,15 +199,15 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint public: OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp); - bool Update(uint32 diff) OVERRIDE; - void ChangeState() OVERRIDE { } - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; + bool Update(uint32 diff) override; + void ChangeState() override { } + void FillInitialWorldStates(WorldStateBuilder& builder) override; void UpdateTowerState(); - int32 HandleOpenGo(Player* player, uint64 guid) OVERRIDE; + int32 HandleOpenGo(Player* player, uint64 guid) override; void SetBeaconState(uint32 controlling_team); // not good atm - bool HandleGossipOption(Player* player, uint64 guid, uint32 gossipid) OVERRIDE; - bool HandleDropFlag(Player* player, uint32 spellId) OVERRIDE; - bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso) OVERRIDE; + bool HandleGossipOption(Player* player, uint64 guid, uint32 gossipid) override; + bool HandleDropFlag(Player* player, uint32 spellId) override; + bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso) override; uint32 GetGraveYardState() const; private: @@ -223,13 +223,13 @@ class OutdoorPvPZM : public OutdoorPvP public: OutdoorPvPZM(); - bool SetupOutdoorPvP() OVERRIDE; - void HandlePlayerEnterZone(Player* player, uint32 zone) OVERRIDE; - void HandlePlayerLeaveZone(Player* player, uint32 zone) OVERRIDE; - bool Update(uint32 diff) OVERRIDE; - void FillInitialWorldStates(WorldStateBuilder& builder) OVERRIDE; - void SendRemoveWorldStates(Player* player) OVERRIDE; - void HandleKillImpl(Player* player, Unit* killed) OVERRIDE; + bool SetupOutdoorPvP() override; + void HandlePlayerEnterZone(Player* player, uint32 zone) override; + void HandlePlayerLeaveZone(Player* player, uint32 zone) override; + bool Update(uint32 diff) override; + void FillInitialWorldStates(WorldStateBuilder& builder) override; + void SendRemoveWorldStates(Player* player) override; + void HandleKillImpl(Player* player, Unit* killed) override; uint32 GetAllianceTowersControlled() const; void SetAllianceTowersControlled(uint32 count); uint32 GetHordeTowersControlled() const; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index c9abe0beaa2..108cc846dd9 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -56,7 +56,7 @@ class npc_stolen_soul : public CreatureScript public: npc_stolen_soul() : CreatureScript("npc_stolen_soul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_stolen_soulAI(creature); } @@ -68,12 +68,12 @@ class npc_stolen_soul : public CreatureScript uint8 myClass; uint32 Class_Timer; - void Reset() OVERRIDE + void Reset() override { Class_Timer = 1000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } void SetMyClass(uint8 myclass) @@ -81,7 +81,7 @@ class npc_stolen_soul : public CreatureScript myClass = myclass; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -157,7 +157,7 @@ class boss_exarch_maladaar : public CreatureScript public: boss_exarch_maladaar() : CreatureScript("boss_exarch_maladaar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_exarch_maladaarAI(creature); } @@ -180,7 +180,7 @@ class boss_exarch_maladaar : public CreatureScript bool HasTaunted; bool Avatar_summoned; - void Reset() OVERRIDE + void Reset() override { soulmodel = 0; soulholder = 0; @@ -193,7 +193,7 @@ class boss_exarch_maladaar : public CreatureScript Avatar_summoned = false; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!HasTaunted && me->IsWithinDistInMap(who, 150.0f)) @@ -205,12 +205,12 @@ class boss_exarch_maladaar : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { @@ -227,7 +227,7 @@ class boss_exarch_maladaar : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%2) return; @@ -235,14 +235,14 @@ class boss_exarch_maladaar : public CreatureScript Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); //When Exarch Maladar is defeated D'ore appear. me->SummonCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -306,7 +306,7 @@ class npc_avatar_of_martyred : public CreatureScript public: npc_avatar_of_martyred() : CreatureScript("npc_avatar_of_martyred") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_avatar_of_martyredAI(creature); } @@ -317,16 +317,16 @@ class npc_avatar_of_martyred : public CreatureScript uint32 Mortal_Strike_timer; - void Reset() OVERRIDE + void Reset() override { Mortal_Strike_timer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 9ae1777d62b..005f3848c87 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -55,7 +55,7 @@ class boss_shirrak_the_dead_watcher : public CreatureScript public: boss_shirrak_the_dead_watcher() : CreatureScript("boss_shirrak_the_dead_watcher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shirrak_the_dead_watcherAI(creature); } @@ -73,7 +73,7 @@ class boss_shirrak_the_dead_watcher : public CreatureScript uint64 FocusedTargetGUID; - void Reset() OVERRIDE + void Reset() override { Inhibitmagic_Timer = 0; Attractmagic_Timer = 28000; @@ -82,10 +82,10 @@ class boss_shirrak_the_dead_watcher : public CreatureScript FocusedTargetGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned && summoned->GetEntry() == NPC_FOCUS_FIRE) { @@ -99,7 +99,7 @@ class boss_shirrak_the_dead_watcher : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Inhibitmagic_Timer if (Inhibitmagic_Timer <= diff) @@ -166,7 +166,7 @@ class npc_focus_fire : public CreatureScript public: npc_focus_fire() : CreatureScript("npc_focus_fire") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_focus_fireAI(creature); } @@ -178,16 +178,16 @@ class npc_focus_fire : public CreatureScript uint32 FieryBlast_Timer; bool fiery1, fiery2; - void Reset() OVERRIDE + void Reset() override { FieryBlast_Timer = 3000+(rand()%1000); fiery1 = fiery2 = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp index 1ecf0974b97..41ada0de9ae 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp @@ -35,7 +35,7 @@ class instance_auchenai_crypts : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_auchenai_crypts_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index d9fb2e64397..1b9a3b219e7 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -73,7 +73,7 @@ class boss_nexusprince_shaffar : public CreatureScript public: boss_nexusprince_shaffar() : CreatureScript("boss_nexusprince_shaffar") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nexusprince_shaffarAI(creature); } @@ -93,7 +93,7 @@ class boss_nexusprince_shaffar : public CreatureScript bool HasTaunted; bool CanBlink; - void Reset() OVERRIDE + void Reset() override { Blink_Timer = 1500; Beacon_Timer = 10000; @@ -112,13 +112,13 @@ class boss_nexusprince_shaffar : public CreatureScript me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TempSummonType::TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!HasTaunted && who->GetTypeId() == TypeID::TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) @@ -128,7 +128,7 @@ class boss_nexusprince_shaffar : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -136,7 +136,7 @@ class boss_nexusprince_shaffar : public CreatureScript summons.DoZoneInCombat(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_BEACON) { @@ -149,23 +149,23 @@ class boss_nexusprince_shaffar : public CreatureScript summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEAD); summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -233,7 +233,7 @@ class npc_ethereal_beacon : public CreatureScript public: npc_ethereal_beacon() : CreatureScript("npc_ethereal_beacon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ethereal_beaconAI(creature); } @@ -253,14 +253,14 @@ class npc_ethereal_beacon : public CreatureScript me->Kill(me); } - void Reset() OVERRIDE + void Reset() override { Apprentice_Timer = DUNGEON_MODE(20000, 10000); ArcaneBolt_Timer = 1000; Check_Timer = 1000; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { // Send Shaffar to fight Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); @@ -273,12 +273,12 @@ class npc_ethereal_beacon : public CreatureScript Shaffar->AI()->AttackStart(who); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me->GetVictim()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -324,7 +324,7 @@ class npc_ethereal_apprentice : public CreatureScript public: npc_ethereal_apprentice() : CreatureScript("npc_ethereal_apprentice") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ethereal_apprenticeAI(creature); } @@ -337,13 +337,13 @@ class npc_ethereal_apprentice : public CreatureScript bool isFireboltTurn; - void Reset() OVERRIDE + void Reset() override { Cast_Timer = 3000; isFireboltTurn = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -379,14 +379,14 @@ class npc_yor : public CreatureScript { npc_yorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -413,7 +413,7 @@ class npc_yor : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_yorAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index f59ccaa6c87..d7aaa474ce0 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -46,7 +46,7 @@ class boss_pandemonius : public CreatureScript public: boss_pandemonius() : CreatureScript("boss_pandemonius") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_pandemoniusAI(creature); } @@ -61,29 +61,29 @@ class boss_pandemonius : public CreatureScript uint32 DarkShell_Timer; uint32 VoidBlast_Counter; - void Reset() OVERRIDE + void Reset() override { VoidBlast_Timer = 8000+rand()%15000; DarkShell_Timer = 20000; VoidBlast_Counter = 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp index 9cae5da8b6e..24a04a99231 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp @@ -35,7 +35,7 @@ class instance_mana_tombs : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_mana_tombs_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp index cdfd74ba1fa..4059d247b4f 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp @@ -72,7 +72,7 @@ class boss_anzu : public CreatureScript { boss_anzuAI(Creature* creature) : BossAI(creature, DATA_ANZU) { } - void Reset() OVERRIDE + void Reset() override { //_Reset(); events.Reset(); @@ -80,19 +80,19 @@ class boss_anzu : public CreatureScript _under66Percent = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000); events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (me->HealthBelowPctDamaged(33, damage) && !_under33Percent) { @@ -109,7 +109,7 @@ class boss_anzu : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -160,7 +160,7 @@ class boss_anzu : public CreatureScript bool _under66Percent; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetSethekkHallsAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 5c4f6aa1d14..e4e4ee85532 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -75,7 +75,7 @@ class boss_darkweaver_syth : public CreatureScript { boss_darkweaver_sythAI(Creature* creature) : BossAI(creature, DATA_DARKWEAVER_SYTH) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); summon90 = false; @@ -83,7 +83,7 @@ class boss_darkweaver_syth : public CreatureScript summon10 = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000); @@ -95,19 +95,19 @@ class boss_darkweaver_syth : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); @@ -126,7 +126,7 @@ class boss_darkweaver_syth : public CreatureScript DoCast(me, SPELL_SUMMON_SYTH_SHADOW, true); //right } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -194,7 +194,7 @@ class boss_darkweaver_syth : public CreatureScript bool summon10; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetSethekkHallsAI(creature); } @@ -215,16 +215,16 @@ class npc_syth_fire : public CreatureScript uint32 flameshock_timer; uint32 flamebuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); flameshock_timer = 2500; flamebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -249,7 +249,7 @@ class npc_syth_fire : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_fireAI(creature); } @@ -260,7 +260,7 @@ class npc_syth_arcane : public CreatureScript public: npc_syth_arcane() : CreatureScript("npc_syth_arcane") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_arcaneAI(creature); } @@ -274,16 +274,16 @@ class npc_syth_arcane : public CreatureScript uint32 arcaneshock_timer; uint32 arcanebuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); arcaneshock_timer = 2500; arcanebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -314,7 +314,7 @@ class npc_syth_frost : public CreatureScript public: npc_syth_frost() : CreatureScript("npc_syth_frost") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_frostAI(creature); } @@ -328,16 +328,16 @@ class npc_syth_frost : public CreatureScript uint32 frostshock_timer; uint32 frostbuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); frostshock_timer = 2500; frostbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -368,7 +368,7 @@ class npc_syth_shadow : public CreatureScript public: npc_syth_shadow() : CreatureScript("npc_syth_shadow") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_syth_shadowAI(creature); } @@ -382,16 +382,16 @@ class npc_syth_shadow : public CreatureScript uint32 shadowshock_timer; uint32 shadowbuffet_timer; - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); shadowshock_timer = 2500; shadowbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index 51c7e895400..1e8d68a2a09 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -62,7 +62,7 @@ class boss_talon_king_ikiss : public CreatureScript { boss_talon_king_ikissAI(Creature* creature) : BossAI(creature, DATA_TALON_KING_IKISS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); ArcaneVolley_Timer = 5000; @@ -74,7 +74,7 @@ class boss_talon_king_ikiss : public CreatureScript ManaShield = false; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -96,25 +96,25 @@ class boss_talon_king_ikiss : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -202,7 +202,7 @@ class boss_talon_king_ikiss : public CreatureScript bool Intro; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetSethekkHallsAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 69967d49eb7..e3dc37009f7 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -41,7 +41,7 @@ class instance_sethekk_halls : public InstanceMapScript LoadDoorData(doorData); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (creature->GetEntry() == NPC_ANZU) { @@ -52,19 +52,19 @@ class instance_sethekk_halls : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { if (go->GetEntry() == GO_IKISS_DOOR) AddDoor(go, true); } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { if (go->GetEntry() == GO_IKISS_DOOR) AddDoor(go, false); } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -75,7 +75,7 @@ class instance_sethekk_halls : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -108,7 +108,7 @@ class instance_sethekk_halls : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_sethekk_halls_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index b5342064c49..cf24fcaa9f3 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -67,7 +67,7 @@ class boss_ambassador_hellmaw : public CreatureScript _intro = false; } - void Reset() OVERRIDE + void Reset() override { if (!me->IsAlive()) return; @@ -83,7 +83,7 @@ class boss_ambassador_hellmaw : public CreatureScript DoAction(ACTION_AMBASSADOR_HELLMAW_BANISH); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasAura(SPELL_BANISH)) return; @@ -91,11 +91,11 @@ class boss_ambassador_hellmaw : public CreatureScript npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE + void WaypointReached(uint32 /*waypointId*/) override { } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { if (actionId == ACTION_AMBASSADOR_HELLMAW_INTRO) DoIntro(); @@ -120,25 +120,25 @@ class boss_ambassador_hellmaw : public CreatureScript Start(true, false, 0, NULL, false, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, IN_PROGRESS); Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, DONE); Talk(SAY_DEATH); } - void UpdateEscortAI(uint32 const diff) OVERRIDE + void UpdateEscortAI(uint32 const diff) override { if (!UpdateVictim()) return; @@ -183,7 +183,7 @@ class boss_ambassador_hellmaw : public CreatureScript bool _intro; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 47bbbb8119c..efa39d37e45 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -66,12 +66,12 @@ class boss_blackheart_the_inciter : public CreatureScript { boss_blackheart_the_inciterAI(Creature* creature) : BossAI(creature, DATA_BLACKHEART_THE_INCITER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000); @@ -81,19 +81,19 @@ class boss_blackheart_the_inciter : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -139,7 +139,7 @@ class boss_blackheart_the_inciter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 7953b18ea3d..8db13f93823 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -92,7 +92,7 @@ class boss_grandmaster_vorpil : public CreatureScript _intro = false; } - void Reset() OVERRIDE + void Reset() override { _Reset(); _helpYell = false; @@ -118,19 +118,19 @@ class boss_grandmaster_vorpil : public CreatureScript } } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000)); @@ -143,7 +143,7 @@ class boss_grandmaster_vorpil : public CreatureScript SummonPortals(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { BossAI::MoveInLineOfSight(who); @@ -154,7 +154,7 @@ class boss_grandmaster_vorpil : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ class boss_grandmaster_vorpil : public CreatureScript bool _helpYell; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI(creature); } @@ -229,15 +229,15 @@ class npc_voidtraveler : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { _moveTimer = 0; _sacrificed = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_moveTimer <= diff) { @@ -272,7 +272,7 @@ class npc_voidtraveler : public CreatureScript bool _sacrificed; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI(creature); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 10a61dd8e79..24b54d419ee 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -66,7 +66,7 @@ class boss_murmur : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { _Reset(); events.ScheduleEvent(EVENT_SONIC_BOOM, 30000); @@ -86,17 +86,17 @@ class boss_murmur : public CreatureScript me->ResetPlayerDamageReq(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -169,7 +169,7 @@ class boss_murmur : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetShadowLabyrinthAI(creature); } @@ -185,7 +185,7 @@ class spell_murmur_sonic_boom : public SpellScriptLoader { PrepareSpellScript(spell_murmur_sonic_boom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SONIC_BOOM_EFFECT)) return false; @@ -197,13 +197,13 @@ class spell_murmur_sonic_boom : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SONIC_BOOM_EFFECT, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_murmur_sonic_boom_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_murmur_sonic_boom_SpellScript(); } @@ -225,13 +225,13 @@ class spell_murmur_sonic_boom_effect : public SpellScriptLoader SetHitDamage(target->CountPctFromMaxHealth(80)); /// @todo: find correct value } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_murmur_sonic_boom_effect_SpellScript::CalcDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_murmur_sonic_boom_effect_SpellScript(); } @@ -267,13 +267,13 @@ class spell_murmur_thundering_storm : public SpellScriptLoader targets.remove_if(ThunderingStormCheck(GetCaster())); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_murmur_thundering_storm_SpellScript::FilterTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_murmur_thundering_storm_SpellScript(); } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index c141fcb2eba..58618930913 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -47,7 +47,7 @@ class instance_shadow_labyrinth : public InstanceMapScript FelOverseerCount = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -70,7 +70,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -83,7 +83,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -96,7 +96,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); if (!creature) @@ -113,7 +113,7 @@ class instance_shadow_labyrinth : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -125,7 +125,7 @@ class instance_shadow_labyrinth : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -137,7 +137,7 @@ class instance_shadow_labyrinth : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -148,7 +148,7 @@ class instance_shadow_labyrinth : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -186,7 +186,7 @@ class instance_shadow_labyrinth : public InstanceMapScript uint32 FelOverseerCount; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_shadow_labyrinth_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index ba11a181a66..dbec3eafbcf 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -68,7 +68,7 @@ class npc_spirit_of_olum : public CreatureScript { npc_spirit_of_olumAI(Creature* creature) : ScriptedAI(creature) { } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { if (action == 1) { @@ -79,7 +79,7 @@ class npc_spirit_of_olum : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spirit_of_olumAI(creature); } @@ -101,22 +101,22 @@ class npc_wrathbone_flayer : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { events.ScheduleEvent(EVENT_GET_CHANNELERS, 3000); enteredCombat = false; } - void JustDied(Unit* /*killer*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CLEAVE, 5000); events.ScheduleEvent(EVENT_IGNORED, 7000); enteredCombat = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!enteredCombat) { @@ -207,7 +207,7 @@ class npc_wrathbone_flayer : public CreatureScript bool enteredCombat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wrathbone_flayerAI(creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 2ca06610548..8e97c382fcc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -64,7 +64,7 @@ class boss_gurtogg_bloodboil : public CreatureScript public: boss_gurtogg_bloodboil() : CreatureScript("boss_gurtogg_bloodboil") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gurtogg_bloodboilAI(creature); } @@ -95,7 +95,7 @@ class boss_gurtogg_bloodboil : public CreatureScript bool Phase1; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetBossState(DATA_GURTOGG_BLOODBOIL, NOT_STARTED); @@ -121,7 +121,7 @@ class boss_gurtogg_bloodboil : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); Talk(SAY_AGGRO); @@ -129,12 +129,12 @@ class boss_gurtogg_bloodboil : public CreatureScript instance->SetBossState(DATA_GURTOGG_BLOODBOIL, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_GURTOGG_BLOODBOIL, DONE); @@ -198,7 +198,7 @@ class boss_gurtogg_bloodboil : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index a5917d19dfb..719aa201dff 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -381,14 +381,14 @@ class npc_flame_of_azzinoth : public CreatureScript { flame_of_azzinothAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { FlameBlastTimer = 15000; CheckTimer = 5000; GlaiveGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -433,7 +433,7 @@ class npc_flame_of_azzinoth : public CreatureScript GlaiveGUID = guid; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -462,7 +462,7 @@ class npc_flame_of_azzinoth : public CreatureScript uint64 GlaiveGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new flame_of_azzinothAI(creature); } @@ -483,11 +483,11 @@ class boss_illidan_stormrage : public CreatureScript AkamaGUID = 0; } - void Reset() OVERRIDE; + void Reset() override; - void JustSummoned(Creature* summon) OVERRIDE; + void JustSummoned(Creature* summon) override; - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { if (summon->GetCreatureTemplate()->Entry == FLAME_OF_AZZINOTH) { @@ -504,7 +504,7 @@ class boss_illidan_stormrage : public CreatureScript Summons.Despawn(summon); } - void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) OVERRIDE + void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) override { if (FlightCount == 7) // change hover point { @@ -519,13 +519,13 @@ class boss_illidan_stormrage : public CreatureScript Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->setActive(true); DoZoneInCombat(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || Phase >= PHASE_TALK_SEQUENCE) return; @@ -536,10 +536,10 @@ class boss_illidan_stormrage : public CreatureScript ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit*) OVERRIDE { } + void MoveInLineOfSight(Unit*) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -552,7 +552,7 @@ class boss_illidan_stormrage : public CreatureScript instance->HandleGameObject(instance->GetData64(i), true); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -560,7 +560,7 @@ class boss_illidan_stormrage : public CreatureScript Talk(SAY_ILLIDAN_KILL); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -568,7 +568,7 @@ class boss_illidan_stormrage : public CreatureScript done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades! { @@ -922,7 +922,7 @@ class boss_illidan_stormrage : public CreatureScript ++TransformCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE) return; @@ -1126,7 +1126,7 @@ class boss_illidan_stormrage : public CreatureScript SummonList Summons; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_illidan_stormrageAI(creature); } @@ -1144,7 +1144,7 @@ class boss_maiev_shadowsong : public CreatureScript { boss_maievAI(Creature* creature) : ScriptedAI(creature) { }; - void Reset() OVERRIDE + void Reset() override { MaxTimer = 0; Phase = PHASE_NORMAL_MAIEV; @@ -1156,17 +1156,17 @@ class boss_maiev_shadowsong : public CreatureScript me->SetUInt32Value(UNIT_FIELD_VIRTUAL_ITEM_ID + 2, 45738); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterEvadeMode() OVERRIDE { } + void EnterEvadeMode() override { } void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1181,7 +1181,7 @@ class boss_maiev_shadowsong : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || Timer[EVENT_MAIEV_STEALTH]) return; @@ -1199,7 +1199,7 @@ class boss_maiev_shadowsong : public CreatureScript ScriptedAI::AttackStart(who); } - void DoAction(int32 param) OVERRIDE + void DoAction(int32 param) override { if (param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX) EnterPhase(PhaseIllidan(param)); @@ -1271,7 +1271,7 @@ class boss_maiev_shadowsong : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if ((!UpdateVictim()) && !Timer[EVENT_MAIEV_STEALTH]) @@ -1348,7 +1348,7 @@ class boss_maiev_shadowsong : public CreatureScript uint32 MaxTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_maievAI(creature); } @@ -1367,7 +1367,7 @@ class npc_akama_illidan : public CreatureScript JustCreated = true; } - void Reset() OVERRIDE + void Reset() override { WalkCount = 0; if (instance) @@ -1423,24 +1423,24 @@ class npc_akama_illidan : public CreatureScript } // Do not call reset in Akama's evade mode, as this will stop him from summoning minions after he kills the first bit - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->RemoveAllAuras(); me->DeleteThreatList(); me->CombatStop(true); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE + void MovementInform(uint32 MovementType, uint32 /*Data*/) override { if (MovementType == POINT_MOTION_TYPE) Timer = 1; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (damage > me->GetHealth() || done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1688,7 +1688,7 @@ class npc_akama_illidan : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsVisible()) { @@ -1771,7 +1771,7 @@ class npc_akama_illidan : public CreatureScript DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); EnterPhase(PHASE_CHANNEL); @@ -1794,7 +1794,7 @@ class npc_akama_illidan : public CreatureScript uint32 Check_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_akama_illidanAI(creature); } @@ -1980,7 +1980,7 @@ class npc_cage_trap_trigger : public CreatureScript { cage_trap_triggerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { IllidanGUID = 0; @@ -1992,9 +1992,9 @@ class npc_cage_trap_trigger : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Active) @@ -2019,7 +2019,7 @@ class npc_cage_trap_trigger : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (DespawnTimer) { @@ -2045,7 +2045,7 @@ class npc_cage_trap_trigger : public CreatureScript bool SummonedBeams; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new cage_trap_triggerAI(creature); } @@ -2056,7 +2056,7 @@ class gameobject_cage_trap : public GameObjectScript public: gameobject_cage_trap() : GameObjectScript("gameobject_cage_trap") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { float x, y, z; player->GetPosition(x, y, z); @@ -2078,24 +2078,24 @@ class npc_shadow_demon : public CreatureScript { shadow_demonAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void Reset() OVERRIDE + void Reset() override { TargetGUID = 0; DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Unit* target = Unit::GetUnit(*me, TargetGUID)) target->RemoveAurasDueToSpell(SPELL_PARALYZE); } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -2119,7 +2119,7 @@ class npc_shadow_demon : public CreatureScript uint64 TargetGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new shadow_demonAI(creature); } @@ -2134,14 +2134,14 @@ class npc_blade_of_azzinoth : public CreatureScript { blade_of_azzinothAI(Creature* creature) : NullCreatureAI(creature) { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) me->SetDisplayId(MODEL_BLADE);// appear when hit by Illidan's glaive } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new blade_of_azzinothAI(creature); } @@ -2160,7 +2160,7 @@ class npc_parasitic_shadowfiend : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { if (instance) IllidanGUID = instance->GetData64(DATA_ILLIDAN_STORMRAGE); @@ -2171,7 +2171,7 @@ class npc_parasitic_shadowfiend : public CreatureScript DoCast(me, SPELL_SHADOWFIEND_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } @@ -2192,7 +2192,7 @@ class npc_parasitic_shadowfiend : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->GetVictim()) { @@ -2228,7 +2228,7 @@ class npc_parasitic_shadowfiend : public CreatureScript uint32 CheckTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_parasitic_shadowfiendAI(creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 6332ba00ead..a6c8cfba3c8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -84,7 +84,7 @@ class boss_mother_shahraz : public CreatureScript public: boss_mother_shahraz() : CreatureScript("boss_mother_shahraz") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shahrazAI(creature); } @@ -113,7 +113,7 @@ class boss_mother_shahraz : public CreatureScript bool Enraged; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetBossState(DATA_MOTHER_SHAHRAZ, NOT_STARTED); @@ -136,7 +136,7 @@ class boss_mother_shahraz : public CreatureScript Enraged = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetBossState(DATA_MOTHER_SHAHRAZ, IN_PROGRESS); @@ -145,12 +145,12 @@ class boss_mother_shahraz : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_MOTHER_SHAHRAZ, DONE); @@ -176,7 +176,7 @@ class boss_mother_shahraz : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 0212d7ec047..e6eac84c0fa 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -106,7 +106,7 @@ class npc_enslaved_soul : public CreatureScript public: npc_enslaved_soul() : CreatureScript("npc_enslaved_soul") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enslaved_soulAI(creature); } @@ -117,15 +117,15 @@ class npc_enslaved_soul : public CreatureScript uint64 ReliquaryGUID; - void Reset() OVERRIDE { ReliquaryGUID = 0; } + void Reset() override { ReliquaryGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) OVERRIDE; + void JustDied(Unit* /*killer*/) override; }; }; @@ -134,7 +134,7 @@ class boss_reliquary_of_souls : public CreatureScript public: boss_reliquary_of_souls() : CreatureScript("boss_reliquary_of_souls") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_reliquary_of_soulsAI(creature); } @@ -158,7 +158,7 @@ class boss_reliquary_of_souls : public CreatureScript uint32 SoulCount; uint32 SoulDeathCount; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetBossState(DATA_RELIQUARY_OF_SOULS, NOT_STARTED); @@ -178,7 +178,7 @@ class boss_reliquary_of_souls : public CreatureScript me->RemoveAurasDueToSpell(SPELL_SUBMERGE); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who) return; @@ -195,7 +195,7 @@ class boss_reliquary_of_souls : public CreatureScript AttackStartNoMove(who); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { me->AddThreat(who, 10000.0f); DoZoneInCombat(); @@ -243,13 +243,13 @@ class boss_reliquary_of_souls : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_RELIQUARY_OF_SOULS, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Phase) return; @@ -388,7 +388,7 @@ class boss_essence_of_suffering : public CreatureScript public: boss_essence_of_suffering() : CreatureScript("boss_essence_of_suffering") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_essence_of_sufferingAI(creature); } @@ -405,7 +405,7 @@ class boss_essence_of_suffering : public CreatureScript uint32 SoulDrainTimer; uint32 AuraTimer; - void Reset() OVERRIDE + void Reset() override { StatAuraGUID = 0; @@ -416,7 +416,7 @@ class boss_essence_of_suffering : public CreatureScript AuraTimer = 5000; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (damage >= me->GetHealth()) { @@ -427,7 +427,7 @@ class boss_essence_of_suffering : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -439,7 +439,7 @@ class boss_essence_of_suffering : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SUFF_SAY_SLAY); } @@ -468,7 +468,7 @@ class boss_essence_of_suffering : public CreatureScript me->AddThreat(target, 1000000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (me->IsInCombat()) { @@ -511,7 +511,7 @@ class boss_essence_of_desire : public CreatureScript public: boss_essence_of_desire() : CreatureScript("boss_essence_of_desire") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_essence_of_desireAI(creature); } @@ -524,7 +524,7 @@ class boss_essence_of_desire : public CreatureScript uint32 DeadenTimer; uint32 SoulShockTimer; - void Reset() OVERRIDE + void Reset() override { RuneShieldTimer = 60000; DeadenTimer = 30000; @@ -532,7 +532,7 @@ class boss_essence_of_desire : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_CONFUSE, true); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by == me) return; @@ -551,7 +551,7 @@ class boss_essence_of_desire : public CreatureScript } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) for (uint8 i = 0; i < 3; ++i) @@ -561,19 +561,19 @@ class boss_essence_of_desire : public CreatureScript me->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(DESI_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(DESI_SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -614,7 +614,7 @@ class boss_essence_of_anger : public CreatureScript public: boss_essence_of_anger() : CreatureScript("boss_essence_of_anger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_essence_of_angerAI(creature); } @@ -633,7 +633,7 @@ class boss_essence_of_anger : public CreatureScript bool CheckedAggro; - void Reset() OVERRIDE + void Reset() override { AggroTargetGUID = 0; @@ -646,7 +646,7 @@ class boss_essence_of_anger : public CreatureScript CheckedAggro = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(ANGER_SAY_FREED); @@ -654,17 +654,17 @@ class boss_essence_of_anger : public CreatureScript DoCast(me, AURA_OF_ANGER, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(ANGER_SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(ANGER_SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index e4997df818d..02053a51e7e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -174,7 +174,7 @@ class boss_shade_of_akama : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Reset() OVERRIDE + void Reset() override { if (!HasKilledAkamaAndReseting) { @@ -199,15 +199,15 @@ class boss_shade_of_akama : public CreatureScript HasKilledAkamaAndReseting = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_SHADE_OF_AKAMA, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -219,7 +219,7 @@ class boss_shade_of_akama : public CreatureScript ScriptedAI::AttackStart(who); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == SETDATA_DATA && value == SETDATA_CHANNELER_DIED) me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2); @@ -227,7 +227,7 @@ class boss_shade_of_akama : public CreatureScript UpdateSpeed(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_AKAMA_SOUL_CHANNEL) { @@ -257,7 +257,7 @@ class boss_shade_of_akama : public CreatureScript me->AddUnitState(UNIT_STATE_ROOT); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (HasKilledAkamaAndReseting) return; @@ -406,7 +406,7 @@ class boss_shade_of_akama : public CreatureScript bool HasKilledAkamaAndReseting; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_shade_of_akamaAI(creature); } @@ -428,7 +428,7 @@ class npc_akama_shade : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->setFaction(FACTION_FRIENDLY); me->SetFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -439,7 +439,7 @@ class npc_akama_shade : public CreatureScript ShadeHasDied = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Shade = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADE_OF_AKAMA))) if (Shade->IsAlive()) @@ -448,7 +448,7 @@ class npc_akama_shade : public CreatureScript me->GetMotionMaster()->MoveIdle(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_THREAT && !StartCombat) { @@ -461,13 +461,13 @@ class npc_akama_shade : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2000); events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, 5000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (StartChannel) { @@ -531,7 +531,7 @@ class npc_akama_shade : public CreatureScript DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override { if (action == 0) { @@ -550,7 +550,7 @@ class npc_akama_shade : public CreatureScript bool HasYelledOnce; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_akamaAI(creature); } @@ -572,7 +572,7 @@ class npc_ashtongue_channeler : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true); @@ -581,16 +581,16 @@ class npc_ashtongue_channeler : public CreatureScript events.ScheduleEvent(EVENT_CHANNEL, 2000); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Shade = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADE_OF_AKAMA))) Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -622,7 +622,7 @@ class npc_ashtongue_channeler : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ashtongue_channelerAI(creature); } @@ -644,7 +644,7 @@ class npc_creature_generator_akama : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { Summons.DespawnAll(); @@ -655,12 +655,12 @@ class npc_creature_generator_akama : public CreatureScript leftSide = true; } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { Summons.Summon(summon); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == SETDATA_DATA) { @@ -693,7 +693,7 @@ class npc_creature_generator_akama : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (doSpawning) { @@ -730,7 +730,7 @@ class npc_creature_generator_akama : public CreatureScript bool doSpawning; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_creature_generator_akamaAI(creature); } @@ -752,7 +752,7 @@ class npc_ashtongue_sorcerer : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { if (!startedBanishing) { @@ -773,29 +773,29 @@ class npc_ashtongue_sorcerer : public CreatureScript switchToCombat = false; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* Shade = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SHADE_OF_AKAMA))) Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED); me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!switchToCombat) return; ScriptedAI::AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -851,7 +851,7 @@ class npc_ashtongue_sorcerer : public CreatureScript bool switchToCombat; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ashtongue_sorcererAI(creature); } @@ -873,7 +873,7 @@ class npc_ashtongue_defender : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { summonerGuid = 0; @@ -881,18 +881,18 @@ class npc_ashtongue_defender : public CreatureScript AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HEROIC_STRIKE, 5000); events.ScheduleEvent(EVENT_SHIELD_BASH, urand(10000, 16000)); @@ -900,7 +900,7 @@ class npc_ashtongue_defender : public CreatureScript events.ScheduleEvent(EVENT_WINDFURY, urand(8000, 12000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -941,7 +941,7 @@ class npc_ashtongue_defender : public CreatureScript uint64 summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ashtongue_defenderAI(creature); } @@ -963,7 +963,7 @@ class npc_ashtongue_rogue : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { summonerGuid = 0; @@ -971,24 +971,24 @@ class npc_ashtongue_rogue : public CreatureScript AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand(500, 2000)); events.ScheduleEvent(EVENT_EVISCERATE, urand(2000, 5000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1021,7 +1021,7 @@ class npc_ashtongue_rogue : public CreatureScript uint64 summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ashtongue_rogueAI(creature); } @@ -1043,7 +1043,7 @@ class npc_ashtongue_elementalist : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { summonerGuid = 0; @@ -1051,24 +1051,24 @@ class npc_ashtongue_elementalist : public CreatureScript AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 18000); events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 6000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1101,7 +1101,7 @@ class npc_ashtongue_elementalist : public CreatureScript uint64 summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ashtongue_elementalistAI(creature); } @@ -1123,7 +1123,7 @@ class npc_ashtongue_spiritbinder : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { spiritMend = false; chainHeal = false; @@ -1133,23 +1133,23 @@ class npc_ashtongue_spiritbinder : public CreatureScript AttackStart(target); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) OVERRIDE + void IsSummonedBy(Unit* /*summoner*/) override { if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid))) CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (5000, 6000)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -1198,7 +1198,7 @@ class npc_ashtongue_spiritbinder : public CreatureScript bool chainHeal; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ashtongue_spiritbinderAI(creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 1057e426ab6..4a3ae0158f4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -65,7 +65,7 @@ class molten_flame : public CreatureScript public: molten_flame() : CreatureScript("molten_flame") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new molten_flameAI(creature); } @@ -74,7 +74,7 @@ class molten_flame : public CreatureScript { molten_flameAI(Creature* creature) : NullCreatureAI(creature) { } - void InitializeAI() OVERRIDE + void InitializeAI() override { float x, y, z; me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm())); @@ -90,7 +90,7 @@ class boss_supremus : public CreatureScript public: boss_supremus() : CreatureScript("boss_supremus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_supremusAI(creature); } @@ -107,7 +107,7 @@ class boss_supremus : public CreatureScript SummonList summons; uint32 phase; - void Reset() OVERRIDE + void Reset() override { if (instance) { @@ -121,7 +121,7 @@ class boss_supremus : public CreatureScript summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetBossState(DATA_SUPREMUS, IN_PROGRESS); @@ -158,7 +158,7 @@ class boss_supremus : public CreatureScript events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_SUPREMUS, DONE); @@ -166,12 +166,12 @@ class boss_supremus : public CreatureScript summons.DespawnAll(); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } @@ -199,7 +199,7 @@ class boss_supremus : public CreatureScript return target; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -263,7 +263,7 @@ class npc_volcano : public CreatureScript public: npc_volcano() : CreatureScript("npc_volcano") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_volcanoAI(creature); } @@ -275,7 +275,7 @@ class npc_volcano : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -285,17 +285,17 @@ class npc_volcano : public CreatureScript } uint32 wait; - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void DoAction(int32 /*info*/) OVERRIDE + void DoAction(int32 /*info*/) override { me->RemoveAura(SPELL_VOLCANIC_ERUPTION); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (wait <= diff)//wait 3secs before casting { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 6ecf2f38acd..cb23df06bbd 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -58,7 +58,7 @@ class npc_doom_blossom : public CreatureScript public: npc_doom_blossom() : CreatureScript("npc_doom_blossom") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doom_blossomAI(creature); } @@ -71,16 +71,16 @@ class npc_doom_blossom : public CreatureScript uint32 ShadowBoltTimer; uint64 TeronGUID; - void Reset() OVERRIDE + void Reset() override { CheckTeronTimer = 5000; ShadowBoltTimer = 12000; TeronGUID = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } void Despawn() @@ -89,7 +89,7 @@ class npc_doom_blossom : public CreatureScript me->RemoveCorpse(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckTeronTimer <= diff) { @@ -127,7 +127,7 @@ class npc_shadowy_construct : public CreatureScript public: npc_shadowy_construct() : CreatureScript("npc_shadowy_construct") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadowy_constructAI(creature); } @@ -142,7 +142,7 @@ class npc_shadowy_construct : public CreatureScript uint32 CheckPlayerTimer; uint32 CheckTeronTimer; - void Reset() OVERRIDE + void Reset() override { GhostGUID = 0; TeronGUID = 0; @@ -151,9 +151,9 @@ class npc_shadowy_construct : public CreatureScript CheckTeronTimer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || (!who->IsAlive()) || (who->GetGUID() == GhostGUID)) @@ -163,7 +163,7 @@ class npc_shadowy_construct : public CreatureScript } /* Comment it out for now. NOTE TO FUTURE DEV: UNCOMMENT THIS OUT ONLY AFTER MIND CONTROL IS IMPLEMENTED - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != GhostGUID) damage = 0; // Only the ghost can deal damage. @@ -192,7 +192,7 @@ class npc_shadowy_construct : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CheckPlayerTimer <= diff) { @@ -217,7 +217,7 @@ class boss_teron_gorefiend : public CreatureScript public: boss_teron_gorefiend() : CreatureScript("boss_teron_gorefiend") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_teron_gorefiendAI(creature); } @@ -246,7 +246,7 @@ class boss_teron_gorefiend : public CreatureScript bool Intro; bool Done; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetBossState(DATA_TERON_GOREFIEND, NOT_STARTED); @@ -268,9 +268,9 @@ class boss_teron_gorefiend : public CreatureScript Done = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro && who->GetTypeId() == TypeID::TYPEID_PLAYER && me->CanCreatureAttack(who)) @@ -292,12 +292,12 @@ class boss_teron_gorefiend : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_TERON_GOREFIEND, DONE); @@ -383,7 +383,7 @@ class boss_teron_gorefiend : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Intro && !Done) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 5b2de32100f..504c63bf6f6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -77,7 +77,7 @@ class boss_najentus : public CreatureScript public: boss_najentus() : CreatureScript("boss_najentus") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_najentusAI(creature); } @@ -94,7 +94,7 @@ class boss_najentus : public CreatureScript uint64 SpineTargetGUID; - void Reset() OVERRIDE + void Reset() override { events.Reset(); @@ -104,13 +104,13 @@ class boss_najentus : public CreatureScript instance->SetBossState(DATA_HIGH_WARLORD_NAJENTUS, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); events.DelayEvents(5000, GCD_YELL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetBossState(DATA_HIGH_WARLORD_NAJENTUS, DONE); @@ -118,7 +118,7 @@ class boss_najentus : public CreatureScript Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { @@ -128,7 +128,7 @@ class boss_najentus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetBossState(DATA_HIGH_WARLORD_NAJENTUS, IN_PROGRESS); @@ -159,7 +159,7 @@ class boss_najentus : public CreatureScript events.RescheduleEvent(EVENT_SHIELD, 60000 + inc); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -225,7 +225,7 @@ class go_najentus_spine : public GameObjectScript public: go_najentus_spine() : GameObjectScript("go_najentus_spine") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) if (Creature* Najentus = ObjectAccessor::GetCreature(*go, instance->GetData64(DATA_HIGH_WARLORD_NAJENTUS))) diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 06919676170..7b224e8f3bd 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -122,7 +122,7 @@ class npc_blood_elf_council_voice_trigger : public CreatureScript public: npc_blood_elf_council_voice_trigger() : CreatureScript("npc_blood_elf_council_voice_trigger") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_blood_elf_council_voice_triggerAI(c); } @@ -144,7 +144,7 @@ class npc_blood_elf_council_voice_trigger : public CreatureScript bool EventStarted; - void Reset() OVERRIDE + void Reset() override { EnrageTimer = 900000; // 15 minutes AggroYellTimer = 500; @@ -166,13 +166,13 @@ class npc_blood_elf_council_voice_trigger : public CreatureScript } else SF_LOG_ERROR("scripts", ERROR_INST_DATA); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!EventStarted) return; @@ -217,7 +217,7 @@ class npc_illidari_council : public CreatureScript public: npc_illidari_council() : CreatureScript("npc_illidari_council") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_illidari_councilAI(creature); } @@ -242,7 +242,7 @@ class npc_illidari_council : public CreatureScript bool EventBegun; - void Reset() OVERRIDE + void Reset() override { CheckTimer = 2000; EndEventTimer = 0; @@ -278,9 +278,9 @@ class npc_illidari_council : public CreatureScript me->SetDisplayId(11686); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } void StartEvent(Unit* target) @@ -318,7 +318,7 @@ class npc_illidari_council : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!EventBegun) return; @@ -398,7 +398,7 @@ struct boss_illidari_councilAI : public ScriptedAI bool LoadedGUIDs; - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -420,7 +420,7 @@ struct boss_illidari_councilAI : public ScriptedAI LoadGUIDs(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { for (uint8 i = 0; i < 4; ++i) { @@ -434,7 +434,7 @@ struct boss_illidari_councilAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by == me) return; @@ -473,7 +473,7 @@ class boss_gathios_the_shatterer : public CreatureScript public: boss_gathios_the_shatterer() : CreatureScript("boss_gathios_the_shatterer") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gathios_the_shattererAI(creature); } @@ -488,7 +488,7 @@ class boss_gathios_the_shatterer : public CreatureScript uint32 AuraTimer; uint32 BlessingTimer; - void Reset() OVERRIDE + void Reset() override { ConsecrationTimer = 40000; HammerOfJusticeTimer = 10000; @@ -497,12 +497,12 @@ class boss_gathios_the_shatterer : public CreatureScript BlessingTimer = 60000; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_GATH_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_GATH_DEATH); } @@ -536,7 +536,7 @@ class boss_gathios_the_shatterer : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -604,7 +604,7 @@ class boss_high_nethermancer_zerevor : public CreatureScript public: boss_high_nethermancer_zerevor() : CreatureScript("boss_high_nethermancer_zerevor") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_high_nethermancer_zerevorAI(creature); } @@ -620,7 +620,7 @@ class boss_high_nethermancer_zerevor : public CreatureScript uint32 Cooldown; uint32 ArcaneExplosionTimer; - void Reset() OVERRIDE + void Reset() override { BlizzardTimer = urand(30, 91) * 1000; FlamestrikeTimer = urand(30, 91) * 1000; @@ -630,17 +630,17 @@ class boss_high_nethermancer_zerevor : public CreatureScript Cooldown = 0; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_ZERE_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_ZERE_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -707,7 +707,7 @@ class boss_lady_malande : public CreatureScript public: boss_lady_malande() : CreatureScript("boss_lady_malande") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lady_malandeAI(creature); } @@ -721,7 +721,7 @@ class boss_lady_malande : public CreatureScript uint32 DivineWrathTimer; uint32 ReflectiveShieldTimer; - void Reset() OVERRIDE + void Reset() override { EmpoweredSmiteTimer = 38000; CircleOfHealingTimer = 20000; @@ -729,17 +729,17 @@ class boss_lady_malande : public CreatureScript ReflectiveShieldTimer = 0; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_MALA_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_MALA_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -784,7 +784,7 @@ class boss_veras_darkshadow : public CreatureScript public: boss_veras_darkshadow() : CreatureScript("boss_veras_darkshadow") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_veras_darkshadowAI(creature); } @@ -801,7 +801,7 @@ class boss_veras_darkshadow : public CreatureScript bool HasVanished; - void Reset() OVERRIDE + void Reset() override { EnvenomTargetGUID = 0; @@ -814,17 +814,17 @@ class boss_veras_darkshadow : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_VERA_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_VERA_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -898,7 +898,7 @@ class spell_boss_lady_malande_shield : public SpellScriptLoader { PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T); } @@ -912,13 +912,13 @@ class spell_boss_lady_malande_shield : public SpellScriptLoader target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_REFLECTIVE_SHIELD_T, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_boss_lady_malande_shield_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_boss_lady_malande_shield_AuraScript(); } diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index eb6bed86a48..b0d0a0d089d 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -68,7 +68,7 @@ class instance_black_temple : public InstanceMapScript memset(IllidanDoorGUIDs, 0, 2 * sizeof(uint64)); } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -113,7 +113,7 @@ class instance_black_temple : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -143,7 +143,7 @@ class instance_black_temple : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -164,7 +164,7 @@ class instance_black_temple : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -205,7 +205,7 @@ class instance_black_temple : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -216,7 +216,7 @@ class instance_black_temple : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -269,7 +269,7 @@ class instance_black_temple : public InstanceMapScript uint64 IllidanDoorGUIDs[2]; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_black_temple_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index c981dc9238d..be3075476a4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -104,7 +104,7 @@ class boss_fathomlord_karathress : public CreatureScript public: boss_fathomlord_karathress() : CreatureScript("boss_fathomlord_karathress") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fathomlord_karathressAI(creature); } @@ -129,7 +129,7 @@ class boss_fathomlord_karathress : public CreatureScript uint64 Advisors[MAX_ADVISORS]; - void Reset() OVERRIDE + void Reset() override { CataclysmicBolt_Timer = 10000; Enrage_Timer = 600000; //10 minutes @@ -202,12 +202,12 @@ class boss_fathomlord_karathress : public CreatureScript instance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -218,12 +218,12 @@ class boss_fathomlord_karathress : public CreatureScript me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { StartEvent(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -310,7 +310,7 @@ class boss_fathomguard_sharkkis : public CreatureScript public: boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fathomguard_sharkkisAI(creature); } @@ -333,7 +333,7 @@ class boss_fathomguard_sharkkis : public CreatureScript uint64 SummonedPet; - void Reset() OVERRIDE + void Reset() override { LeechingThrow_Timer = 20000; TheBeastWithin_Timer = 30000; @@ -354,7 +354,7 @@ class boss_fathomguard_sharkkis : public CreatureScript instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -363,7 +363,7 @@ class boss_fathomguard_sharkkis : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -372,7 +372,7 @@ class boss_fathomguard_sharkkis : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -456,7 +456,7 @@ class boss_fathomguard_tidalvess : public CreatureScript public: boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fathomguard_tidalvessAI(creature); } @@ -475,7 +475,7 @@ class boss_fathomguard_tidalvess : public CreatureScript uint32 PoisonCleansing_Timer; uint32 Earthbind_Timer; - void Reset() OVERRIDE + void Reset() override { FrostShock_Timer = 25000; Spitfire_Timer = 60000; @@ -486,7 +486,7 @@ class boss_fathomguard_tidalvess : public CreatureScript instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -495,7 +495,7 @@ class boss_fathomguard_tidalvess : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -505,7 +505,7 @@ class boss_fathomguard_tidalvess : public CreatureScript DoCast(me, SPELL_WINDFURY_WEAPON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -578,7 +578,7 @@ class boss_fathomguard_caribdis : public CreatureScript public: boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_fathomguard_caribdisAI(creature); } @@ -597,7 +597,7 @@ class boss_fathomguard_caribdis : public CreatureScript uint32 Heal_Timer; uint32 Cyclone_Timer; - void Reset() OVERRIDE + void Reset() override { WaterBoltVolley_Timer = 35000; TidalSurge_Timer = 15000+rand()%5000; @@ -608,7 +608,7 @@ class boss_fathomguard_caribdis : public CreatureScript instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -617,7 +617,7 @@ class boss_fathomguard_caribdis : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -626,7 +626,7 @@ class boss_fathomguard_caribdis : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 8df1c762606..84bbd3606c2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -86,7 +86,7 @@ class boss_hydross_the_unstable : public CreatureScript public: boss_hydross_the_unstable() : CreatureScript("boss_hydross_the_unstable") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_hydross_the_unstableAI(creature); } @@ -115,7 +115,7 @@ class boss_hydross_the_unstable : public CreatureScript bool beam; SummonList Summons; - void Reset() OVERRIDE + void Reset() override { DeSummonBeams(); beams[0] = 0; @@ -172,7 +172,7 @@ class boss_hydross_the_unstable : public CreatureScript } } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -180,12 +180,12 @@ class boss_hydross_the_unstable : public CreatureScript instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(CorruptedForm ? SAY_CORRUPT_SLAY : SAY_CLEAN_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == ENTRY_PURE_SPAWN) { @@ -201,12 +201,12 @@ class boss_hydross_the_unstable : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { Summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(CorruptedForm ? SAY_CORRUPT_DEATH : SAY_CLEAN_DEATH); @@ -215,7 +215,7 @@ class boss_hydross_the_unstable : public CreatureScript Summons.DespawnAll(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!beam) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 44e182834c4..3d6049d7280 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -140,7 +140,7 @@ class boss_lady_vashj : public CreatureScript public: boss_lady_vashj() : CreatureScript("boss_lady_vashj") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lady_vashjAI(creature); } @@ -181,7 +181,7 @@ class boss_lady_vashj : public CreatureScript bool CanAttack; bool JustCreated; - void Reset() OVERRIDE + void Reset() override { AggroTimer = 19000; ShockBlastTimer = 1+rand()%60000; @@ -230,12 +230,12 @@ class boss_lady_vashj : public CreatureScript if (TaintedElementalTimer > 50000) TaintedElementalTimer = 50000; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -253,7 +253,7 @@ class boss_lady_vashj : public CreatureScript instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (instance) { @@ -270,7 +270,7 @@ class boss_lady_vashj : public CreatureScript AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro) @@ -318,7 +318,7 @@ class boss_lady_vashj : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!CanAttack && Intro) { @@ -555,7 +555,7 @@ class npc_enchanted_elemental : public CreatureScript public: npc_enchanted_elemental() : CreatureScript("npc_enchanted_elemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enchanted_elementalAI(creature); } @@ -574,7 +574,7 @@ class npc_enchanted_elemental : public CreatureScript uint64 VashjGUID; - void Reset() OVERRIDE + void Reset() override { me->SetSpeed(MOVE_WALK, 0.6f); // walk me->SetSpeed(MOVE_RUN, 0.6f); // run @@ -602,12 +602,12 @@ class npc_enchanted_elemental : public CreatureScript VashjGUID = instance->GetData64(DATA_LADYVASHJ); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; @@ -649,7 +649,7 @@ class npc_tainted_elemental : public CreatureScript public: npc_tainted_elemental() : CreatureScript("npc_tainted_elemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tainted_elementalAI(creature); } @@ -666,25 +666,25 @@ class npc_tainted_elemental : public CreatureScript uint32 PoisonBoltTimer; uint32 DespawnTimer; - void Reset() OVERRIDE + void Reset() override { PoisonBoltTimer = 5000+rand()%5000; DespawnTimer = 30000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) if (Creature* vashj = Unit::GetCreature((*me), instance->GetData64(DATA_LADYVASHJ))) CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->EventTaintedElementalDeath(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { me->AddThreat(who, 0.1f); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // PoisonBoltTimer if (PoisonBoltTimer <= diff) @@ -717,7 +717,7 @@ class npc_toxic_sporebat : public CreatureScript public: npc_toxic_sporebat() : CreatureScript("npc_toxic_sporebat") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_toxic_sporebatAI(creature); } @@ -737,7 +737,7 @@ class npc_toxic_sporebat : public CreatureScript uint32 BoltTimer; uint32 CheckTimer; - void Reset() OVERRIDE + void Reset() override { me->SetDisableGravity(true); me->setFaction(14); @@ -747,12 +747,12 @@ class npc_toxic_sporebat : public CreatureScript CheckTimer = 1000; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -761,7 +761,7 @@ class npc_toxic_sporebat : public CreatureScript MovementTimer = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Random movement if (MovementTimer <= diff) @@ -815,7 +815,7 @@ class npc_shield_generator_channel : public CreatureScript public: npc_shield_generator_channel() : CreatureScript("npc_shield_generator_channel") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shield_generator_channelAI(creature); } @@ -831,7 +831,7 @@ class npc_shield_generator_channel : public CreatureScript uint32 CheckTimer; bool Casted; - void Reset() OVERRIDE + void Reset() override { CheckTimer = 0; Casted = false; @@ -840,10 +840,10 @@ class npc_shield_generator_channel : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!instance) return; @@ -872,7 +872,7 @@ class item_tainted_core : public ItemScript public: item_tainted_core() : ItemScript("item_tainted_core") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) OVERRIDE + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 0525c54116e..44f9279a4fd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -76,7 +76,7 @@ class npc_inner_demon : public CreatureScript public: npc_inner_demon() : CreatureScript("npc_inner_demon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_inner_demonAI(creature); } @@ -93,33 +93,33 @@ class npc_inner_demon : public CreatureScript uint32 Link_Timer; uint64 victimGUID; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 10000; Link_Timer = 1000; } - void SetGUID(uint64 guid, int32 id/* = 0 */) OVERRIDE + void SetGUID(uint64 guid, int32 id/* = 0 */) override { if (id == INNER_DEMON_VICTIM) victimGUID = guid; } - uint64 GetGUID(int32 id/* = 0 */) const OVERRIDE + uint64 GetGUID(int32 id/* = 0 */) const override { if (id == INNER_DEMON_VICTIM) return victimGUID; return 0; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Unit* unit = Unit::GetUnit(*me, victimGUID); if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER)) unit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != me->GetGUID()) { @@ -128,13 +128,13 @@ class npc_inner_demon : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (!victimGUID) return; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -181,7 +181,7 @@ class boss_leotheras_the_blind : public CreatureScript public: boss_leotheras_the_blind() : CreatureScript("boss_leotheras_the_blind") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_leotheras_the_blindAI(creature); } @@ -220,7 +220,7 @@ class boss_leotheras_the_blind : public CreatureScript uint64 Demon; uint64 SpellBinderGUID[3]; - void Reset() OVERRIDE + void Reset() override { CheckChannelers(); BanishTimer = 1000; @@ -266,7 +266,7 @@ class boss_leotheras_the_blind : public CreatureScript SpellBinderGUID[i] = binder->GetGUID(); } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasAura(AURA_BANISH)) @@ -386,7 +386,7 @@ class boss_leotheras_the_blind : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -394,7 +394,7 @@ class boss_leotheras_the_blind : public CreatureScript Talk(DemonForm ? SAY_DEMON_SLAY : SAY_NIGHTELF_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -408,7 +408,7 @@ class boss_leotheras_the_blind : public CreatureScript instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (me->HasAura(AURA_BANISH)) return; @@ -416,7 +416,7 @@ class boss_leotheras_the_blind : public CreatureScript me->LoadEquipment(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (me->HasAura(AURA_BANISH) || !UpdateVictim()) @@ -604,7 +604,7 @@ class boss_leotheras_the_blind_demonform : public CreatureScript public: boss_leotheras_the_blind_demonform() : CreatureScript("boss_leotheras_the_blind_demonform") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_leotheras_the_blind_demonformAI(creature); } @@ -616,7 +616,7 @@ class boss_leotheras_the_blind_demonform : public CreatureScript uint32 ChaosBlast_Timer; bool DealDamage; - void Reset() OVERRIDE + void Reset() override { ChaosBlast_Timer = 1000; DealDamage = true; @@ -627,7 +627,7 @@ class boss_leotheras_the_blind_demonform : public CreatureScript Talk(SAY_FREE); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) return; @@ -635,18 +635,18 @@ class boss_leotheras_the_blind_demonform : public CreatureScript Talk(SAY_DEMON_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) DoCast(me, 8149, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { StartEvent(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -677,7 +677,7 @@ class npc_greyheart_spellbinder : public CreatureScript public: npc_greyheart_spellbinder() : CreatureScript("npc_greyheart_spellbinder") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_greyheart_spellbinderAI(creature); } @@ -700,7 +700,7 @@ class npc_greyheart_spellbinder : public CreatureScript bool AddedBanish; - void Reset() OVERRIDE + void Reset() override { Mindblast_Timer = urand(3000, 8000); Earthshock_Timer = urand(5000, 10000); @@ -714,14 +714,14 @@ class npc_greyheart_spellbinder : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { me->InterruptNonMeleeSpells(false); if (instance) instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); } - void JustRespawned() OVERRIDE + void JustRespawned() override { AddedBanish = false; Reset(); @@ -740,7 +740,7 @@ class npc_greyheart_spellbinder : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance) { @@ -803,7 +803,7 @@ class npc_greyheart_spellbinder : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE { } + void JustDied(Unit* /*killer*/) override { } }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index b9038090ca7..d6f3e83871e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -81,7 +81,7 @@ class boss_the_lurker_below : public CreatureScript public: boss_the_lurker_below() : CreatureScript("boss_the_lurker_below") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_the_lurker_belowAI(creature); } @@ -118,7 +118,7 @@ class boss_the_lurker_below : public CreatureScript return false; return true; } - void Reset() OVERRIDE + void Reset() override { me->SetSwim(true); me->SetDisableGravity(true); @@ -151,7 +151,7 @@ class boss_the_lurker_below : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -162,13 +162,13 @@ class boss_the_lurker_below : public CreatureScript Summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!CanStartEvent) // boss is invisible, don't attack @@ -181,13 +181,13 @@ class boss_the_lurker_below : public CreatureScript } } - void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*id*/) override { if (type == ROTATE_MOTION_TYPE) me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!CanStartEvent) // boss is invisible, don't attack { @@ -372,7 +372,7 @@ class npc_coilfang_ambusher : public CreatureScript public: npc_coilfang_ambusher() : CreatureScript("npc_coilfang_ambusher") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_coilfang_ambusherAI(creature); } @@ -387,13 +387,13 @@ class npc_coilfang_ambusher : public CreatureScript uint32 MultiShotTimer; uint32 ShootBowTimer; - void Reset() OVERRIDE + void Reset() override { MultiShotTimer = 10000; ShootBowTimer = 4000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -403,7 +403,7 @@ class npc_coilfang_ambusher : public CreatureScript AttackStart(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (MultiShotTimer <= diff) { @@ -431,7 +431,7 @@ class go_strange_pool : public GameObjectScript public: go_strange_pool() : GameObjectScript("go_strange_pool") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { // 25% if (InstanceScript* instanceScript = go->GetInstanceScript()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 9db46ca9fa5..2e3faad4d95 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -91,7 +91,7 @@ class boss_morogrim_tidewalker : public CreatureScript public: boss_morogrim_tidewalker() : CreatureScript("boss_morogrim_tidewalker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_morogrim_tidewalkerAI(creature); } @@ -118,7 +118,7 @@ class boss_morogrim_tidewalker : public CreatureScript bool Earthquake; bool Phase2; - void Reset() OVERRIDE + void Reset() override { TidalWave_Timer = 10000; WateryGrave_Timer = 30000; @@ -144,12 +144,12 @@ class boss_morogrim_tidewalker : public CreatureScript instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -157,7 +157,7 @@ class boss_morogrim_tidewalker : public CreatureScript instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { PlayerList = &me->GetMap()->GetPlayers(); Playercount = PlayerList->getSize(); @@ -175,7 +175,7 @@ class boss_morogrim_tidewalker : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -293,7 +293,7 @@ class npc_water_globule : public CreatureScript public: npc_water_globule() : CreatureScript("npc_water_globule") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_water_globuleAI(creature); } @@ -304,7 +304,7 @@ class npc_water_globule : public CreatureScript uint32 Check_Timer; - void Reset() OVERRIDE + void Reset() override { Check_Timer = 1000; @@ -313,9 +313,9 @@ class npc_water_globule : public CreatureScript me->setFaction(14); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || me->GetVictim()) @@ -329,7 +329,7 @@ class npc_water_globule : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 7be04ef9bd1..57de7cbab4d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -66,7 +66,7 @@ class go_bridge_console : public GameObjectScript public: go_bridge_console() : GameObjectScript("go_bridge_console") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); @@ -91,7 +91,7 @@ class instance_serpent_shrine : public InstanceMapScript { } - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -123,7 +123,7 @@ class instance_serpent_shrine : public InstanceMapScript TrashCount = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -132,7 +132,7 @@ class instance_serpent_shrine : public InstanceMapScript return false; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { //Water checks if (WaterCheckTimer <= diff) @@ -190,7 +190,7 @@ class instance_serpent_shrine : public InstanceMapScript FrenzySpawnTimer -= diff; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -215,7 +215,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -245,7 +245,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) OVERRIDE + void SetData64(uint32 type, uint64 data) override { if (type == DATA_KARATHRESSEVENT_STARTER) KarathressEvent_Starter = data; @@ -253,7 +253,7 @@ class instance_serpent_shrine : public InstanceMapScript LeotherasEventStarter = data; } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -281,7 +281,7 @@ class instance_serpent_shrine : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -351,7 +351,7 @@ class instance_serpent_shrine : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -391,7 +391,7 @@ class instance_serpent_shrine : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; std::ostringstream stream; @@ -401,7 +401,7 @@ class instance_serpent_shrine : public InstanceMapScript return stream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -446,7 +446,7 @@ class instance_serpent_shrine : public InstanceMapScript bool DoSpawnFrenzy; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_serpentshrine_cavern_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 606b7b5acb8..f68e77710bb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -41,7 +41,7 @@ class boss_hydromancer_thespia : public CreatureScript public: boss_hydromancer_thespia() : CreatureScript("boss_hydromancer_thespia") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_thespiaAI(creature); } @@ -59,7 +59,7 @@ class boss_hydromancer_thespia : public CreatureScript uint32 LungBurst_Timer; uint32 EnvelopingWinds_Timer; - void Reset() OVERRIDE + void Reset() override { LightningCloud_Timer = 15000; LungBurst_Timer = 7000; @@ -69,7 +69,7 @@ class boss_hydromancer_thespia : public CreatureScript instance->SetBossState(DATA_HYDROMANCER_THESPIA, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEAD); @@ -77,12 +77,12 @@ class boss_hydromancer_thespia : public CreatureScript instance->SetBossState(DATA_HYDROMANCER_THESPIA, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -90,7 +90,7 @@ class boss_hydromancer_thespia : public CreatureScript instance->SetBossState(DATA_HYDROMANCER_THESPIA, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -140,7 +140,7 @@ class npc_coilfang_waterelemental : public CreatureScript public: npc_coilfang_waterelemental() : CreatureScript("npc_coilfang_waterelemental") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_coilfang_waterelementalAI(creature); } @@ -151,14 +151,14 @@ class npc_coilfang_waterelemental : public CreatureScript uint32 WaterBoltVolley_Timer; - void Reset() OVERRIDE + void Reset() override { WaterBoltVolley_Timer = 3000+rand()%3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 3abd2ad5ed6..47d571fe0b1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -58,7 +58,7 @@ class boss_mekgineer_steamrigger : public CreatureScript public: boss_mekgineer_steamrigger() : CreatureScript("boss_mekgineer_steamrigger") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mekgineer_steamriggerAI(creature); } @@ -79,7 +79,7 @@ class boss_mekgineer_steamrigger : public CreatureScript bool Summon50; bool Summon25; - void Reset() OVERRIDE + void Reset() override { Shrink_Timer = 20000; Saw_Blade_Timer = 15000; @@ -93,7 +93,7 @@ class boss_mekgineer_steamrigger : public CreatureScript instance->SetBossState(DATA_MEKGINEER_STEAMRIGGER, NOT_STARTED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -101,12 +101,12 @@ class boss_mekgineer_steamrigger : public CreatureScript instance->SetBossState(DATA_MEKGINEER_STEAMRIGGER, DONE); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -129,7 +129,7 @@ class boss_mekgineer_steamrigger : public CreatureScript DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TempSummonType::TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -197,7 +197,7 @@ class npc_steamrigger_mechanic : public CreatureScript public: npc_steamrigger_mechanic() : CreatureScript("npc_steamrigger_mechanic") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_steamrigger_mechanicAI(creature); } @@ -213,19 +213,19 @@ class npc_steamrigger_mechanic : public CreatureScript uint32 Repair_Timer; - void Reset() OVERRIDE + void Reset() override { Repair_Timer = 2000; } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + void MoveInLineOfSight(Unit* /*who*/) override { //react only if attacked } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Repair_Timer <= diff) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 99484f1fd61..bd05696d177 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -51,7 +51,7 @@ class npc_naga_distiller : public CreatureScript public: npc_naga_distiller() : CreatureScript("npc_naga_distiller") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_naga_distillerAI(creature); } @@ -65,7 +65,7 @@ class npc_naga_distiller : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -81,7 +81,7 @@ class npc_naga_distiller : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void StartRageGen(Unit* /*caster*/) { @@ -94,7 +94,7 @@ class npc_naga_distiller : public CreatureScript instance->SetData(DATA_DISTILLER, IN_PROGRESS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*done_by*/, uint32 &damage) override { if (me->GetHealth() <= damage) if (instance) @@ -108,7 +108,7 @@ class boss_warlord_kalithresh : public CreatureScript public: boss_warlord_kalithresh() : CreatureScript("boss_warlord_kalithresh") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warlord_kalithreshAI(creature); } @@ -127,7 +127,7 @@ class boss_warlord_kalithresh : public CreatureScript uint32 Rage_Timer; bool CanRage; - void Reset() OVERRIDE + void Reset() override { Reflection_Timer = 10000; Impale_Timer = 7000+rand()%7000; @@ -138,7 +138,7 @@ class boss_warlord_kalithresh : public CreatureScript instance->SetBossState(DATA_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -146,12 +146,12 @@ class boss_warlord_kalithresh : public CreatureScript instance->SetBossState(DATA_WARLORD_KALITHRESH, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) @@ -160,7 +160,7 @@ class boss_warlord_kalithresh : public CreatureScript me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -168,7 +168,7 @@ class boss_warlord_kalithresh : public CreatureScript instance->SetBossState(DATA_WARLORD_KALITHRESH, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 2017802f661..58be7a4bffc 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -27,7 +27,7 @@ class go_main_chambers_access_panel : public GameObjectScript public: go_main_chambers_access_panel() : GameObjectScript("go_main_chambers_access_panel") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); if (!instance) @@ -68,7 +68,7 @@ class instance_steam_vault : public InstanceMapScript DistillerState = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -86,7 +86,7 @@ class instance_steam_vault : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -98,7 +98,7 @@ class instance_steam_vault : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -114,20 +114,20 @@ class instance_steam_vault : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { if (type == DATA_DISTILLER) DistillerState = data; } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_DISTILLER) return DistillerState; return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -159,7 +159,7 @@ class instance_steam_vault : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -170,7 +170,7 @@ class instance_steam_vault : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -211,7 +211,7 @@ class instance_steam_vault : public InstanceMapScript uint8 DistillerState; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_steam_vault_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp index 9b719d4605b..d7050840bc2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/instance_the_slave_pens.cpp @@ -33,7 +33,7 @@ class instance_the_slave_pens : public InstanceMapScript public: instance_the_slave_pens() : InstanceMapScript("instance_the_slave_pens", 547) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_slave_pens_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index b1ac3112b65..c40d16e4052 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -43,7 +43,7 @@ class boss_hungarfen : public CreatureScript public: boss_hungarfen() : CreatureScript("boss_hungarfen") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_hungarfenAI(creature); } @@ -58,18 +58,18 @@ class boss_hungarfen : public CreatureScript uint32 Mushroom_Timer; uint32 AcidGeyser_Timer; - void Reset() OVERRIDE + void Reset() override { Root = false; Mushroom_Timer = 5000; // 1 mushroom after 5s, then one per 10s. This should be different in heroic mode AcidGeyser_Timer = 10000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -110,7 +110,7 @@ class npc_underbog_mushroom : public CreatureScript public: npc_underbog_mushroom() : CreatureScript("npc_underbog_mushroom") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_underbog_mushroomAI(creature); } @@ -123,7 +123,7 @@ class npc_underbog_mushroom : public CreatureScript uint32 Grow_Timer; uint32 Shrink_Timer; - void Reset() OVERRIDE + void Reset() override { Stop = false; Grow_Timer = 0; @@ -133,14 +133,14 @@ class npc_underbog_mushroom : public CreatureScript DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Stop) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index 01c11d810fb..d177da0dbff 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -49,7 +49,7 @@ class boss_the_black_stalker : public CreatureScript public: boss_the_black_stalker() : CreatureScript("boss_the_black_stalker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_the_black_stalkerAI(creature); } @@ -70,7 +70,7 @@ class boss_the_black_stalker : public CreatureScript uint32 check_Timer; std::list Striders; - void Reset() OVERRIDE + void Reset() override { Levitate_Timer = 12000; ChainLightning_Timer = 6000; @@ -82,9 +82,9 @@ class boss_the_black_stalker : public CreatureScript Striders.clear(); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { @@ -97,14 +97,14 @@ class boss_the_black_stalker : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { for (std::list::const_iterator i = Striders.begin(); i != Striders.end(); ++i) if (Creature* strider = Unit::GetCreature(*me, *i)) strider->DisappearAndDie(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp index 7a991c67c8a..438fd28f6a2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/instance_the_underbog.cpp @@ -33,7 +33,7 @@ class instance_the_underbog : public InstanceMapScript public: instance_the_underbog() : InstanceMapScript("instance_the_underbog", 546) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_underbog_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index a135e4a10ad..200b4f344cb 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -85,7 +85,7 @@ class boss_gruul : public CreatureScript bool m_bPerformingGroundSlam; - void Reset() OVERRIDE + void Reset() override { _Reset(); m_uiGrowth_Timer= 30000; @@ -97,25 +97,25 @@ class boss_gruul : public CreatureScript m_uiReverberation_Timer= 60000+45000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void SpellHitTarget(Unit* target, const SpellInfo* pSpell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* pSpell) override { //This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction //It's initially wrong, since this will cause fall damage, which is by comments, not intended. @@ -155,7 +155,7 @@ class boss_gruul : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -251,7 +251,7 @@ class boss_gruul : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI(creature); } @@ -266,7 +266,7 @@ class spell_gruul_shatter : public SpellScriptLoader { PrepareSpellScript(spell_gruul_shatter_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_STONED)) return false; @@ -284,13 +284,13 @@ class spell_gruul_shatter : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gruul_shatter_SpellScript(); } @@ -319,13 +319,13 @@ class spell_gruul_shatter_effect : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gruul_shatter_effect_SpellScript(); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index ce5da2d85d4..e2e9eb1dc1c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -92,7 +92,7 @@ class boss_high_king_maulgar : public CreatureScript bool Phase2; - void Reset() OVERRIDE + void Reset() override { ArcingSmash_Timer = 10000; MightyBlow_Timer = 40000; @@ -107,32 +107,32 @@ class boss_high_king_maulgar : public CreatureScript instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); instance->SetBossState(DATA_MAULGAR, DONE); } - void DoAction(int32 actionId) OVERRIDE + void DoAction(int32 actionId) override { if (actionId == ACTION_ADD_DEATH) Talk(SAY_OGRE_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -196,7 +196,7 @@ class boss_high_king_maulgar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI(creature); } @@ -220,7 +220,7 @@ class boss_olm_the_summoner : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { DarkDecay_Timer = 10000; Summon_Timer = 15000; @@ -229,7 +229,7 @@ class boss_olm_the_summoner : public CreatureScript instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who) return; @@ -244,13 +244,13 @@ class boss_olm_the_summoner : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -258,7 +258,7 @@ class boss_olm_the_summoner : public CreatureScript instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -291,7 +291,7 @@ class boss_olm_the_summoner : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI(creature); } @@ -317,7 +317,7 @@ class boss_kiggler_the_crazed : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { GreaterPolymorph_Timer = 5000; LightningBolt_Timer = 10000; @@ -327,13 +327,13 @@ class boss_kiggler_the_crazed : public CreatureScript instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -341,7 +341,7 @@ class boss_kiggler_the_crazed : public CreatureScript instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -380,7 +380,7 @@ class boss_kiggler_the_crazed : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI(creature); } @@ -404,7 +404,7 @@ class boss_blindeye_the_seer : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { GreaterPowerWordShield_Timer = 5000; Heal_Timer = urand(25000, 40000); @@ -413,13 +413,13 @@ class boss_blindeye_the_seer : public CreatureScript instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -427,7 +427,7 @@ class boss_blindeye_the_seer : public CreatureScript instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -457,7 +457,7 @@ class boss_blindeye_the_seer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI(creature); } @@ -481,7 +481,7 @@ class boss_krosh_firehand : public CreatureScript InstanceScript* instance; - void Reset() OVERRIDE + void Reset() override { GreaterFireball_Timer = 1000; SpellShield_Timer = 5000; @@ -490,13 +490,13 @@ class boss_krosh_firehand : public CreatureScript instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Creature* maulgar = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MAULGAR))) maulgar->AI()->DoAction(ACTION_ADD_DEATH); @@ -504,7 +504,7 @@ class boss_krosh_firehand : public CreatureScript instance->SetBossState(DATA_MAULGAR, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -548,7 +548,7 @@ class boss_krosh_firehand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetGruulsLairAI(creature); } diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 23f3efee6c1..f8ed47133b4 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -54,7 +54,7 @@ class instance_gruuls_lair : public InstanceMapScript MaulgarGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -72,7 +72,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) OVERRIDE + void OnCreatureRemove(Creature* creature) override { switch (creature->GetEntry()) { @@ -88,7 +88,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -101,7 +101,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) OVERRIDE + void OnGameObjectRemove(GameObject* go) override { switch (go->GetEntry()) { @@ -114,7 +114,7 @@ class instance_gruuls_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -126,7 +126,7 @@ class instance_gruuls_lair : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -137,7 +137,7 @@ class instance_gruuls_lair : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -173,7 +173,7 @@ class instance_gruuls_lair : public InstanceMapScript uint64 MaulgarGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_gruuls_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 8efe73f356e..6cede8bacb4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -62,7 +62,7 @@ class boss_broggok : public CreatureScript uint32 PoisonBolt_Timer; bool canAttack; - void Reset() OVERRIDE + void Reset() override { _Reset(); AcidSpray_Timer = 10000; @@ -72,12 +72,12 @@ class boss_broggok : public CreatureScript instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -85,7 +85,7 @@ class boss_broggok : public CreatureScript summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID()); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -118,7 +118,7 @@ class boss_broggok : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -128,7 +128,7 @@ class boss_broggok : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -149,7 +149,7 @@ class boss_broggok : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_broggokAI(creature); } @@ -160,7 +160,7 @@ class go_broggok_lever : public GameObjectScript public: go_broggok_lever() : GameObjectScript("go_broggok_lever") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetData(TYPE_BROGGOK_EVENT) != DONE && instance->GetData(TYPE_BROGGOK_EVENT) != IN_PROGRESS) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index bec96ac091d..d74ed13427b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -95,7 +95,7 @@ class boss_kelidan_the_breaker : public CreatureScript bool addYell; uint64 Channelers[5]; - void Reset() OVERRIDE + void Reset() override { ShadowVolley_Timer = 1000; BurningNova_Timer = 15000; @@ -110,7 +110,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { Talk(SAY_WAKE); if (me->IsNonMeleeSpellCasted(false)) @@ -120,7 +120,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%2) return; @@ -187,7 +187,7 @@ class boss_kelidan_the_breaker : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); @@ -199,7 +199,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR6), true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -271,7 +271,7 @@ class boss_kelidan_the_breaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kelidan_the_breakerAI(creature); } @@ -303,7 +303,7 @@ class npc_shadowmoon_channeler : public CreatureScript uint32 MarkOfShadow_Timer; uint32 check_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowBolt_Timer = 1000+rand()%1000; MarkOfShadow_Timer = 5000+rand()%2000; @@ -312,7 +312,7 @@ class npc_shadowmoon_channeler : public CreatureScript me->InterruptNonMeleeSpells(true); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); @@ -321,13 +321,13 @@ class npc_shadowmoon_channeler : public CreatureScript DoStartMovement(who); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -368,7 +368,7 @@ class npc_shadowmoon_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadowmoon_channelerAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 83ba44cd9b3..0dfeec85b65 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -63,7 +63,7 @@ class boss_the_maker : public CreatureScript uint32 Domination_Timer; uint32 Knockdown_Timer; - void Reset() OVERRIDE + void Reset() override { AcidSpray_Timer = 15000; ExplodingBreaker_Timer = 6000; @@ -77,7 +77,7 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -88,12 +88,12 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR2), false); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); @@ -105,7 +105,7 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR3), true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -151,7 +151,7 @@ class boss_the_maker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_the_makerAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index ad615981f2e..43ee94b54d5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -79,7 +79,7 @@ class instance_blood_furnace : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -116,7 +116,7 @@ class instance_blood_furnace : public InstanceMapScript BroggokLeverGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -135,13 +135,13 @@ class instance_blood_furnace : public InstanceMapScript } } - void OnUnitDeath(Unit* unit) OVERRIDE + void OnUnitDeath(Unit* unit) override { if (unit && unit->GetTypeId() == TypeID::TYPEID_UNIT && unit->GetEntry() == 17398) PrisonerDied(unit->GetGUID()); } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { if (go->GetEntry() == 181766) //Final exit door Door1GUID = go->GetGUID(); @@ -177,7 +177,7 @@ class instance_blood_furnace : public InstanceMapScript BroggokLeverGUID = go->GetGUID(); //Broggok lever } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -203,7 +203,7 @@ class instance_blood_furnace : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -233,7 +233,7 @@ class instance_blood_furnace : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -249,7 +249,7 @@ class instance_blood_furnace : public InstanceMapScript return str_data.c_str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -411,7 +411,7 @@ class instance_blood_furnace : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_blood_furnace_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 8c716542563..f1e542fdf39 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -64,7 +64,7 @@ class boss_omor_the_unscarred : public CreatureScript SetCombatMovement(false); } - void Reset() OVERRIDE + void Reset() override { Talk(SAY_WIPE); @@ -81,13 +81,13 @@ class boss_omor_the_unscarred : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (rand()%2) return; @@ -95,7 +95,7 @@ class boss_omor_the_unscarred : public CreatureScript Talk(SAY_KILL_1); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { Talk(SAY_SUMMON); @@ -105,13 +105,13 @@ class boss_omor_the_unscarred : public CreatureScript ++SummonedCount; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -223,7 +223,7 @@ class boss_omor_the_unscarred : public CreatureScript bool CanPullBack; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_omor_the_unscarredAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 43b32c82989..b4d08985102 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -78,22 +78,22 @@ class boss_nazan : public CreatureScript flight = true; } - void Reset() OVERRIDE + void Reset() override { Fireball_Timer = 4000; Fly_Timer = 45000; Turn_Timer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void IsSummonedBy(Unit* summoner) OVERRIDE + void IsSummonedBy(Unit* summoner) override { if (summoner->GetEntry() == NPC_VAZRUDEN_HERALD) VazrudenGUID = summoner->GetGUID(); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned && summoned->GetEntry() == NPC_LIQUID_FIRE) { @@ -104,13 +104,13 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* entry) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* entry) override { if (target && entry->Id == uint32(SPELL_FIREBALL)) me->SummonCreature(NPC_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -190,7 +190,7 @@ class boss_nazan : public CreatureScript uint64 VazrudenGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nazanAI(creature); } @@ -205,7 +205,7 @@ class boss_vazruden : public CreatureScript { boss_vazrudenAI(Creature* creature) : BossAI(creature, DATA_VAZRUDEN) { } - void Reset() OVERRIDE + void Reset() override { Revenge_Timer = 4000; UnsummonCheck = 2000; @@ -213,26 +213,26 @@ class boss_vazruden : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); _EnterCombat(); } - void KilledUnit(Unit* who) OVERRIDE + void KilledUnit(Unit* who) override { if (who && who->GetEntry() != NPC_VAZRUDEN) Talk(SAY_KILL); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (killer && killer != me) Talk(SAY_DIE); _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -268,7 +268,7 @@ class boss_vazruden : public CreatureScript uint32 UnsummonCheck; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vazrudenAI(creature); } @@ -290,7 +290,7 @@ class boss_vazruden_the_herald : public CreatureScript VazrudenGUID = 0; } - void Reset() OVERRIDE + void Reset() override { phase = 0; waypoint = 0; @@ -339,7 +339,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (phase == 0) { @@ -349,7 +349,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (!summoned) return; @@ -377,7 +377,7 @@ class boss_vazruden_the_herald : public CreatureScript sentryDown = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { switch (phase) { @@ -445,7 +445,7 @@ class boss_vazruden_the_herald : public CreatureScript bool lootSpawned; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_vazruden_the_heraldAI(creature); } @@ -460,20 +460,20 @@ class npc_hellfire_sentry : public CreatureScript { npc_hellfire_sentryAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { KidneyShot_Timer = urand(3000, 7000); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (Creature* herald = me->FindNearestCreature(NPC_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -494,7 +494,7 @@ class npc_hellfire_sentry : public CreatureScript uint32 KidneyShot_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hellfire_sentryAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 19f5badfaca..ff6d8cf1cf5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -63,7 +63,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript { boss_watchkeeper_gargolmarAI(Creature* creature) : BossAI(creature, DATA_WATCHKEEPER_GARGOLMAR) { } - void Reset() OVERRIDE + void Reset() override { hasTaunted = false; yelledForHeal = false; @@ -71,7 +71,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript _Reset(); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000); @@ -79,7 +79,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript _EnterCombat(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->GetVictim() && me->CanCreatureAttack(who)) @@ -101,18 +101,18 @@ class boss_watchkeeper_gargolmar : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); _JustDied(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -169,7 +169,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript bool retaliation; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_watchkeeper_gargolmarAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index abfcf9118e1..ae6308bf8e6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -38,13 +38,13 @@ class instance_ramparts : public InstanceMapScript { instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); felIronChestGUID = 0; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -55,7 +55,7 @@ class instance_ramparts : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -74,7 +74,7 @@ class instance_ramparts : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -85,7 +85,7 @@ class instance_ramparts : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { @@ -123,7 +123,7 @@ class instance_ramparts : public InstanceMapScript bool spawned; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_ramparts_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index d3f44f0c9e1..d504f81b3f5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -106,12 +106,12 @@ class npc_abyssal : public CreatureScript uint32 Despawn_Timer; uint32 trigger; - void Reset() OVERRIDE + void Reset() override { FireBlast_Timer = 6000; } - void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit*, const SpellInfo* spell) override { if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) { @@ -134,23 +134,23 @@ class npc_abyssal : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!trigger) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!trigger) ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (trigger) { @@ -186,7 +186,7 @@ class npc_abyssal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_abyssalAI(creature); } @@ -221,7 +221,7 @@ class boss_magtheridon : public CreatureScript bool Phase3; bool NeedCheckCube; - void Reset() OVERRIDE + void Reset() override { Berserk_Timer = 1320000; Quake_Timer = 40000; @@ -241,7 +241,7 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_SHADOW_CAGE_C, true); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) { @@ -301,12 +301,12 @@ class boss_magtheridon : public CreatureScript NeedCheckCube = false; } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_PLAYER_KILLED); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, DONE); @@ -314,16 +314,16 @@ class boss_magtheridon : public CreatureScript Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!me->HasUnitState(UNIT_STATE_STUNNED)) ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); @@ -335,7 +335,7 @@ class boss_magtheridon : public CreatureScript Talk(SAY_FREED); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) { @@ -449,7 +449,7 @@ class boss_magtheridon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_magtheridonAI(creature); } @@ -476,7 +476,7 @@ class npc_hellfire_channeler : public CreatureScript uint32 Check_Timer; - void Reset() OVERRIDE + void Reset() override { ShadowBoltVolley_Timer = urand(8000, 10000); DarkMending_Timer = 10000; @@ -486,7 +486,7 @@ class npc_hellfire_channeler : public CreatureScript Check_Timer = 5000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); @@ -495,7 +495,7 @@ class npc_hellfire_channeler : public CreatureScript DoZoneInCombat(); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { if (instance) instance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); @@ -503,24 +503,24 @@ class npc_hellfire_channeler : public CreatureScript DoCast(me, SPELL_SHADOW_GRASP_C, false); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->AI()->AttackStart(me->GetVictim()); } - void DamageTaken(Unit*, uint32 &damage) OVERRIDE + void DamageTaken(Unit*, uint32 &damage) override { if (damage >= me->GetHealth()) DoCast(me, SPELL_SOUL_TRANSFER, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_CHANNELER_EVENT, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -564,7 +564,7 @@ class npc_hellfire_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_hellfire_channelerAI(creature); } @@ -578,7 +578,7 @@ class go_manticron_cube : public GameObjectScript { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { InstanceScript* instance = go->GetInstanceScript(); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index d50e51963b4..b1cc45823e1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -68,7 +68,7 @@ class instance_magtheridons_lair : public InstanceMapScript uint32 CageTimer; uint32 RespawnTimer; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -81,7 +81,7 @@ class instance_magtheridons_lair : public InstanceMapScript RespawnTimer = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -90,7 +90,7 @@ class instance_magtheridons_lair : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -103,7 +103,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -125,7 +125,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -135,7 +135,7 @@ class instance_magtheridons_lair : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -213,14 +213,14 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { if (type == DATA_MAGTHERIDON_EVENT) return m_auiEncounter[0]; return 0; } - void Update(uint32 diff) OVERRIDE + void Update(uint32 diff) override { if (CageTimer) { @@ -256,7 +256,7 @@ class instance_magtheridons_lair : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_magtheridons_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 4df283a20a8..664ad49f9af 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -87,7 +87,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript { boss_grand_warlock_nethekurseAI(Creature* creature) : BossAI(creature, DATA_NETHEKURSE) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -107,7 +107,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript Cleave_Timer = 5000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DIE); @@ -115,7 +115,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript instance->SetBossState(DATA_NETHEKURSE, DONE); } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data != SETDATA_DATA) return; @@ -160,7 +160,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (IsIntroEvent || !IsMainEvent) return; @@ -174,7 +174,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!IntroOnce && me->IsWithinDistInMap(who, 30.0f)) { @@ -195,12 +195,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -211,12 +211,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID()); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsIntroEvent) { @@ -296,7 +296,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript bool Phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_grand_warlock_nethekurseAI(creature); } @@ -318,14 +318,14 @@ class npc_fel_orc_convert : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE + void Reset() override { me->SetNoCallAssistance(true); //we don't want any assistance (WE R HEROZ!) } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HEMORRHAGE, 3000); @@ -335,7 +335,7 @@ class npc_fel_orc_convert : public CreatureScript Kurse->AI()->SetData(SETDATA_DATA, SETDATA_PEON_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -347,7 +347,7 @@ class npc_fel_orc_convert : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -368,7 +368,7 @@ class npc_fel_orc_convert : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fel_orc_convertAI(creature); } @@ -387,13 +387,13 @@ class npc_lesser_shadow_fissure : public CreatureScript { npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void MoveInLineOfSight(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void EnterCombat(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_lesser_shadow_fissureAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index d1c4f26c03e..7456dd9f535 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -142,7 +142,7 @@ class boss_warbringer_omrogg : public CreatureScript RightHeadGUID = 0; } - void Reset() OVERRIDE + void Reset() override { if (Unit* LeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { @@ -191,7 +191,7 @@ class boss_warbringer_omrogg : public CreatureScript ThreatYell = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TempSummonType::TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TempSummonType::TEMPSUMMON_DEAD_DESPAWN, 0); @@ -210,7 +210,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetBossState(DATA_OMROGG, IN_PROGRESS); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_LEFT_HEAD) LeftHeadGUID = summoned->GetGUID(); @@ -223,7 +223,7 @@ class boss_warbringer_omrogg : public CreatureScript summoned->SetVisible(false); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Creature* LeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* RightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -249,7 +249,7 @@ class boss_warbringer_omrogg : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Creature* LeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* RightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -265,7 +265,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetBossState(DATA_OMROGG, DONE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Delay_Timer <= diff) { @@ -388,7 +388,7 @@ class boss_warbringer_omrogg : public CreatureScript uint32 ResetThreat_Timer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warbringer_omroggAI(creature); } @@ -410,11 +410,11 @@ class npc_omrogg_heads : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SetData(uint32 data, uint32 value) OVERRIDE + void SetData(uint32 data, uint32 value) override { if (data == SETDATA_DATA && value == SETDATA_YELL) { @@ -422,7 +422,7 @@ class npc_omrogg_heads : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { events.Update(diff); @@ -438,7 +438,7 @@ class npc_omrogg_heads : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_omrogg_headsAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 4dff4c7a6e9..dabf46794f0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -69,7 +69,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { boss_warchief_kargath_bladefistAI(Creature* creature) : BossAI(creature, DATA_KARGATH) { } - void Reset() OVERRIDE + void Reset() override { removeAdds(); @@ -87,7 +87,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript resetcheck_timer = 5000; } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); removeAdds(); @@ -96,12 +96,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript instance->SetBossState(DATA_KARGATH, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { switch (summoned->GetEntry()) { @@ -117,7 +117,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { if (victim->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -125,7 +125,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (InBlade) { @@ -178,7 +178,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Return since we have no target if (!UpdateVictim()) @@ -311,7 +311,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript bool InBlade; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warchief_kargath_bladefistAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 5dba2e59d0b..4f6b2a913b0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -34,7 +34,7 @@ class instance_shattered_halls : public InstanceMapScript public: instance_shattered_halls() : InstanceMapScript("instance_shattered_halls", 540) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_shattered_halls_InstanceMapScript(map); } @@ -43,7 +43,7 @@ class instance_shattered_halls : public InstanceMapScript { instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { } - void Initialize() OVERRIDE + void Initialize() override { SetBossNumber(EncounterCount); nethekurseGUID = 0; @@ -51,7 +51,7 @@ class instance_shattered_halls : public InstanceMapScript nethekurseDoor2GUID = 0; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -64,7 +64,7 @@ class instance_shattered_halls : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -74,7 +74,7 @@ class instance_shattered_halls : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -99,7 +99,7 @@ class instance_shattered_halls : public InstanceMapScript return true; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -116,7 +116,7 @@ class instance_shattered_halls : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -127,7 +127,7 @@ class instance_shattered_halls : public InstanceMapScript return saveStream.str(); } - void Load(const char* strIn) OVERRIDE + void Load(const char* strIn) override { if (!strIn) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 10dcf7629b6..37f92be4831 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -108,7 +108,7 @@ class boss_alar : public CreatureScript int8 cur_wp; - void Reset() OVERRIDE + void Reset() override { if (instance) instance->SetData(DATA_ALAREVENT, NOT_STARTED); @@ -135,7 +135,7 @@ class boss_alar : public CreatureScript me->setActive(false); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance) instance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -145,22 +145,22 @@ class boss_alar : public CreatureScript me->setActive(true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance) instance->SetData(DATA_ALAREVENT, DONE); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(target); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (Phase1) AttackStartNoMove(who); @@ -168,7 +168,7 @@ class boss_alar : public CreatureScript ScriptedAI::AttackStart(who); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (damage >= me->GetHealth() && Phase1) { @@ -190,7 +190,7 @@ class boss_alar : public CreatureScript } } - void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit*, const SpellInfo* spell) override { if (spell->Id == SPELL_DIVE_BOMB_VISUAL) { @@ -200,7 +200,7 @@ class boss_alar : public CreatureScript } } - void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE + void MovementInform(uint32 type, uint32 /*id*/) override { if (type == POINT_MOTION_TYPE) { @@ -210,7 +210,7 @@ class boss_alar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!me->IsInCombat()) // sometimes IsInCombat but !incombat, faction bug? return; @@ -449,7 +449,7 @@ class boss_alar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_alarAI(creature); } @@ -472,22 +472,22 @@ class npc_ember_of_alar : public CreatureScript InstanceScript* instance; bool toDie; - void Reset() OVERRIDE + void Reset() override { toDie = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { me->setDeathState(DeathState::JUST_DIED); } - void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE + void DamageTaken(Unit* killer, uint32 &damage) override { if (damage >= me->GetHealth() && killer != me && !toDie) { @@ -510,7 +510,7 @@ class npc_ember_of_alar : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -525,7 +525,7 @@ class npc_ember_of_alar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ember_of_alarAI(creature); } @@ -539,15 +539,15 @@ class npc_flame_patch_alar : public CreatureScript struct npc_flame_patch_alarAI : public ScriptedAI { npc_flame_patch_alarAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void UpdateAI(uint32 /*diff*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_flame_patch_alarAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 271f2926a2f..a0015d5a927 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -128,7 +128,7 @@ class boss_high_astromancer_solarian : public CreatureScript bool AppearDelay; bool BlindingLight; - void Reset() OVERRIDE + void Reset() override { ArcaneMissiles_Timer = 2000; m_uiWrathOfTheAstromancer_Timer = 15000; @@ -156,12 +156,12 @@ class boss_high_astromancer_solarian : public CreatureScript Summons.DespawnAll(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->SetObjectScale(defaultsize); me->SetDisplayId(MODEL_HUMAN); @@ -170,7 +170,7 @@ class boss_high_astromancer_solarian : public CreatureScript instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -206,7 +206,7 @@ class boss_high_astromancer_solarian : public CreatureScript return (z*sqrt(radius*radius - (x - CENTER_X)*(x - CENTER_X)) + CENTER_Y); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -415,7 +415,7 @@ class boss_high_astromancer_solarian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_high_astromancer_solarianAI(creature); } @@ -439,18 +439,18 @@ class npc_solarium_priest : public CreatureScript uint32 holysmiteTimer; uint32 aoesilenceTimer; - void Reset() OVERRIDE + void Reset() override { healTimer = 9000; holysmiteTimer = 1; aoesilenceTimer = 15000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -498,7 +498,7 @@ class npc_solarium_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_solarium_priestAI(creature); } @@ -513,7 +513,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader { PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WRATH_OF_THE_ASTROMANCER_DOT)) return false; @@ -530,13 +530,13 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader target->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), false); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_astromancer_wrath_of_the_astromancer_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_astromancer_wrath_of_the_astromancer_AuraScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index cda2934e2cf..8126ddc731a 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -167,7 +167,7 @@ struct advisorbase_ai : public ScriptedAI uint32 DelayRes_Timer; uint64 DelayRes_Target; - void Reset() OVERRIDE + void Reset() override { if (m_bDoubled_Health) { @@ -189,7 +189,7 @@ struct advisorbase_ai : public ScriptedAI Kaelthas->AI()->EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -198,7 +198,7 @@ struct advisorbase_ai : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -219,7 +219,7 @@ struct advisorbase_ai : public ScriptedAI DelayRes_Timer = 2000; } - void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE + void DamageTaken(Unit* killer, uint32 &damage) override { if (damage < me->GetHealth()) return; @@ -255,7 +255,7 @@ struct advisorbase_ai : public ScriptedAI } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (DelayRes_Timer) { @@ -319,7 +319,7 @@ class boss_kaelthas : public CreatureScript uint64 m_auiAdvisorGuid[MAX_ADVISORS]; - void Reset() OVERRIDE + void Reset() override { Fireball_Timer = 5000+rand()%10000; ArcaneDisruption_Timer = 45000; @@ -404,7 +404,7 @@ class boss_kaelthas : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->CanCreatureAttack(who)) @@ -432,18 +432,18 @@ class boss_kaelthas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (instance && !instance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { // if not phoenix, then it's one of the 7 weapons if (summoned->GetEntry() != NPC_PHOENIX) @@ -455,12 +455,12 @@ class boss_kaelthas : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) OVERRIDE + void SummonedCreatureDespawn(Creature* summon) override { summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -479,7 +479,7 @@ class boss_kaelthas : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Phase 1 switch (Phase) @@ -1010,7 +1010,7 @@ class boss_kaelthas : public CreatureScript } } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_kaelthasAI(creature); } @@ -1032,7 +1032,7 @@ class boss_thaladred_the_darkener : public CreatureScript uint32 Silence_Timer; uint32 PsychicBlow_Timer; - void Reset() OVERRIDE + void Reset() override { Gaze_Timer = 100; Silence_Timer = 20000; @@ -1041,7 +1041,7 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1053,13 +1053,13 @@ class boss_thaladred_the_darkener : public CreatureScript me->AddThreat(who, 5000000.0f); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_THALADRED_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1107,7 +1107,7 @@ class boss_thaladred_the_darkener : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_thaladred_the_darkenerAI(creature); } @@ -1127,13 +1127,13 @@ class boss_lord_sanguinar : public CreatureScript uint32 Fear_Timer; - void Reset() OVERRIDE + void Reset() override { Fear_Timer = 20000; advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1144,13 +1144,13 @@ class boss_lord_sanguinar : public CreatureScript Talk(SAY_SANGUINAR_AGGRO); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_SANGUINAR_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1174,7 +1174,7 @@ class boss_lord_sanguinar : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lord_sanguinarAI(creature); } @@ -1197,7 +1197,7 @@ class boss_grand_astromancer_capernian : public CreatureScript uint32 Yell_Timer; bool Yell; - void Reset() OVERRIDE + void Reset() override { Fireball_Timer = 2000; Conflagration_Timer = 20000; @@ -1208,13 +1208,13 @@ class boss_grand_astromancer_capernian : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_CAPERNIAN_DEATH); } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1229,7 +1229,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1238,7 +1238,7 @@ class boss_grand_astromancer_capernian : public CreatureScript return; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1317,7 +1317,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_grand_astromancer_capernianAI(creature); } @@ -1338,7 +1338,7 @@ class boss_master_engineer_telonicus : public CreatureScript uint32 Bomb_Timer; uint32 RemoteToy_Timer; - void Reset() OVERRIDE + void Reset() override { Bomb_Timer = 10000; RemoteToy_Timer = 5000; @@ -1346,13 +1346,13 @@ class boss_master_engineer_telonicus : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_TELONICUS_DEATH); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1363,7 +1363,7 @@ class boss_master_engineer_telonicus : public CreatureScript Talk(SAY_TELONICUS_AGGRO); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { advisorbase_ai::UpdateAI(diff); @@ -1399,7 +1399,7 @@ class boss_master_engineer_telonicus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_master_engineer_telonicusAI(creature); } @@ -1424,7 +1424,7 @@ class npc_kael_flamestrike : public CreatureScript bool Casting; bool KillSelf; - void Reset() OVERRIDE + void Reset() override { Timer = 5000; Casting = false; @@ -1434,12 +1434,12 @@ class npc_kael_flamestrike : public CreatureScript me->setFaction(14); } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Casting) { @@ -1466,7 +1466,7 @@ class npc_kael_flamestrike : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kael_flamestrikeAI(creature); } @@ -1486,20 +1486,20 @@ class npc_phoenix_tk : public CreatureScript uint32 Cycle_Timer; - void Reset() OVERRIDE + void Reset() override { Cycle_Timer = 2000; DoCast(me, SPELL_BURN, true); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TempSummonType::TEMPSUMMON_TIMED_DESPAWN, 16000); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1519,7 +1519,7 @@ class npc_phoenix_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phoenix_tkAI(creature); } @@ -1539,16 +1539,16 @@ class npc_phoenix_egg_tk : public CreatureScript uint32 Rebirth_Timer; - void Reset() OVERRIDE + void Reset() override { Rebirth_Timer = 15000; } //ignore any - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->Attack(who, false)) { @@ -1559,13 +1559,13 @@ class npc_phoenix_egg_tk : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AddThreat(me->GetVictim(), 0.0f); summoned->CastSpell(summoned, SPELL_REBIRTH, false); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Rebirth_Timer) return; @@ -1580,7 +1580,7 @@ class npc_phoenix_egg_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phoenix_egg_tkAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 70f68ada766..4cc941d1836 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -66,7 +66,7 @@ class boss_void_reaver : public CreatureScript bool Enraged; - void Reset() OVERRIDE + void Reset() override { Pounding_Timer = 15000; ArcaneOrb_Timer = 3000; @@ -79,12 +79,12 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); DoZoneInCombat(); @@ -93,7 +93,7 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -101,7 +101,7 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -168,7 +168,7 @@ class boss_void_reaver : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_void_reaverAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index d6dee822042..61628eb24d4 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -62,7 +62,7 @@ class instance_the_eye : public InstanceMapScript uint32 m_auiEncounter[MAX_ENCOUNTER]; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -78,7 +78,7 @@ class instance_the_eye : public InstanceMapScript AlarEventPhase = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -87,7 +87,7 @@ class instance_the_eye : public InstanceMapScript return false; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -115,7 +115,7 @@ class instance_the_eye : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const OVERRIDE + uint64 GetData64(uint32 identifier) const override { switch (identifier) { @@ -130,7 +130,7 @@ class instance_the_eye : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -153,7 +153,7 @@ class instance_the_eye : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -165,7 +165,7 @@ class instance_the_eye : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -176,7 +176,7 @@ class instance_the_eye : public InstanceMapScript return stream.str(); } - void Load(const char* in) OVERRIDE + void Load(const char* in) override { if (!in) { @@ -194,7 +194,7 @@ class instance_the_eye : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_eye_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 91e2b801bb4..fd801dbf8a6 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -54,17 +54,17 @@ class npc_crystalcore_devastator : public CreatureScript uint32 Knockaway_Timer; uint32 Countercharge_Timer; - void Reset() OVERRIDE + void Reset() override { Countercharge_Timer = 9000; Knockaway_Timer = 25000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -102,7 +102,7 @@ class npc_crystalcore_devastator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_crystalcore_devastatorAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index bb8a460bbbe..3e599882f1b 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -62,13 +62,13 @@ class boss_gatewatcher_gyrokill : public CreatureScript { boss_gatewatcher_gyrokillAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_GYROKILL) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000); @@ -77,12 +77,12 @@ class boss_gatewatcher_gyrokill : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -118,7 +118,7 @@ class boss_gatewatcher_gyrokill : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gatewatcher_gyrokillAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 15b54cd50f1..03c4974c1f4 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -64,7 +64,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript { boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 55000); @@ -73,19 +73,19 @@ class boss_gatewatcher_iron_hand : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { if (roll_chance_i(50)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -124,7 +124,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_gatewatcher_iron_handAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index a3de31b705b..733359f6bf9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -78,7 +78,7 @@ class boss_mechano_lord_capacitus : public CreatureScript { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(YELL_AGGRO); @@ -91,18 +91,18 @@ class boss_mechano_lord_capacitus : public CreatureScript events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15 * IN_MILLISECONDS); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(YELL_KILL); } - void JustDied(Unit* /*victim*/) OVERRIDE + void JustDied(Unit* /*victim*/) override { _JustDied(); Talk(YELL_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -152,7 +152,7 @@ class boss_mechano_lord_capacitus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_mechano_lord_capacitusAI(creature); } @@ -167,7 +167,7 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE)) return false; @@ -213,14 +213,14 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader SetHitDamage(0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_capacitus_polarity_charge_SpellScript(); } @@ -235,7 +235,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_POLARITY) || !sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_POLARITY)) return false; @@ -250,13 +250,13 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, NULL, NULL, caster->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_capacitus_polarity_shift_SpellScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index f6b8f528087..173cc2bb6b0 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -70,7 +70,7 @@ class boss_nethermancer_sepethrea : public CreatureScript { boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { _EnterCombat(); events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000)); @@ -83,18 +83,18 @@ class boss_nethermancer_sepethrea : public CreatureScript Talk(SAY_SUMMON); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -139,7 +139,7 @@ class boss_nethermancer_sepethrea : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_nethermancer_sepethreaAI(creature); } @@ -165,7 +165,7 @@ class npc_ragin_flames : public CreatureScript bool onlyonce; - void Reset() OVERRIDE + void Reset() override { inferno_Timer = 10000; flame_timer = 500; @@ -176,11 +176,11 @@ class npc_ragin_flames : public CreatureScript me->SetSpeed(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Check_Timer if (Check_Timer <= diff) @@ -224,7 +224,7 @@ class npc_ragin_flames : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ragin_flamesAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 9c325392c83..7c1845b2a50 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -77,7 +77,7 @@ class boss_pathaleon_the_calculator : public CreatureScript { boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); events.ScheduleEvent(EVENT_SUMMON, 30000); @@ -88,18 +88,18 @@ class boss_pathaleon_the_calculator : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (me->HealthBelowPctDamaged(20, damage) && !me->HasAura(SPELL_FRENZY)) { @@ -108,7 +108,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -160,7 +160,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_pathaleon_the_calculatorAI(creature); } @@ -180,7 +180,7 @@ class npc_nether_wraith : public CreatureScript uint32 Die_Timer; bool Detonation; - void Reset() OVERRIDE + void Reset() override { ArcaneMissiles_Timer = urand(1000, 4000); Detonation_Timer = 20000; @@ -188,9 +188,9 @@ class npc_nether_wraith : public CreatureScript Detonation = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -231,7 +231,7 @@ class npc_nether_wraith : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nether_wraithAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index c1fe65b5aa9..7275a34596e 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -44,7 +44,7 @@ class instance_mechanar : public InstanceMapScript } - void OnGameObjectCreate(GameObject* gameObject) OVERRIDE + void OnGameObjectCreate(GameObject* gameObject) override { switch (gameObject->GetEntry()) { @@ -58,7 +58,7 @@ class instance_mechanar : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* gameObject) OVERRIDE + void OnGameObjectRemove(GameObject* gameObject) override { switch (gameObject->GetEntry()) { @@ -72,7 +72,7 @@ class instance_mechanar : public InstanceMapScript } } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -92,7 +92,7 @@ class instance_mechanar : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -103,7 +103,7 @@ class instance_mechanar : public InstanceMapScript return saveStream.str(); } - void Load(const char* str) OVERRIDE + void Load(const char* str) override { if (!str) { @@ -136,7 +136,7 @@ class instance_mechanar : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_mechanar_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index e338fb05288..8398a47c55c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -90,7 +90,7 @@ class npc_millhouse_manastorm : public CreatureScript uint32 Pyroblast_Timer; uint32 Fireball_Timer; - void Reset() OVERRIDE + void Reset() override { EventProgress_Timer = 2000; LowHp = false; @@ -110,7 +110,7 @@ class npc_millhouse_manastorm : public CreatureScript } } - void AttackStart(Unit* who) OVERRIDE + void AttackStart(Unit* who) override { if (me->Attack(who, true)) { @@ -121,14 +121,14 @@ class npc_millhouse_manastorm : public CreatureScript } } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); @@ -137,7 +137,7 @@ class npc_millhouse_manastorm : public CreatureScript ->FailQuest();*/ } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Init) { @@ -220,7 +220,7 @@ class npc_millhouse_manastorm : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_millhouse_manastormAI(creature); } @@ -289,7 +289,7 @@ class npc_warden_mellichar : public CreatureScript uint32 EventProgress_Timer; uint32 Phase; - void Reset() OVERRIDE + void Reset() override { IsRunning = false; CanSpawn = false; @@ -304,9 +304,9 @@ class npc_warden_mellichar : public CreatureScript instance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (IsRunning) @@ -325,7 +325,7 @@ class npc_warden_mellichar : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(YELL_INTRO1); DoCast(me, SPELL_BUBBLE_VISUAL); @@ -395,7 +395,7 @@ class npc_warden_mellichar : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!IsRunning) return; @@ -511,7 +511,7 @@ class npc_warden_mellichar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_warden_mellicharAI(creature); } @@ -535,7 +535,7 @@ class npc_zerekethvoidzone : public CreatureScript { npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetUInt32Value(UNIT_FIELD_NPC_FLAGS, 0); me->setFaction(16); @@ -544,10 +544,10 @@ class npc_zerekethvoidzone : public CreatureScript DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_zerekethvoidzoneAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 49883bcb8d2..5f8c834e30a 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -86,7 +86,7 @@ class boss_harbinger_skyriss : public CreatureScript uint32 Domination_Timer; uint32 ManaBurn_Timer; - void Reset() OVERRIDE + void Reset() override { if (!Intro) me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -102,7 +102,7 @@ class boss_harbinger_skyriss : public CreatureScript ManaBurn_Timer = 25000; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!Intro) @@ -111,16 +111,16 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_HARBINGERSKYRISS, DONE); } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (!summon) return; @@ -133,7 +133,7 @@ class boss_harbinger_skyriss : public CreatureScript summon->AI()->AttackStart(target); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { //won't yell killing pet/other unit if (victim->GetEntry() == 21436) @@ -155,7 +155,7 @@ class boss_harbinger_skyriss : public CreatureScript DoCast(me, SPELL_33_ILLUSION); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Intro) { @@ -272,7 +272,7 @@ class boss_harbinger_skyriss : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_harbinger_skyrissAI(creature); } @@ -287,12 +287,12 @@ class boss_harbinger_skyriss_illusion : public CreatureScript { boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_harbinger_skyriss_illusionAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 07acb2e1e81..8d8b1f5fd6b 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -77,7 +77,7 @@ class instance_arcatraz : public InstanceMapScript uint64 GoSphereGUID; uint64 MellicharGUID; - void Initialize() OVERRIDE + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -93,7 +93,7 @@ class instance_arcatraz : public InstanceMapScript MellicharGUID = 0; } - bool IsEncounterInProgress() const OVERRIDE + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) @@ -102,7 +102,7 @@ class instance_arcatraz : public InstanceMapScript return false; } - void OnGameObjectCreate(GameObject* go) OVERRIDE + void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry()) { @@ -144,13 +144,13 @@ class instance_arcatraz : public InstanceMapScript } } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { if (creature->GetEntry() == MELLICHAR) MellicharGUID = creature->GetGUID(); } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -232,7 +232,7 @@ class instance_arcatraz : public InstanceMapScript } } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { switch (type) { @@ -246,7 +246,7 @@ class instance_arcatraz : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const OVERRIDE + uint64 GetData64(uint32 data) const override { switch (data) { @@ -257,7 +257,7 @@ class instance_arcatraz : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_arcatraz_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 720ba7d2968..ce63c1dd602 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -56,13 +56,13 @@ class boss_commander_sarannis : public CreatureScript { boss_commander_sarannisAI(Creature* creature) : BossAI(creature, DATA_COMMANDER_SARANNIS) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -70,18 +70,18 @@ class boss_commander_sarannis : public CreatureScript events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 15200); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32 &damage) override { if (me->HealthBelowPctDamaged(50, damage) && _phase) { @@ -92,12 +92,12 @@ class boss_commander_sarannis : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { BossAI::JustSummoned(summon); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -133,7 +133,7 @@ class boss_commander_sarannis : public CreatureScript bool _phase; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_commander_sarannisAI(creature); } @@ -171,13 +171,13 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader GetCaster()->SummonCreature(NPC_SUMMONED_BLOODWARDER_RESERVIST, PosSummonReinforcements[3], TempSummonType::TEMPSUMMON_CORPSE_DESPAWN); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_commander_sarannis_summon_reinforcements_SpellScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index b7416ed98c3..f002d5ab24d 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -72,7 +72,7 @@ class boss_high_botanist_freywinn : public CreatureScript uint32 DeadAddsCount; bool MoveFree; - void Reset() OVERRIDE + void Reset() override { Adds_List.clear(); @@ -83,12 +83,12 @@ class boss_high_botanist_freywinn : public CreatureScript MoveFree = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_FRAYER) Adds_List.push_back(summoned->GetGUID()); @@ -105,17 +105,17 @@ class boss_high_botanist_freywinn : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -198,7 +198,7 @@ class boss_high_botanist_freywinn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_high_botanist_freywinnAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 5274c5da18b..a8a05749853 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -68,7 +68,7 @@ class boss_laj : public CreatureScript uint32 Transform_Timer; uint32 Allergic_Timer; - void Reset() OVERRIDE + void Reset() override { me->SetDisplayId(MODEL_DEFAULT); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); @@ -155,17 +155,17 @@ class boss_laj : public CreatureScript CanSummon = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { if (summon && me->GetVictim()) summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ class boss_laj : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_lajAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index c40875b79d2..9d947939e65 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -58,14 +58,14 @@ class boss_thorngrin_the_tender : public CreatureScript { boss_thorngrin_the_tenderAI(Creature* creature) : BossAI(creature, DATA_THORNGRIN_THE_TENDER) { } - void Reset() OVERRIDE + void Reset() override { _Reset(); _phase1 = true; _phase2 = true; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { _EnterCombat(); Talk(SAY_AGGRO); @@ -74,18 +74,18 @@ class boss_thorngrin_the_tender : public CreatureScript events.ScheduleEvent(EVENT_ENRAGE, 12000); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*killer*/, uint32& damage) override { if (me->HealthBelowPctDamaged(50, damage) && _phase1) { @@ -99,7 +99,7 @@ class boss_thorngrin_the_tender : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -144,7 +144,7 @@ class boss_thorngrin_the_tender : public CreatureScript bool _phase2; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_thorngrin_the_tenderAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 05b8bf6b011..844124274e6 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -79,17 +79,17 @@ class npc_warp_splinter_treant : public CreatureScript uint64 WarpGuid; uint32 check_Timer; - void Reset() OVERRIDE + void Reset() override { check_Timer = 0; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -117,7 +117,7 @@ class npc_warp_splinter_treant : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_warp_splinter_treantAI(creature); } @@ -146,7 +146,7 @@ class boss_warp_splinter : public CreatureScript float Treant_Spawn_Pos_X; float Treant_Spawn_Pos_Y; - void Reset() OVERRIDE + void Reset() override { War_Stomp_Timer = urand(25000, 40000); Summon_Treants_Timer = 45000; @@ -155,17 +155,17 @@ class boss_warp_splinter : public CreatureScript me->SetSpeed(MOVE_RUN, 0.7f, true); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) OVERRIDE + void KilledUnit(Unit* /*victim*/) override { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } @@ -186,7 +186,7 @@ class boss_warp_splinter : public CreatureScript Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -222,7 +222,7 @@ class boss_warp_splinter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_warp_splinterAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index 93075e0dc81..881d14f591a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -38,7 +38,7 @@ class instance_the_botanica : public InstanceMapScript WarpSplinterGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -62,7 +62,7 @@ class instance_the_botanica : public InstanceMapScript } } - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -83,7 +83,7 @@ class instance_the_botanica : public InstanceMapScript return 0; } - bool SetBossState(uint32 type, EncounterState state) OVERRIDE + bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) return false; @@ -103,7 +103,7 @@ class instance_the_botanica : public InstanceMapScript return true; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -114,7 +114,7 @@ class instance_the_botanica : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -155,7 +155,7 @@ class instance_the_botanica : public InstanceMapScript uint64 WarpSplinterGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_the_botanica_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index f0ea3a09b36..f70b2569834 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -71,7 +71,7 @@ class boss_doomlord_kazzak : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(6000, 10000)); @@ -84,17 +84,17 @@ class boss_doomlord_kazzak : public CreatureScript _events.ScheduleEvent(EVENT_BERSERK, 180000); } - void JustRespawned() OVERRIDE + void JustRespawned() override { Talk(SAY_INTRO); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { // When Kazzak kills a player (not pets/totems), he regens some health if (victim->GetTypeId() != TypeID::TYPEID_PLAYER) @@ -105,12 +105,12 @@ class boss_doomlord_kazzak : public CreatureScript Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Return since we have no target if (!UpdateVictim()) @@ -171,7 +171,7 @@ class boss_doomlord_kazzak : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_doomlordkazzakAI(creature); } @@ -186,7 +186,7 @@ class spell_mark_of_kazzak : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazzak_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_KAZZAK_DAMAGE)) return false; @@ -211,14 +211,14 @@ class spell_mark_of_kazzak : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mark_of_kazzak_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazzak_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mark_of_kazzak_AuraScript(); } diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 7ae17e2b03a..e06c46fb5dc 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -61,7 +61,7 @@ class boss_doomwalker : public CreatureScript { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_ENRAGE, 0); @@ -72,7 +72,7 @@ class boss_doomwalker : public CreatureScript _inEnrage = false; } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { victim->CastSpell(victim, SPELL_MARK_DEATH, 0); @@ -82,17 +82,17 @@ class boss_doomwalker : public CreatureScript Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who && who->GetTypeId() == TypeID::TYPEID_PLAYER && me->IsValidAttackTarget(who)) @@ -100,7 +100,7 @@ class boss_doomwalker : public CreatureScript who->CastSpell(who, SPELL_AURA_DEATH, 1); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -161,7 +161,7 @@ class boss_doomwalker : public CreatureScript bool _inEnrage; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new boss_doomwalkerAI(creature); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 56b7b86a491..cba127546d7 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -62,7 +62,7 @@ class npc_bladespire_ogre : public CreatureScript public: npc_bladespire_ogre() : CreatureScript("npc_bladespire_ogre") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bladespire_ogreAI(creature); } @@ -71,9 +71,9 @@ class npc_bladespire_ogre : public CreatureScript { npc_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE + void UpdateAI(uint32 /*uiDiff*/) override { if (!UpdateVictim()) return; @@ -114,7 +114,7 @@ class npc_nether_drake : public CreatureScript public: npc_nether_drake() : CreatureScript("npc_nether_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_nether_drakeAI(creature); } @@ -131,7 +131,7 @@ class npc_nether_drake : public CreatureScript uint32 ManaBurn_Timer; uint32 IntangiblePresence_Timer; - void Reset() OVERRIDE + void Reset() override { IsNihil = false; NihilSpeech_Timer = 3000; @@ -142,9 +142,9 @@ class npc_nether_drake : public CreatureScript IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -154,7 +154,7 @@ class npc_nether_drake : public CreatureScript } //in case Creature was not summoned (not expected) - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -167,7 +167,7 @@ class npc_nether_drake : public CreatureScript } } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TypeID::TYPEID_PLAYER) { @@ -198,7 +198,7 @@ class npc_nether_drake : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (IsNihil) { @@ -279,7 +279,7 @@ class npc_daranelle : public CreatureScript public: npc_daranelle() : CreatureScript("npc_daranelle") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_daranelleAI(creature); } @@ -288,11 +288,11 @@ class npc_daranelle : public CreatureScript { npc_daranelleAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) @@ -321,7 +321,7 @@ class npc_overseer_nuaar : public CreatureScript public: npc_overseer_nuaar() : CreatureScript("npc_overseer_nuaar") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -332,7 +332,7 @@ class npc_overseer_nuaar : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -355,7 +355,7 @@ class npc_saikkal_the_elder : public CreatureScript public: npc_saikkal_the_elder() : CreatureScript("npc_saikkal_the_elder") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -372,7 +372,7 @@ class npc_saikkal_the_elder : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -392,7 +392,7 @@ class go_legion_obelisk : public GameObjectScript public: go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { @@ -449,7 +449,7 @@ class npc_bloodmaul_brutebane : public CreatureScript public: npc_bloodmaul_brutebane() : CreatureScript("npc_bloodmaul_brutebane") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bloodmaul_brutebaneAI(creature); } @@ -467,12 +467,12 @@ class npc_bloodmaul_brutebane : public CreatureScript uint64 OgreGUID; - void Reset() OVERRIDE + void Reset() override { OgreGUID = 0; } - void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { } + void UpdateAI(uint32 /*uiDiff*/) override { } }; }; @@ -485,7 +485,7 @@ class npc_ogre_brute : public CreatureScript public: npc_ogre_brute() : CreatureScript("npc_ogre_brute") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ogre_bruteAI(creature); } @@ -496,12 +496,12 @@ class npc_ogre_brute : public CreatureScript uint64 PlayerGUID; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who || (!who->IsAlive())) return; @@ -515,7 +515,7 @@ class npc_ogre_brute : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == 1) { @@ -533,7 +533,7 @@ class npc_ogre_brute : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -557,7 +557,7 @@ class go_thunderspike : public GameObjectScript public: go_thunderspike() : GameObjectScript("go_thunderspike") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (player->GetQuestStatus(QUEST_THUNDERSPIKE) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_GOR_GRIMGUT, 25.0f, true)) if (Creature* gorGrimgut = go->SummonCreature(NPC_GOR_GRIMGUT, -2413.4f, 6914.48f, 25.01f, 3.67f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000)) @@ -659,7 +659,7 @@ class npc_simon_bunny : public CreatureScript EventMap _events; std::list colorSequence, playableSequence, playerSequence; - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { _events.Update(diff); @@ -713,7 +713,7 @@ class npc_simon_bunny : public CreatureScript } } - void DoAction(int32 action) OVERRIDE + void DoAction(int32 action) override { switch (action) { @@ -739,7 +739,7 @@ class npc_simon_bunny : public CreatureScript } // Called by color clusters script (go_simon_cluster) and used for knowing the button pressed by player - void SetData(uint32 type, uint32 /*data*/) OVERRIDE + void SetData(uint32 type, uint32 /*data*/) override { if (!listening) return; @@ -762,7 +762,7 @@ class npc_simon_bunny : public CreatureScript } // Used for getting involved player guid. Parameter id is used for defining if is a large(Monument) or small(Relic) node - void SetGUID(uint64 guid, int32 id) OVERRIDE + void SetGUID(uint64 guid, int32 id) override { me->SetCanFly(true); @@ -1052,7 +1052,7 @@ class npc_simon_bunny : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* target, const SpellInfo* spell) override { // Cast SPELL_BAD_PRESS_DAMAGE with scaled basepoints when the visual hits the target. // Need Fix: When SPELL_BAD_PRESS_TRIGGER hits target it triggers spell SPELL_BAD_PRESS_DAMAGE by itself @@ -1084,7 +1084,7 @@ class npc_simon_bunny : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_simon_bunnyAI(creature); } @@ -1095,7 +1095,7 @@ class go_simon_cluster : public GameObjectScript public: go_simon_cluster() : GameObjectScript("go_simon_cluster") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (Creature* bunny = go->FindNearestCreature(NPC_SIMON_BUNNY, 12.0f, true)) bunny->AI()->SetData(go->GetEntry(), 0); @@ -1121,14 +1121,14 @@ class go_apexis_relic : public GameObjectScript public: go_apexis_relic() : GameObjectScript("go_apexis_relic") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { player->PrepareGossipMenu(go, go->GetGOInfo()->questgiver.gossipID); player->SendPreparedGossip(go); return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 /*action*/) override { player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index a9a0f0a1ee5..86797e9375e 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -63,7 +63,7 @@ class npc_aeranas : public CreatureScript public: npc_aeranas() : CreatureScript("npc_aeranas") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_aeranasAI(creature); } @@ -76,7 +76,7 @@ class npc_aeranas : public CreatureScript uint32 EnvelopingWinds_Timer; uint32 Shock_Timer; - void Reset() OVERRIDE + void Reset() override { Faction_Timer = 8000; EnvelopingWinds_Timer = 9000; @@ -88,7 +88,7 @@ class npc_aeranas : public CreatureScript Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Faction_Timer) { @@ -150,7 +150,7 @@ class npc_ancestral_wolf : public CreatureScript public: npc_ancestral_wolf() : CreatureScript("npc_ancestral_wolf") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_ancestral_wolfAI(creature); } @@ -170,13 +170,13 @@ class npc_ancestral_wolf : public CreatureScript Creature* pRyga; - void Reset() OVERRIDE + void Reset() override { pRyga = NULL; DoCast(me, SPELL_ANCESTRAL_WOLF_BUFF, true); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!pRyga && who->GetEntry() == NPC_RYGA && me->IsWithinDistInMap(who, 15.0f)) @@ -186,7 +186,7 @@ class npc_ancestral_wolf : public CreatureScript npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -221,7 +221,7 @@ class npc_naladu : public CreatureScript public: npc_naladu() : CreatureScript("npc_naladu") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -230,7 +230,7 @@ class npc_naladu : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -260,7 +260,7 @@ class npc_tracy_proudwell : public CreatureScript public: npc_tracy_proudwell() : CreatureScript("npc_tracy_proudwell") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -280,7 +280,7 @@ class npc_tracy_proudwell : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -316,7 +316,7 @@ class npc_trollbane : public CreatureScript public: npc_trollbane() : CreatureScript("npc_trollbane") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -336,7 +336,7 @@ class npc_trollbane : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -369,7 +369,7 @@ class npc_wounded_blood_elf : public CreatureScript public: npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) { @@ -383,7 +383,7 @@ class npc_wounded_blood_elf : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wounded_blood_elfAI(creature); } @@ -392,7 +392,7 @@ class npc_wounded_blood_elf : public CreatureScript { npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -426,15 +426,15 @@ class npc_wounded_blood_elf : public CreatureScript } } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ELF_AGGRO); } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } @@ -457,7 +457,7 @@ class npc_fel_guard_hound : public CreatureScript public: npc_fel_guard_hound() : CreatureScript("npc_fel_guard_hound") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fel_guard_houndAI(creature); } @@ -469,13 +469,13 @@ class npc_fel_guard_hound : public CreatureScript uint32 uiCheckTimer; uint64 uiHelboarGUID; - void Reset() OVERRIDE + void Reset() override { uiCheckTimer = 5000; //check for creature every 5 sec uiHelboarGUID = 0; } - void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE + void MovementInform(uint32 uiType, uint32 uiId) override { if (uiType != POINT_MOTION_TYPE || uiId != 1) return; @@ -490,7 +490,7 @@ class npc_fel_guard_hound : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { if (uiCheckTimer <= uiDiff) { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 4d778116cd9..d0a9f6de215 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -62,7 +62,7 @@ class npc_greatmother_geyah : public CreatureScript public: npc_greatmother_geyah() : CreatureScript("npc_greatmother_geyah") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -123,7 +123,7 @@ class npc_greatmother_geyah : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -180,7 +180,7 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -201,7 +201,7 @@ class npc_maghar_captive : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_maghar_captiveAI(creature); } @@ -214,19 +214,19 @@ class npc_maghar_captive : public CreatureScript uint32 m_uiHealTimer; uint32 m_uiFrostShockTimer; - void Reset() OVERRIDE + void Reset() override { m_uiChainLightningTimer = 1000; m_uiHealTimer = 0; m_uiFrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -251,7 +251,7 @@ class npc_maghar_captive : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_MURK_BRUTE) summoned->AI()->Talk(SAY_MAG_NO_ESCAPE); @@ -264,7 +264,7 @@ class npc_maghar_captive : public CreatureScript summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) override { if (pSpell->Id == SPELL_CHAIN_LIGHTNING) { @@ -275,7 +275,7 @@ class npc_maghar_captive : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); if (!me->GetVictim()) @@ -322,7 +322,7 @@ class npc_creditmarker_visit_with_ancestors : public CreatureScript public: npc_creditmarker_visit_with_ancestors() : CreatureScript("npc_creditmarker_visit_with_ancestors") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_creditmarker_visit_with_ancestorsAI(creature); } @@ -331,11 +331,11 @@ class npc_creditmarker_visit_with_ancestors : public CreatureScript { npc_creditmarker_visit_with_ancestorsAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!who) @@ -386,7 +386,7 @@ class go_corkis_prison : public GameObjectScript public: go_corkis_prison() : GameObjectScript("go_corkis_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->SetGoState(GOState::GO_STATE_READY); if (go->GetEntry() == GO_CORKIS_PRISON) @@ -427,7 +427,7 @@ class npc_corki : public CreatureScript public: npc_corki() : CreatureScript("npc_corki") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_corkiAI(creature); } @@ -439,13 +439,13 @@ class npc_corki : public CreatureScript uint32 Say_Timer; bool ReleasedFromCage; - void Reset() OVERRIDE + void Reset() override { Say_Timer = 5000; ReleasedFromCage = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (ReleasedFromCage) { @@ -459,7 +459,7 @@ class npc_corki : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) { @@ -511,7 +511,7 @@ class npc_kurenai_captive : public CreatureScript public: npc_kurenai_captive() : CreatureScript("npc_kurenai_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A) { @@ -529,7 +529,7 @@ class npc_kurenai_captive : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kurenai_captiveAI(creature); } @@ -542,19 +542,19 @@ class npc_kurenai_captive : public CreatureScript uint32 HealTimer; uint32 FrostShockTimer; - void Reset() OVERRIDE + void Reset() override { ChainLightningTimer = 1000; HealTimer = 0; FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -566,7 +566,7 @@ class npc_kurenai_captive : public CreatureScript } } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { switch (waypointId) { @@ -595,7 +595,7 @@ class npc_kurenai_captive : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_KUR_MURK_BRUTE) Talk(SAY_KUR_NO_ESCAPE); @@ -609,7 +609,7 @@ class npc_kurenai_captive : public CreatureScript summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override { if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING) { @@ -628,7 +628,7 @@ class npc_kurenai_captive : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -679,7 +679,7 @@ class go_warmaul_prison : public GameObjectScript public: go_warmaul_prison() : GameObjectScript("go_warmaul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index cad673e323c..090d78a234a 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -76,7 +76,7 @@ class npc_manaforge_control_console : public CreatureScript public: npc_manaforge_control_console() : CreatureScript("npc_manaforge_control_console") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_manaforge_control_consoleAI(creature); } @@ -93,7 +93,7 @@ class npc_manaforge_control_console : public CreatureScript uint64 goConsole; Creature* add; - void Reset() OVERRIDE + void Reset() override { Event_Timer = 3000; Wave_Timer = 0; @@ -104,9 +104,9 @@ class npc_manaforge_control_console : public CreatureScript add = NULL; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - /*void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + /*void SpellHit(Unit* caster, const SpellInfo* spell) override { //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. @@ -114,7 +114,7 @@ class npc_manaforge_control_console : public CreatureScript DoSay("Silence! I kill you!", LANG_UNIVERSAL, NULL); }*/ - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { Talk(EMOTE_ABORT); @@ -236,7 +236,7 @@ class npc_manaforge_control_console : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (Event_Timer <= diff) { @@ -313,7 +313,7 @@ class go_manaforge_control_console : public GameObjectScript public: go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -395,7 +395,7 @@ class npc_commander_dawnforge : public CreatureScript public: npc_commander_dawnforge() : CreatureScript("npc_commander_dawnforge") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_commander_dawnforgeAI(creature); } @@ -416,7 +416,7 @@ class npc_commander_dawnforge : public CreatureScript float angle_dawnforge; float angle_ardonis; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; ardonisGUID = 0; @@ -428,9 +428,9 @@ class npc_commander_dawnforge : public CreatureScript isEvent = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { pathaleonGUID = summoned->GetGUID(); } @@ -508,7 +508,7 @@ class npc_commander_dawnforge : public CreatureScript return false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Is event even running? if (!isEvent) @@ -646,7 +646,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) override { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -689,7 +689,7 @@ class npc_professor_dabiri : public CreatureScript //if (quest->GetQuestId() == QUEST_DIMENSIUS) //creature->AI()->Talk(WHISPER_DABIRI, player); - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -701,7 +701,7 @@ class npc_professor_dabiri : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -741,7 +741,7 @@ class npc_phase_hunter : public CreatureScript public: npc_phase_hunter() : CreatureScript("npc_phase_hunter") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_phase_hunterAI(creature); } @@ -759,7 +759,7 @@ class npc_phase_hunter : public CreatureScript uint32 ManaBurnTimer; - void Reset() OVERRIDE + void Reset() override { Weak = false; Materialize = false; @@ -774,18 +774,18 @@ class npc_phase_hunter : public CreatureScript me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (who->GetTypeId() == TypeID::TYPEID_PLAYER) PlayerGUID = who->GetGUID(); } - //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) OVERRIDE + //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) override //{ // DoCast(me, SPELL_DE_MATERIALIZE); //} - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Materialize) { @@ -866,7 +866,7 @@ class npc_bessy : public CreatureScript public: npc_bessy() : CreatureScript("npc_bessy") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == Q_ALMABTRIEB) { @@ -877,7 +877,7 @@ class npc_bessy : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bessyAI(creature); } @@ -886,13 +886,13 @@ class npc_bessy : public CreatureScript { npc_bessyAI(Creature* creature) : npc_escortAI(creature) { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(Q_ALMABTRIEB); } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -921,12 +921,12 @@ class npc_bessy : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(me); } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } @@ -948,7 +948,7 @@ class npc_maxx_a_million_escort : public CreatureScript public: npc_maxx_a_million_escort() : CreatureScript("npc_maxx_a_million_escort") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_maxx_a_million_escortAI(creature); } @@ -960,13 +960,13 @@ class npc_maxx_a_million_escort : public CreatureScript bool bTake; uint32 uiTakeTimer; - void Reset() OVERRIDE + void Reset() override { bTake=false; uiTakeTimer=3000; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -992,13 +992,13 @@ class npc_maxx_a_million_escort : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_MARK_V_IS_ALIVE); } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -1022,7 +1022,7 @@ class npc_maxx_a_million_escort : public CreatureScript } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { @@ -1051,7 +1051,7 @@ class go_captain_tyralius_prison : public GameObjectScript public: go_captain_tyralius_prison() : GameObjectScript("go_captain_tyralius_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (Creature* tyralius = go->FindNearestCreature(NPC_CAPTAIN_TYRALIUS, 1.0f)) diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 08619b19fa4..dcd0837a13e 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -75,7 +75,7 @@ class npc_mature_netherwing_drake : public CreatureScript public: npc_mature_netherwing_drake() : CreatureScript("npc_mature_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_mature_netherwing_drakeAI(creature); } @@ -92,7 +92,7 @@ class npc_mature_netherwing_drake : public CreatureScript uint32 EatTimer; uint32 CastTimer; - void Reset() OVERRIDE + void Reset() override { uiPlayerGUID = 0; @@ -103,7 +103,7 @@ class npc_mature_netherwing_drake : public CreatureScript CastTimer = 5000; } - void SpellHit(Unit* pCaster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* pCaster, SpellInfo const* spell) override { if (bCanEat || bIsEating) return; @@ -115,7 +115,7 @@ class npc_mature_netherwing_drake : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -128,7 +128,7 @@ class npc_mature_netherwing_drake : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (bCanEat || bIsEating) { @@ -212,7 +212,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript public: npc_enslaved_netherwing_drake() : CreatureScript("npc_enslaved_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enslaved_netherwing_drakeAI(creature); } @@ -230,7 +230,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript uint32 FlyTimer; bool Tapped; - void Reset() OVERRIDE + void Reset() override { if (!Tapped) me->setFaction(FACTION_DEFAULT); @@ -240,7 +240,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript me->SetVisible(true); } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (!caster) return; @@ -266,7 +266,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -288,7 +288,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) { @@ -343,7 +343,7 @@ class npc_dragonmaw_peon : public CreatureScript public: npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_dragonmaw_peonAI(creature); } @@ -356,14 +356,14 @@ class npc_dragonmaw_peon : public CreatureScript bool Tapped; uint32 PoisonTimer; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; Tapped = false; PoisonTimer = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* caster, const SpellInfo* spell) override { if (!caster) return; @@ -381,7 +381,7 @@ class npc_dragonmaw_peon : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) OVERRIDE + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -393,7 +393,7 @@ class npc_dragonmaw_peon : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (PoisonTimer) { @@ -422,7 +422,7 @@ class npc_drake_dealer_hurlunk : public CreatureScript public: npc_drake_dealer_hurlunk() : CreatureScript("npc_drake_dealer_hurlunk") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -431,7 +431,7 @@ class npc_drake_dealer_hurlunk : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsVendor() && player->GetReputationRank(1015) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -454,7 +454,7 @@ class npcs_flanis_swiftwing_and_kagrosh : public CreatureScript public: npcs_flanis_swiftwing_and_kagrosh() : CreatureScript("npcs_flanis_swiftwing_and_kagrosh") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -480,7 +480,7 @@ class npcs_flanis_swiftwing_and_kagrosh : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30658, 1, true)) player->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -511,7 +511,7 @@ class npc_murkblood_overseer : public CreatureScript public: npc_murkblood_overseer() : CreatureScript("npc_murkblood_overseer") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -551,7 +551,7 @@ class npc_murkblood_overseer : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -578,7 +578,7 @@ class npc_oronok_tornheart : public CreatureScript public: npc_oronok_tornheart() : CreatureScript("npc_oronok_tornheart") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -618,7 +618,7 @@ class npc_oronok_tornheart : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -655,7 +655,7 @@ class npc_karynaku : public CreatureScript public: npc_karynaku() : CreatureScript("npc_karynaku") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) player->ActivateTaxiPathTo(TAXI_PATH_ID); @@ -709,7 +709,7 @@ class npc_overlord_morghor : public CreatureScript public: npc_overlord_morghor() : CreatureScript("npc_overlord_morghor") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) override { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { @@ -720,7 +720,7 @@ class npc_overlord_morghor : public CreatureScript return false; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_overlord_morghorAI(creature); } @@ -737,7 +737,7 @@ class npc_overlord_morghor : public CreatureScript bool Event; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; IllidanGUID = 0; @@ -970,7 +970,7 @@ class npc_overlord_morghor : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!ConversationTimer) return; @@ -1013,7 +1013,7 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { @@ -1026,7 +1026,7 @@ class npc_earthmender_wilda : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_earthmender_wildaAI(creature); } @@ -1037,12 +1037,12 @@ class npc_earthmender_wilda : public CreatureScript uint32 m_uiHealingTimer; - void Reset() OVERRIDE + void Reset() override { m_uiHealingTimer = 0; } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -1100,7 +1100,7 @@ class npc_earthmender_wilda : public CreatureScript } } - void JustSummoned(Creature* summoned) OVERRIDE + void JustSummoned(Creature* summoned) override { if (summoned->GetEntry() == NPC_COILSKAR_ASSASSIN) summoned->AI()->AttackStart(me); @@ -1118,7 +1118,7 @@ class npc_earthmender_wilda : public CreatureScript DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { //don't always use if (rand()%5) @@ -1133,7 +1133,7 @@ class npc_earthmender_wilda : public CreatureScript } } - void UpdateAI(uint32 uiDiff) OVERRIDE + void UpdateAI(uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -1256,7 +1256,7 @@ class npc_torloth_the_magnificent : public CreatureScript public: npc_torloth_the_magnificent() : CreatureScript("npc_torloth_the_magnificent") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_torloth_the_magnificentAI(c); } @@ -1274,7 +1274,7 @@ class npc_torloth_the_magnificent : public CreatureScript bool Timers; - void Reset() OVERRIDE + void Reset() override { AnimationTimer = 4000; AnimationCount = 0; @@ -1287,7 +1287,7 @@ class npc_torloth_the_magnificent : public CreatureScript me->SetTarget(0); } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } void HandleAnimation() { @@ -1334,7 +1334,7 @@ class npc_torloth_the_magnificent : public CreatureScript ++AnimationCount; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (AnimationTimer) { @@ -1379,7 +1379,7 @@ class npc_torloth_the_magnificent : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { switch (killer->GetTypeId()) { @@ -1411,7 +1411,7 @@ class npc_lord_illidan_stormrage : public CreatureScript public: npc_lord_illidan_stormrage() : CreatureScript("npc_lord_illidan_stormrage") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_lord_illidan_stormrageAI(c); } @@ -1432,7 +1432,7 @@ class npc_lord_illidan_stormrage : public CreatureScript bool Announced; bool Failed; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; @@ -1448,10 +1448,10 @@ class npc_lord_illidan_stormrage : public CreatureScript me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) OVERRIDE { } + void AttackStart(Unit* /*who*/) override { } void SummonNextWave(); @@ -1515,7 +1515,7 @@ class npc_lord_illidan_stormrage : public CreatureScript Announced = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!PlayerGUID || !EventStarted) return; @@ -1553,7 +1553,7 @@ class npc_illidari_spawn : public CreatureScript public: npc_illidari_spawn() : CreatureScript("npc_illidari_spawn") { } - CreatureAI* GetAI(Creature* c) const OVERRIDE + CreatureAI* GetAI(Creature* c) const override { return new npc_illidari_spawnAI(c); } @@ -1566,15 +1566,15 @@ class npc_illidari_spawn : public CreatureScript uint32 SpellTimer1, SpellTimer2, SpellTimer3; bool Timers; - void Reset() OVERRIDE + void Reset() override { LordIllidanGUID = 0; Timers = false; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { me->RemoveCorpse(); if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID))) @@ -1582,7 +1582,7 @@ class npc_illidari_spawn : public CreatureScript CAST_AI(npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1739,7 +1739,7 @@ class go_crystal_prison : public GameObjectScript public: go_crystal_prison() : GameObjectScript("go_crystal_prison") { } - bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) override { if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH) { @@ -1808,7 +1808,7 @@ class npc_enraged_spirit : public CreatureScript public: npc_enraged_spirit() : CreatureScript("npc_enraged_spirit") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_enraged_spiritAI(creature); } @@ -1817,11 +1817,11 @@ class npc_enraged_spirit : public CreatureScript { npc_enraged_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { // always spawn spirit on death // if totem around @@ -1903,13 +1903,13 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader GetCaster()->ToPlayer()->KilledMonsterCredit(NPC_KARYNAKU, karynaku->GetGUID()); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_unlocking_zuluheds_chains_SpellScript(); } @@ -1937,14 +1937,14 @@ class npc_shadowmoon_tuber_node : public CreatureScript { npc_shadowmoon_tuber_nodeAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { tapped = false; tuberGUID = 0; resetTimer = 60000; } - void SetData(uint32 id, uint32 data) OVERRIDE + void SetData(uint32 id, uint32 data) override { if (id == TYPE_BOAR && data == DATA_BOAR) { @@ -1961,7 +1961,7 @@ class npc_shadowmoon_tuber_node : public CreatureScript } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override { if (!tapped && spell->Id == SPELL_WHISTLE) { @@ -1975,7 +1975,7 @@ class npc_shadowmoon_tuber_node : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (tapped) { @@ -1999,7 +1999,7 @@ class npc_shadowmoon_tuber_node : public CreatureScript uint32 resetTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_shadowmoon_tuber_nodeAI(creature); } diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 37c89089b0d..a245c1d236c 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -60,7 +60,7 @@ class npc_raliq_the_drunk : public CreatureScript public: npc_raliq_the_drunk() : CreatureScript("npc_raliq_the_drunk") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -72,7 +72,7 @@ class npc_raliq_the_drunk : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -81,7 +81,7 @@ class npc_raliq_the_drunk : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_raliq_the_drunkAI(creature); } @@ -96,13 +96,13 @@ class npc_raliq_the_drunk : public CreatureScript uint32 m_uiNormFaction; uint32 Uppercut_Timer; - void Reset() OVERRIDE + void Reset() override { Uppercut_Timer = 5000; me->RestoreFaction(); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -140,7 +140,7 @@ class npc_salsalabim : public CreatureScript public: npc_salsalabim() : CreatureScript("npc_salsalabim") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) { @@ -156,7 +156,7 @@ class npc_salsalabim : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_salsalabimAI(creature); } @@ -167,13 +167,13 @@ class npc_salsalabim : public CreatureScript uint32 MagneticPull_Timer; - void Reset() OVERRIDE + void Reset() override { MagneticPull_Timer = 15000; me->RestoreFaction(); } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetTypeId() == TypeID::TYPEID_PLAYER && me->HealthBelowPctDamaged(20, damage)) { @@ -183,7 +183,7 @@ class npc_salsalabim : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -215,7 +215,7 @@ class npc_shattrathflaskvendors : public CreatureScript public: npc_shattrathflaskvendors() : CreatureScript("npc_shattrathflaskvendors") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -224,7 +224,7 @@ class npc_shattrathflaskvendors : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->GetEntry() == 23484) { @@ -269,7 +269,7 @@ class npc_zephyr : public CreatureScript public: npc_zephyr() : CreatureScript("npc_zephyr") { } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -278,7 +278,7 @@ class npc_zephyr : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetReputationRank(989) >= REP_REVERED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -324,7 +324,7 @@ class npc_kservant : public CreatureScript public: npc_kservant() : CreatureScript("npc_kservant") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kservantAI(creature); } @@ -334,7 +334,7 @@ class npc_kservant : public CreatureScript public: npc_kservantAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -412,7 +412,7 @@ class npc_kservant : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) @@ -429,7 +429,7 @@ class npc_kservant : public CreatureScript } } - void Reset() OVERRIDE { } + void Reset() override { } }; }; @@ -445,7 +445,7 @@ class npc_ishanah : public CreatureScript public: npc_ishanah() : CreatureScript("npc_ishanah") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -456,7 +456,7 @@ class npc_ishanah : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -486,7 +486,7 @@ class npc_khadgar : public CreatureScript public: npc_khadgar() : CreatureScript("npc_khadgar") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -523,7 +523,7 @@ class npc_khadgar : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 3813ed640b2..9a4610931f3 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -63,7 +63,7 @@ class npc_unkor_the_ruthless : public CreatureScript public: npc_unkor_the_ruthless() : CreatureScript("npc_unkor_the_ruthless") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_unkor_the_ruthlessAI(creature); } @@ -76,7 +76,7 @@ class npc_unkor_the_ruthless : public CreatureScript uint32 UnkorUnfriendly_Timer; uint32 Pulverize_Timer; - void Reset() OVERRIDE + void Reset() override { CanDoQuest = false; UnkorUnfriendly_Timer = 0; @@ -85,7 +85,7 @@ class npc_unkor_the_ruthless : public CreatureScript me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } void DoNice() { @@ -98,7 +98,7 @@ class npc_unkor_the_ruthless : public CreatureScript UnkorUnfriendly_Timer = 60000; } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { Player* player = done_by->ToPlayer(); @@ -128,7 +128,7 @@ class npc_unkor_the_ruthless : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CanDoQuest) { @@ -170,7 +170,7 @@ class npc_infested_root_walker : public CreatureScript public: npc_infested_root_walker() : CreatureScript("npc_infested_root_walker") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_infested_root_walkerAI(creature); } @@ -179,10 +179,10 @@ class npc_infested_root_walker : public CreatureScript { npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by && done_by->GetTypeId() == TypeID::TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -201,7 +201,7 @@ class npc_skywing : public CreatureScript public: npc_skywing() : CreatureScript("npc_skywing") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_skywingAI(creature); } @@ -211,7 +211,7 @@ class npc_skywing : public CreatureScript public: npc_skywingAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -225,9 +225,9 @@ class npc_skywing : public CreatureScript } } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) @@ -239,9 +239,9 @@ class npc_skywing : public CreatureScript Start(false, false, who->GetGUID()); } - void Reset() OVERRIDE { } + void Reset() override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { npc_escortAI::UpdateAI(diff); } @@ -257,7 +257,7 @@ class npc_rotting_forest_rager : public CreatureScript public: npc_rotting_forest_rager() : CreatureScript("npc_rotting_forest_rager") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_rotting_forest_ragerAI(creature); } @@ -266,10 +266,10 @@ class npc_rotting_forest_rager : public CreatureScript { npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } - void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE + void DamageTaken(Unit* done_by, uint32 &damage) override { if (done_by->GetTypeId() == TypeID::TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -300,7 +300,7 @@ class npc_netherweb_victim : public CreatureScript public: npc_netherweb_victim() : CreatureScript("npc_netherweb_victim") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_netherweb_victimAI(creature); } @@ -309,12 +309,12 @@ class npc_netherweb_victim : public CreatureScript { npc_netherweb_victimAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { Player* player = killer->ToPlayer(); if (!player) @@ -363,7 +363,7 @@ class npc_floon : public CreatureScript public: npc_floon() : CreatureScript("npc_floon") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -381,7 +381,7 @@ class npc_floon : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -390,7 +390,7 @@ class npc_floon : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_floonAI(creature); } @@ -407,7 +407,7 @@ class npc_floon : public CreatureScript uint32 Frostbolt_Timer; uint32 FrostNova_Timer; - void Reset() OVERRIDE + void Reset() override { Silence_Timer = 2000; Frostbolt_Timer = 4000; @@ -416,9 +416,9 @@ class npc_floon : public CreatureScript me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -471,7 +471,7 @@ class npc_isla_starmane : public CreatureScript { npc_isla_starmaneAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -510,12 +510,12 @@ class npc_isla_starmane : public CreatureScript } } - void Reset() OVERRIDE + void Reset() override { me->RestoreFaction(); } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { if (Player* player = GetPlayerForEscort()) { @@ -527,7 +527,7 @@ class npc_isla_starmane : public CreatureScript } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { @@ -537,7 +537,7 @@ class npc_isla_starmane : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_isla_starmaneAI(creature); } @@ -556,7 +556,7 @@ class go_skull_pile : public GameObjectScript public: go_skull_pile() : GameObjectScript("go_skull_pile") { } - bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -566,7 +566,7 @@ class go_skull_pile : public GameObjectScript return true; } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { @@ -614,7 +614,7 @@ class npc_slim : public CreatureScript public: npc_slim() : CreatureScript("npc_slim") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -623,7 +623,7 @@ class npc_slim : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { @@ -652,7 +652,7 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPING_THE_TOMB) { @@ -667,7 +667,7 @@ class npc_akuno : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_akunoAI(creature); } @@ -676,7 +676,7 @@ class npc_akuno : public CreatureScript { npc_akunoAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -695,7 +695,7 @@ class npc_akuno : public CreatureScript } } - void JustSummoned(Creature* summon) OVERRIDE + void JustSummoned(Creature* summon) override { summon->AI()->AttackStart(me); } diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index e12646ec74c..e9a6de200e0 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -71,7 +71,7 @@ class npcs_ashyen_and_keleth : public CreatureScript public: npcs_ashyen_and_keleth() : CreatureScript("npcs_ashyen_and_keleth") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetReputationRank(942) > REP_NEUTRAL) { @@ -86,7 +86,7 @@ class npcs_ashyen_and_keleth : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -185,16 +185,16 @@ class npc_cooshcoosh : public CreatureScript uint32 m_uiNormFaction; uint32 LightningBolt_Timer; - void Reset() OVERRIDE + void Reset() override { LightningBolt_Timer = 2000; if (me->getFaction() != m_uiNormFaction) me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -209,12 +209,12 @@ class npc_cooshcoosh : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_cooshcooshAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -223,7 +223,7 @@ class npc_cooshcoosh : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF) @@ -249,7 +249,7 @@ class npc_elder_kuruti : public CreatureScript public: npc_elder_kuruti() : CreatureScript("npc_elder_kuruti") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -259,7 +259,7 @@ class npc_elder_kuruti : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -302,7 +302,7 @@ class npc_mortog_steamhead : public CreatureScript public: npc_mortog_steamhead() : CreatureScript("npc_mortog_steamhead") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsVendor() && player->GetReputationRank(942) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -312,7 +312,7 @@ class npc_mortog_steamhead : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -346,9 +346,9 @@ class npc_kayra_longmane : public CreatureScript { npc_kayra_longmaneAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() OVERRIDE { } + void Reset() override { } - void WaypointReached(uint32 waypointId) OVERRIDE + void WaypointReached(uint32 waypointId) override { Player* player = GetPlayerForEscort(); if (!player) @@ -381,7 +381,7 @@ class npc_kayra_longmane : public CreatureScript } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE_FROM) { @@ -393,7 +393,7 @@ class npc_kayra_longmane : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_kayra_longmaneAI(creature); } @@ -416,7 +416,7 @@ class npc_timothy_daniels : public CreatureScript public: npc_timothy_daniels() : CreatureScript("npc_timothy_daniels") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -429,7 +429,7 @@ class npc_timothy_daniels : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) diff --git a/src/server/scripts/Pandaria/StormstoutBrewery/boss_ook_ook.cpp b/src/server/scripts/Pandaria/StormstoutBrewery/boss_ook_ook.cpp index 9dfa3eb6dee..9de608ea738 100644 --- a/src/server/scripts/Pandaria/StormstoutBrewery/boss_ook_ook.cpp +++ b/src/server/scripts/Pandaria/StormstoutBrewery/boss_ook_ook.cpp @@ -42,7 +42,7 @@ class boss_ook_ook : public CreatureScript { boss_ook_ookAI(Creature* creature) : BossAI(creature, DATA_OOK_OOK) { } - void Reset() OVERRIDE + void Reset() override { BossAI::Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -50,31 +50,31 @@ class boss_ook_ook : public CreatureScript events.ScheduleEvent(EVENT_BANANA_AURA, DUNGEON_MODE(12000, 7000)); } - void JustDied(Unit* /* killer */) OVERRIDE + void JustDied(Unit* /* killer */) override { _JustDied(); //Talk(SAY_DEATH); instance->SetBossState(DATA_OOK_OOK, DONE); } - void EnterCombat(Unit* victim) OVERRIDE + void EnterCombat(Unit* victim) override { BossAI::EnterCombat(victim); //Talk(SAY_AGGRO); } - void JustReachedHome() OVERRIDE + void JustReachedHome() override { BossAI::JustReachedHome(); instance->SetBossState(DATA_OOK_OOK, FAIL); } - void KilledUnit(Unit* victim) OVERRIDE + void KilledUnit(Unit* victim) override { //Talk(SAY_KILL); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !CheckInRoom()) return; @@ -108,7 +108,7 @@ class boss_ook_ook : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return GetStormstoutBreweryAI(creature); } diff --git a/src/server/scripts/Pandaria/StormstoutBrewery/instance_stormstout_brewery.cpp b/src/server/scripts/Pandaria/StormstoutBrewery/instance_stormstout_brewery.cpp index e0ae590b66c..d59ad427ff4 100644 --- a/src/server/scripts/Pandaria/StormstoutBrewery/instance_stormstout_brewery.cpp +++ b/src/server/scripts/Pandaria/StormstoutBrewery/instance_stormstout_brewery.cpp @@ -37,7 +37,7 @@ class instance_stormstout_brewery : public InstanceMapScript BananaCount = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -55,13 +55,13 @@ class instance_stormstout_brewery : public InstanceMapScript } } - //void OnGameObjectCreate(GameObject* go) OVERRIDE + //void OnGameObjectCreate(GameObject* go) override //{} - //void OnGameObjectRemove(GameObject* go) OVERRIDE + //void OnGameObjectRemove(GameObject* go) override //{} - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -79,7 +79,7 @@ class instance_stormstout_brewery : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -92,7 +92,7 @@ class instance_stormstout_brewery : public InstanceMapScript } } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -103,7 +103,7 @@ class instance_stormstout_brewery : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -142,7 +142,7 @@ class instance_stormstout_brewery : public InstanceMapScript uint64 BananaCount; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_stormstout_brewery_InstanceScript(map); } diff --git a/src/server/scripts/Pandaria/StormstoutBrewery/stormstout_brewery.cpp b/src/server/scripts/Pandaria/StormstoutBrewery/stormstout_brewery.cpp index 5272ff8773c..faf1e4ff3e1 100644 --- a/src/server/scripts/Pandaria/StormstoutBrewery/stormstout_brewery.cpp +++ b/src/server/scripts/Pandaria/StormstoutBrewery/stormstout_brewery.cpp @@ -70,7 +70,7 @@ class AreaTrigger_at_ssb_banana_bar : public AreaTriggerScript public: AreaTrigger_at_ssb_banana_bar() : AreaTriggerScript("at_ssb_banana_bar") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { // Only trigger once if (InstanceScript* instance = player->GetInstanceScript()) @@ -107,17 +107,17 @@ class npc_banana_hozen : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (instance) SummonOokOokIfReady(instance, me, killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (instance->GetBossState(DATA_BANANA_EVENT) == DONE) { @@ -141,7 +141,7 @@ class npc_banana_hozen : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_banana_hozenAI(creature); } @@ -159,17 +159,17 @@ class npc_bopper : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE { } + void Reset() override { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (instance) SummonHoptallusIfReady(instance, me, killer); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -180,7 +180,7 @@ class npc_bopper : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_bopperAI(creature); } diff --git a/src/server/scripts/Pandaria/TempleOfJadeSerpent/instance_temple_of_jade_serpent.cpp b/src/server/scripts/Pandaria/TempleOfJadeSerpent/instance_temple_of_jade_serpent.cpp index c9b8246875c..9eb709bb1d6 100644 --- a/src/server/scripts/Pandaria/TempleOfJadeSerpent/instance_temple_of_jade_serpent.cpp +++ b/src/server/scripts/Pandaria/TempleOfJadeSerpent/instance_temple_of_jade_serpent.cpp @@ -40,7 +40,7 @@ class instance_jade_serpent : public InstanceMapScript ShaOfDoubtGUID = 0; } - void OnCreatureCreate(Creature* creature) OVERRIDE + void OnCreatureCreate(Creature* creature) override { switch (creature->GetEntry()) { @@ -61,13 +61,13 @@ class instance_jade_serpent : public InstanceMapScript } } - //void OnGameObjectCreate(GameObject* go) OVERRIDE + //void OnGameObjectCreate(GameObject* go) override //{} - //void OnGameObjectRemove(GameObject* go) OVERRIDE + //void OnGameObjectRemove(GameObject* go) override //{} - uint64 GetData64(uint32 type) const OVERRIDE + uint64 GetData64(uint32 type) const override { switch (type) { @@ -85,7 +85,7 @@ class instance_jade_serpent : public InstanceMapScript return 0; } - std::string GetSaveData() OVERRIDE + std::string GetSaveData() override { OUT_SAVE_INST_DATA; @@ -96,7 +96,7 @@ class instance_jade_serpent : public InstanceMapScript return saveStream.str(); } - void Load(char const* str) OVERRIDE + void Load(char const* str) override { if (!str) { @@ -135,7 +135,7 @@ class instance_jade_serpent : public InstanceMapScript uint64 ShaOfDoubtGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE + InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new instance_jade_serpent_InstanceScript(map); } diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 9ea63b8cb7c..6170e361118 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -47,7 +47,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript { npc_pet_dk_ebon_gargoyleAI(Creature* creature) : CasterAI(creature) { } - void InitializeAI() OVERRIDE + void InitializeAI() override { CasterAI::InitializeAI(); uint64 ownerGuid = me->GetOwnerGUID(); @@ -69,7 +69,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript } } - void JustDied(Unit* /*killer*/) OVERRIDE + void JustDied(Unit* /*killer*/) override { // Stop Feeding Gargoyle when it dies if (Unit* owner = me->GetOwner()) @@ -77,7 +77,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript } // Fly away when dismissed - void SpellHit(Unit* source, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* source, SpellInfo const* spell) override { if (spell->Id != SPELL_DK_DISMISS_GARGOYLE || !me->IsAlive()) return; @@ -108,7 +108,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript _despawnTimer = 4 * IN_MILLISECONDS; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (_despawnTimer > 0) { @@ -126,7 +126,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript uint32 _despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_dk_ebon_gargoyleAI(creature); } diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 6267e316fcb..d6636d34926 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -43,7 +43,7 @@ class npc_pet_gen_mojo : public CreatureScript { npc_pet_gen_mojoAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _victimGUID = 0; @@ -51,10 +51,10 @@ class npc_pet_gen_mojo : public CreatureScript me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void UpdateAI(uint32 /*diff*/) override { } - void ReceiveEmote(Player* player, uint32 emote) OVERRIDE + void ReceiveEmote(Player* player, uint32 emote) override { me->HandleEmoteCommand(emote); Unit* owner = me->GetOwner(); @@ -81,7 +81,7 @@ class npc_pet_gen_mojo : public CreatureScript uint64 _victimGUID; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_gen_mojoAI(creature); } diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index 6073021baf7..c13533c5efd 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -46,9 +46,9 @@ class npc_pet_hunter_snake_trap : public CreatureScript { npc_pet_hunter_snake_trapAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void Reset() OVERRIDE + void Reset() override { _spellTimer = 0; @@ -70,7 +70,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript } // Redefined for random target selection: - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -90,7 +90,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -136,7 +136,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript uint32 _spellTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_hunter_snake_trapAI(creature); } diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 9c07fd5cfd8..0c20299eed7 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -43,7 +43,7 @@ class npc_pet_mage_mirror_image : public CreatureScript { npc_pet_mage_mirror_imageAI(Creature* creature) : CasterAI(creature) { } - void InitializeAI() OVERRIDE + void InitializeAI() override { CasterAI::InitializeAI(); Unit* owner = me->GetOwner(); @@ -59,7 +59,7 @@ class npc_pet_mage_mirror_image : public CreatureScript } // Do not reload Creature templates on evade mode enter - prevent visual lost - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (me->IsInEvadeMode() || !me->IsAlive()) return; @@ -75,7 +75,7 @@ class npc_pet_mage_mirror_image : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_mage_mirror_imageAI(creature); } diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp index 7942d75ef73..f060147cd11 100644 --- a/src/server/scripts/Pet/pet_priest.cpp +++ b/src/server/scripts/Pet/pet_priest.cpp @@ -44,7 +44,7 @@ class npc_pet_pri_lightwell : public CreatureScript DoCast(me, SPELL_PRIEST_LIGHTWELL_CHARGES, false); } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (!me->IsAlive()) return; @@ -55,7 +55,7 @@ class npc_pet_pri_lightwell : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_pri_lightwellAI(creature); } diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index 8ee814693f0..4264136f054 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -53,14 +53,14 @@ class npc_pet_shaman_earth_elemental : public CreatureScript npc_pet_shaman_earth_elementalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, 0); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -80,7 +80,7 @@ class npc_pet_shaman_earth_elemental : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_shaman_earth_elementalAI(creature); } @@ -95,7 +95,7 @@ class npc_pet_shaman_fire_elemental : public CreatureScript { npc_pet_shaman_fire_elementalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { _events.Reset(); _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, urand(5000, 20000)); @@ -104,7 +104,7 @@ class npc_pet_shaman_fire_elemental : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -142,7 +142,7 @@ class npc_pet_shaman_fire_elemental : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_pet_shaman_fire_elementalAI(creature); } diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index c889b983059..c725eb05764 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -122,13 +122,13 @@ class spell_dk_gorefiends_grasp : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_dk_gorefiends_grasp_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_gorefiends_grasp_SpellScript(); } @@ -169,13 +169,13 @@ class spell_dk_runic_empowerment : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_dk_runic_empowerment_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_runic_empowerment_SpellScript(); } @@ -210,13 +210,13 @@ class spell_dk_runic_corruption : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_dk_runic_corruption_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_runic_corruption_SpellScript(); } @@ -243,13 +243,13 @@ class spell_dk_raise_dead : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_dk_raise_dead_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_raise_dead_SpellScript(); } @@ -265,7 +265,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader { PrepareAuraScript(spell_dk_anti_magic_shell_raid_AuraScript); - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -282,7 +282,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell_raid_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell_raid_AuraScript::Absorb, EFFECT_0); @@ -291,7 +291,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader uint32 absorbPct = 0; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_anti_magic_shell_raid_AuraScript(); } @@ -307,14 +307,14 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader { PrepareAuraScript(spell_dk_anti_magic_shell_self_AuraScript); - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); hpPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_RUNIC_POWER_ENERGIZE)) return false; @@ -340,7 +340,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader target->CastCustomSpell(target, SPELL_DK_RUNIC_POWER_ENERGIZE, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell_self_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell_self_AuraScript::Absorb, EFFECT_0); @@ -351,7 +351,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader uint32 hpPct = 0; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_anti_magic_shell_self_AuraScript(); } @@ -367,13 +367,13 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader { PrepareAuraScript(spell_dk_anti_magic_zone_AuraScript); - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_ANTI_MAGIC_SHELL_TALENT)) return false; @@ -393,7 +393,7 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_zone_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_zone_AuraScript::Absorb, EFFECT_0); @@ -402,7 +402,7 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader uint32 absorbPct = 0; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_anti_magic_zone_AuraScript(); } @@ -418,14 +418,14 @@ class spell_dk_blood_boil : public SpellScriptLoader { PrepareSpellScript(spell_dk_blood_boil_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_BOIL_TRIGGERED)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _executed = false; return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER && GetCaster()->getClass() == CLASS_DEATH_KNIGHT; @@ -440,7 +440,7 @@ class spell_dk_blood_boil : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DK_BLOOD_BOIL_TRIGGERED, true); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_dk_blood_boil_SpellScript::HandleAfterHit); } @@ -449,7 +449,7 @@ class spell_dk_blood_boil : public SpellScriptLoader bool _executed = false; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_blood_boil_SpellScript(); } @@ -465,14 +465,14 @@ class spell_dk_blood_gorged : public SpellScriptLoader { PrepareAuraScript(spell_dk_blood_gorged_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_GORGED_HEAL)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -490,7 +490,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DK_BLOOD_GORGED_HEAL, SPELLVALUE_BASE_POINT0, heal, _procTarget, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_dk_blood_gorged_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_blood_gorged_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); @@ -500,7 +500,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader Unit* _procTarget = NULL; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_blood_gorged_AuraScript(); } @@ -516,7 +516,7 @@ class spell_dk_death_coil : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_coil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_HEAL)) return false; @@ -556,14 +556,14 @@ class spell_dk_death_coil : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_dk_death_coil_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_coil_SpellScript(); } @@ -597,14 +597,14 @@ class spell_dk_death_gate : public SpellScriptLoader target->CastSpell(target, GetEffectValue(), false); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_dk_death_gate_SpellScript::CheckClass); OnEffectHitTarget += SpellEffectFn(spell_dk_death_gate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_gate_SpellScript(); } @@ -631,13 +631,13 @@ class spell_dk_death_grip : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_grip_SpellScript(); } @@ -686,14 +686,14 @@ class spell_dk_death_pact : public SpellScriptLoader targetList.push_back(target); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_dk_death_pact_SpellScript::CheckCast); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_death_pact_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_pact_SpellScript(); } @@ -709,7 +709,7 @@ class spell_dk_death_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_strike_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_STRIKE_ENABLER) || !sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_STRIKE_HEAL) || @@ -740,13 +740,13 @@ class spell_dk_death_strike : public SpellScriptLoader GetCaster()->CastCustomSpell(SPELL_DK_BLOOD_SHIELD_ABSORB, SPELLVALUE_BASE_POINT0, GetCaster()->CountPctFromMaxHealth(aurEff->GetAmount()), GetCaster()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_strike_SpellScript(); } @@ -762,7 +762,7 @@ class spell_dk_death_strike_enabler : public SpellScriptLoader { PrepareAuraScript(spell_dk_death_strike_enabler_AuraScript); - bool Load() OVERRIDE + bool Load() override { for (uint8 i = 0; i < 5; ++i) _damagePerSecond[i] = 0; @@ -808,7 +808,7 @@ class spell_dk_death_strike_enabler : public SpellScriptLoader amount += int32(_damagePerSecond[i]); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_dk_death_strike_enabler_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_death_strike_enabler_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -820,7 +820,7 @@ class spell_dk_death_strike_enabler : public SpellScriptLoader uint32 _damagePerSecond[5] = { }; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_death_strike_enabler_AuraScript(); } @@ -836,7 +836,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader { PrepareSpellScript(spell_dk_ghoul_explode_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED)) return false; @@ -852,13 +852,13 @@ class spell_dk_ghoul_explode : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_ghoul_explode_SpellScript(); } @@ -874,7 +874,7 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader { PrepareAuraScript(spell_dk_icebound_fortitude_AuraScript); - bool Load() OVERRIDE + bool Load() override { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TypeID::TYPEID_PLAYER; @@ -901,13 +901,13 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_icebound_fortitude_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_icebound_fortitude_AuraScript(); } @@ -929,13 +929,13 @@ class spell_dk_necrotic_strike : public SpellScriptLoader amount = int32(caster->GetTotalAttackPowerValue(WeaponAttackType::BASE_ATTACK) * 0.7f); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_necrotic_strike_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_necrotic_strike_AuraScript(); } @@ -956,13 +956,13 @@ class spell_dk_rune_tap_party : public SpellScriptLoader targets.remove(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_rune_tap_party_SpellScript::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_rune_tap_party_SpellScript(); } @@ -978,7 +978,7 @@ class spell_dk_scent_of_blood : public SpellScriptLoader { PrepareAuraScript(spell_dk_scent_of_blood_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_SCENT_OF_BLOOD)) return false; @@ -992,13 +992,13 @@ class spell_dk_scent_of_blood : public SpellScriptLoader GetTarget()->RemoveAuraFromStack(GetId()); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dk_scent_of_blood_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_scent_of_blood_AuraScript(); } @@ -1014,13 +1014,13 @@ class spell_dk_scourge_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_scourge_strike_SpellScript); - bool Load() OVERRIDE + bool Load() override { multiplier = 1.0f; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_SCOURGE_STRIKE_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_DK_ITEM_T8_MELEE_4P_BONUS)) @@ -1050,7 +1050,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_scourge_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); AfterHit += SpellHitFn(spell_dk_scourge_strike_SpellScript::HandleAfterHit); @@ -1059,7 +1059,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader float multiplier = 0.0f; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_scourge_strike_SpellScript(); } @@ -1080,13 +1080,13 @@ class spell_dk_vampiric_blood : public SpellScriptLoader amount = GetUnitOwner()->CountPctFromMaxHealth(amount); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_vampiric_blood_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_vampiric_blood_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 742784a56f6..9df1517cfbf 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -50,7 +50,7 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader uint32 limit; - bool Load() OVERRIDE + bool Load() override { // Max absorb stored in 1 dummy effect limit = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); @@ -62,13 +62,13 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader absorbAmount = std::min(limit, absorbAmount); } - void Register() OVERRIDE + void Register() override { OnEffectAbsorb += AuraEffectAbsorbFn(spell_gen_absorb0_hitlimit1_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_absorb0_hitlimit1_AuraScript(); } @@ -93,7 +93,7 @@ class spell_gen_adaptive_warding : public SpellScriptLoader { PrepareAuraScript(spell_gen_adaptive_warding_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_FIRE) || !sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_NATURE) || @@ -152,14 +152,14 @@ class spell_gen_adaptive_warding : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_gen_adaptive_warding_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_adaptive_warding_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_adaptive_warding_AuraScript(); } @@ -181,7 +181,7 @@ class spell_gen_alchemist_stone : public SpellScriptLoader { PrepareAuraScript(spell_gen_alchemist_stone_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(ALECHEMIST_STONE_HEAL) || !sSpellMgr->GetSpellInfo(ALECHEMIST_STONE_MANA)) @@ -213,14 +213,14 @@ class spell_gen_alchemist_stone : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_gen_alchemist_stone_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_alchemist_stone_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_alchemist_stone_AuraScript(); } @@ -242,13 +242,13 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_allow_cast_from_item_only_SpellScript(); } @@ -269,7 +269,7 @@ class spell_gen_animal_blood : public SpellScriptLoader { PrepareAuraScript(spell_gen_animal_blood_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SPAWN_BLOOD_POOL)) return false; @@ -290,14 +290,14 @@ class spell_gen_animal_blood : public SpellScriptLoader owner->CastSpell(owner, SPELL_SPAWN_BLOOD_POOL, true); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_animal_blood_AuraScript(); } @@ -320,13 +320,13 @@ class spell_gen_aura_of_anger : public SpellScriptLoader aurEff->SetAmount(100 * aurEff->GetTickNumber()); } - void Register() OVERRIDE + void Register() override { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_aura_of_anger_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_aura_of_anger_AuraScript(); } @@ -351,7 +351,7 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader { PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SERVICE_UNIFORM)) return false; @@ -378,14 +378,14 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader target->RestoreDisplayId(); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_aura_service_uniform_AuraScript(); } @@ -422,13 +422,13 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_gen_av_drekthar_presence_AuraScript::CheckAreaTarget); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_av_drekthar_presence_AuraScript(); } @@ -448,7 +448,7 @@ class spell_gen_bandage : public SpellScriptLoader { PrepareSpellScript(spell_gen_bandage_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RECENTLY_BANDAGED)) return false; @@ -471,14 +471,14 @@ class spell_gen_bandage : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_RECENTLY_BANDAGED, true); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_bandage_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_gen_bandage_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_bandage_SpellScript(); } @@ -519,13 +519,13 @@ class spell_gen_bonked : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_bonked_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_bonked_SpellScript(); } @@ -628,13 +628,13 @@ class spell_gen_break_shield: public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_break_shield_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_break_shield_SpellScript(); } @@ -656,13 +656,13 @@ class spell_gen_burn_brutallus : public SpellScriptLoader aurEff->SetAmount(aurEff->GetAmount() * 2); } - void Register() OVERRIDE + void Register() override { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_burn_brutallus_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_burn_brutallus_AuraScript(); } @@ -682,7 +682,7 @@ class spell_gen_cannibalize : public SpellScriptLoader { PrepareSpellScript(spell_gen_cannibalize_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CANNIBALIZE_TRIGGERED)) return false; @@ -708,14 +708,14 @@ class spell_gen_cannibalize : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_CANNIBALIZE_TRIGGERED, false); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_gen_cannibalize_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_gen_cannibalize_SpellScript::CheckIfCorpseNear); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_cannibalize_SpellScript(); } @@ -735,7 +735,7 @@ class spell_gen_chaos_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_chaos_blast_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CHAOS_BLAST)) return false; @@ -749,13 +749,13 @@ class spell_gen_chaos_blast : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_CHAOS_BLAST, &basepoints0, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_chaos_blast_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_chaos_blast_SpellScript(); } @@ -781,7 +781,7 @@ class spell_gen_clone : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { if (m_scriptSpellId == SPELL_NIGHTMARE_FIGMENT_MIRROR_IMAGE) { @@ -796,7 +796,7 @@ class spell_gen_clone : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_clone_SpellScript(); } @@ -832,13 +832,13 @@ class spell_gen_clone_weapon : public SpellScriptLoader caster->CastSpell(target, GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_clone_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_clone_weapon_SpellScript(); } @@ -855,7 +855,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader uint32 prevItem; - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_2_AURA) || @@ -946,14 +946,14 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_clone_weapon_auraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_clone_weapon_auraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_clone_weapon_auraScript(); } @@ -979,7 +979,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(_damagePct)); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); } @@ -988,7 +988,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader int32 _damagePct; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_count_pct_from_max_hp_SpellScript(_damagePct); } @@ -1013,7 +1013,7 @@ class spell_gen_create_lance : public SpellScriptLoader { PrepareSpellScript(spell_gen_create_lance_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_ALLIANCE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_HORDE)) @@ -1034,13 +1034,13 @@ class spell_gen_create_lance : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_create_lance_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_create_lance_SpellScript(); } @@ -1065,13 +1065,13 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader target->ToCreature()->SetReactState(REACT_PASSIVE); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_creature_permanent_feign_death_AuraScript(); } @@ -1097,7 +1097,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader { PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { switch (spellInfo->Id) { @@ -1139,13 +1139,13 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_dalaran_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_dalaran_disguise_SpellScript(); } @@ -1167,7 +1167,7 @@ class spell_gen_defend : public SpellScriptLoader { PrepareAuraScript(spell_gen_defend_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_VISUAL_SHIELD_1)) return false; @@ -1207,7 +1207,7 @@ class spell_gen_defend : public SpellScriptLoader rider->RemoveAurasDueToSpell(GetId()); } - void Register() OVERRIDE + void Register() override { SpellInfo const* spell = sSpellMgr->GetSpellInfo(m_scriptSpellId); @@ -1231,7 +1231,7 @@ class spell_gen_defend : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_defend_AuraScript(); } @@ -1246,7 +1246,7 @@ class spell_gen_despawn_self : public SpellScriptLoader { PrepareSpellScript(spell_gen_despawn_self_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1257,13 +1257,13 @@ class spell_gen_despawn_self : public SpellScriptLoader GetCaster()->ToCreature()->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_despawn_self_SpellScript(); } @@ -1284,12 +1284,12 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader { PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DIVINE_STORM)) return false; @@ -1303,13 +1303,13 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_divine_storm_cd_reset_SpellScript(); } @@ -1340,13 +1340,13 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_ds_flush_knockback_SpellScript(); } @@ -1367,7 +1367,7 @@ class spell_gen_dummy_trigger : public SpellScriptLoader { PrepareSpellScript(spell_gen_dummy_trigger_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD)) @@ -1385,13 +1385,13 @@ class spell_gen_dummy_trigger : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_PERSISTANT_SHIELD_TRIGGERED, &damage, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_dummy_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_dummy_trigger_SpellScript(); } @@ -1406,7 +1406,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader { PrepareSpellScript(spell_gen_dungeon_credit_SpellScript); - bool Load() OVERRIDE + bool Load() override { _handled = false; return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; @@ -1424,7 +1424,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader instance->UpdateEncounterState(EncounterCreditType::ENCOUNTER_CREDIT_CAST_SPELL, GetSpellInfo()->Id, caster); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_gen_dungeon_credit_SpellScript::CreditEncounter); } @@ -1433,7 +1433,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader bool _handled; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_dungeon_credit_SpellScript(); } @@ -1460,7 +1460,7 @@ class spell_gen_elune_candle : public SpellScriptLoader class spell_gen_elune_candle_SpellScript : public SpellScript { PrepareSpellScript(spell_gen_elune_candle_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_HEAD) || !sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_CHEST) || @@ -1499,13 +1499,13 @@ class spell_gen_elune_candle : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_elune_candle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_elune_candle_SpellScript(); } @@ -1527,7 +1527,7 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader { PrepareSpellScript(spell_gen_gadgetzan_transporter_backfire_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_MALFUNCTION_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_EVIL_TWIN) || @@ -1548,13 +1548,13 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader caster->CastSpell(caster, SPELL_TRANSPORTER_MALFUNCTION_MISS, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_gadgetzan_transporter_backfire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_gadgetzan_transporter_backfire_SpellScript(); } @@ -1601,13 +1601,13 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader amount += int32(std::max(healTick, 0)); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_gift_of_naaru_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_gift_of_naaru_AuraScript(); } @@ -1628,7 +1628,7 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader { PrepareSpellScript(spell_gen_gnomish_transporter_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_FAILURE)) @@ -1641,13 +1641,13 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), roll_chance_i(50) ? SPELL_TRANSPORTER_SUCCESS : SPELL_TRANSPORTER_FAILURE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_gnomish_transporter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_gnomish_transporter_SpellScript(); } @@ -1662,7 +1662,7 @@ class spell_gen_gunship_portal : public SpellScriptLoader { PrepareSpellScript(spell_gen_gunship_portal_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -1675,13 +1675,13 @@ class spell_gen_gunship_portal : public SpellScriptLoader bg->DoAction(1, caster->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_gunship_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_gunship_portal_SpellScript(); } @@ -1704,7 +1704,7 @@ class spell_gen_interrupt : public SpellScriptLoader { PrepareAuraScript(spell_gen_interrupt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_THROW_INTERRUPT)) return false; @@ -1717,13 +1717,13 @@ class spell_gen_interrupt : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_GEN_THROW_INTERRUPT, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_gen_interrupt_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_interrupt_AuraScript(); } @@ -1768,14 +1768,14 @@ class spell_gen_launch : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_launch_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_FORCE_CAST); AfterHit += SpellHitFn(spell_gen_launch_SpellScript::Launch); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_launch_SpellScript(); } @@ -1798,13 +1798,13 @@ class spell_gen_increase_stats_buff : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), GetEffectValue(), true); // single-target buff } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_increase_stats_buff_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_increase_stats_buff_SpellScript(); } @@ -1831,7 +1831,7 @@ class spell_gen_lifebloom : public SpellScriptLoader public: spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -1848,7 +1848,7 @@ class spell_gen_lifebloom : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _spellId, true, NULL, aurEff, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } @@ -1857,7 +1857,7 @@ class spell_gen_lifebloom : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_lifebloom_AuraScript(_spellId); } @@ -2011,7 +2011,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, false); } - void Register() OVERRIDE + void Register() override { SpellInfo const* spell = sSpellMgr->GetSpellInfo(m_scriptSpellId); @@ -2023,7 +2023,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_mounted_charge_SpellScript(); } @@ -2044,7 +2044,7 @@ class spell_gen_netherbloom : public SpellScriptLoader { PrepareSpellScript(spell_gen_netherbloom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < 5; ++i) if (!sSpellMgr->GetSpellInfo(SPELL_NETHERBLOOM_POLLEN_1 + i)) @@ -2075,13 +2075,13 @@ class spell_gen_netherbloom : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_netherbloom_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_netherbloom_SpellScript(); } @@ -2102,7 +2102,7 @@ class spell_gen_nightmare_vine : public SpellScriptLoader { PrepareSpellScript(spell_gen_nightmare_vine_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NIGHTMARE_POLLEN)) return false; @@ -2121,13 +2121,13 @@ class spell_gen_nightmare_vine : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_nightmare_vine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_nightmare_vine_SpellScript(); } @@ -2153,7 +2153,7 @@ class spell_gen_obsidian_armor : public SpellScriptLoader { PrepareAuraScript(spell_gen_obsidian_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_HOLY) || !sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_FIRE) || @@ -2207,14 +2207,14 @@ class spell_gen_obsidian_armor : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_gen_obsidian_armor_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_obsidian_armor_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_obsidian_armor_AuraScript(); } @@ -2326,7 +2326,7 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader uint32 _pennantSpellId; - bool Load() OVERRIDE + bool Load() override { _pennantSpellId = 0; return GetCaster() && GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; @@ -2460,14 +2460,14 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_gen_on_tournament_mount_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_on_tournament_mount_AuraScript::HandleRemoveEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_on_tournament_mount_AuraScript(); } @@ -2482,7 +2482,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader { PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -2506,13 +2506,13 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader // EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_gen_oracle_wolvar_reputation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_oracle_wolvar_reputation_SpellScript(); } @@ -2534,7 +2534,7 @@ class spell_gen_orc_disguise : public SpellScriptLoader { PrepareSpellScript(spell_gen_orc_disguise_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_MALE) || @@ -2556,13 +2556,13 @@ class spell_gen_orc_disguise : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_orc_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_orc_disguise_SpellScript(); } @@ -2584,7 +2584,7 @@ class spell_gen_parachute : public SpellScriptLoader { PrepareAuraScript(spell_gen_parachute_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PARACHUTE) || !sSpellMgr->GetSpellInfo(SPELL_PARACHUTE_BUFF)) @@ -2602,13 +2602,13 @@ class spell_gen_parachute : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_parachute_AuraScript(); } @@ -2635,13 +2635,13 @@ class spell_gen_parachute_ic : public SpellScriptLoader target->CastSpell(target, SPELL_PARACHUTE_IC, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_ic_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_parachute_ic_AuraScript(); } @@ -2663,7 +2663,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader { PrepareSpellScript(spell_gen_pet_summoned_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -2701,13 +2701,13 @@ class spell_gen_pet_summoned : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_pet_summoned_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_pet_summoned_SpellScript(); } @@ -2722,7 +2722,7 @@ class spell_gen_profession_research : public SpellScriptLoader { PrepareSpellScript(spell_gen_profession_research_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -2750,14 +2750,14 @@ class spell_gen_profession_research : public SpellScriptLoader caster->UpdateCraftSkill(spellId); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_profession_research_SpellScript::CheckRequirement); OnEffectHitTarget += SpellEffectFn(spell_gen_profession_research_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_profession_research_SpellScript(); } @@ -2781,13 +2781,13 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_remove_flight_auras_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_remove_flight_auras_SpellScript(); } @@ -2809,7 +2809,7 @@ class spell_gen_running_wild : public SpellScriptLoader { PrepareAuraScript(spell_gen_running_wild_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(RUNNING_WILD_MODEL_MALE)) return false; @@ -2830,7 +2830,7 @@ class spell_gen_running_wild : public SpellScriptLoader target->CastSpell(target, mountCapability->SpeedModSpell, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_running_wild_AuraScript::HandleMount, EFFECT_1, SPELL_AURA_MOUNTED, AURA_EFFECT_HANDLE_REAL); } @@ -2840,14 +2840,14 @@ class spell_gen_running_wild : public SpellScriptLoader { PrepareSpellScript(spell_gen_running_wild_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ALTERED_FORM)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { // Definitely not a good thing, but currently the only way to do something at cast start // Should be replaced as soon as possible with a new hook: BeforeCastStart @@ -2855,17 +2855,17 @@ class spell_gen_running_wild : public SpellScriptLoader return false; } - void Register() OVERRIDE + void Register() override { } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_running_wild_AuraScript(); } - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_running_wild_SpellScript(); } @@ -2908,14 +2908,14 @@ class spell_gen_two_forms : public SpellScriptLoader target->CastCustomSpell(SPELL_ALTERED_FORM, SPELLVALUE_BASE_POINT0, 1, target, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_two_forms_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_gen_two_forms_SpellScript::HandleTransform, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_two_forms_SpellScript(); } @@ -2935,13 +2935,13 @@ class spell_gen_darkflight : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_ALTERED_FORM, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_gen_darkflight_SpellScript::TriggerTransform); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_darkflight_SpellScript(); } @@ -2970,13 +2970,13 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_spectator_cheer_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_spectator_cheer_trigger_SpellScript(); } @@ -2991,7 +2991,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader { PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -3026,13 +3026,13 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_spirit_healer_res_SpellScript(); } @@ -3056,7 +3056,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader public: spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -3078,7 +3078,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_gen_summon_elemental_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_summon_elemental_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -3088,7 +3088,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_summon_elemental_AuraScript(_spellId); } @@ -3111,7 +3111,7 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader { PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LANCE_EQUIPPED)) return false; @@ -3132,13 +3132,13 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_summon_tournament_mount_SpellScript::CheckIfLanceEquiped); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_summon_tournament_mount_SpellScript(); } @@ -3160,7 +3160,7 @@ class spell_gen_tournament_duel : public SpellScriptLoader { PrepareSpellScript(spell_gen_tournament_duel_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ON_TOURNAMENT_MOUNT) || !sSpellMgr->GetSpellInfo(SPELL_MOUNTED_DUEL)) @@ -3185,13 +3185,13 @@ class spell_gen_tournament_duel : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_tournament_duel_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_tournament_duel_SpellScript(); } @@ -3206,7 +3206,7 @@ class spell_gen_tournament_pennant : public SpellScriptLoader { PrepareAuraScript(spell_gen_tournament_pennant_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -3218,13 +3218,13 @@ class spell_gen_tournament_pennant : public SpellScriptLoader caster->RemoveAurasDueToSpell(GetId()); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_tournament_pennant_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_tournament_pennant_AuraScript(); } @@ -3247,12 +3247,12 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader { PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER_WOTF)) @@ -3267,13 +3267,13 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader GetCaster()->ToPlayer()->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell()); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_pvp_trinket_wotf_shared_cd_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pvp_trinket_wotf_shared_cd_SpellScript(); } @@ -3314,7 +3314,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader ModStackAmount(-1, AURA_REMOVE_BY_EXPIRE); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_gen_turkey_marker_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_turkey_marker_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); @@ -3323,7 +3323,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader std::list _applyTimes; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_turkey_marker_AuraScript(); } @@ -3363,13 +3363,13 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_upper_deck_create_foam_sword_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_upper_deck_create_foam_sword_SpellScript(); } @@ -3389,7 +3389,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader { PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -3420,7 +3420,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader amount = uint16((avgILvl - baseItemLevel) * factor); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); @@ -3428,7 +3428,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_vehicle_scaling_AuraScript(); } @@ -3456,13 +3456,13 @@ class spell_gen_vendor_bark_trigger : public SpellScriptLoader vendor->AI()->Talk(SAY_AMPHITHEATER_VENDOR); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_vendor_bark_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_vendor_bark_trigger_SpellScript(); } @@ -3484,13 +3484,13 @@ class spell_gen_wg_water : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_wg_water_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_wg_water_SpellScript(); } @@ -3510,7 +3510,7 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader { PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_YOGG_SARON_WHISPER_DUMMY)) return false; @@ -3523,13 +3523,13 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_YOGG_SARON_WHISPER_DUMMY, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 4d9c355cd83..3739032f84c 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -101,14 +101,14 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader target->RemoveAura(SPELL_ROMANTIC_PICNIC_ACHIEV); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_love_is_in_the_air_romantic_picnic_AuraScript(); } @@ -138,7 +138,7 @@ class spell_hallow_end_trick : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_trick_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_FEMALE) @@ -179,13 +179,13 @@ class spell_hallow_end_trick : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hallow_end_trick_SpellScript(); } @@ -211,7 +211,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRICK) || !sSpellMgr->GetSpellInfo(SPELL_TREAT) || !sSpellMgr->GetSpellInfo(SPELL_TRICKED_OR_TREATED)) return false; @@ -228,13 +228,13 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hallow_end_trick_or_treat_SpellScript(); } @@ -249,7 +249,7 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRICKY_TREAT_SPEED)) return false; @@ -267,13 +267,13 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader caster->CastSpell(caster, SPELL_UPSET_TUMMY, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hallow_end_tricky_treat_SpellScript(); } @@ -295,7 +295,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_MISTLETOE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_HOLLY) || @@ -313,13 +313,13 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_winter_veil_mistletoe_SpellScript(); } @@ -343,7 +343,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_1) || !sSpellMgr->GetSpellInfo(SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_2) || @@ -375,13 +375,13 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_winter_veil_px_238_winter_wondervolt_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 62bfae94557..5d0fa1df7ae 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -70,7 +70,7 @@ class spell_hun_a_murder_of_crows : public SpellScriptLoader { PrepareAuraScript(spell_hun_a_murder_of_crows_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_A_MURDER_OF_CROWS)) return false; @@ -93,13 +93,13 @@ class spell_hun_a_murder_of_crows : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_hun_a_murder_of_crows_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_a_murder_of_crows_AuraScript(); } @@ -115,7 +115,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_chimera_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_HEAL) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SERPENT_STING)) @@ -123,7 +123,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -136,13 +136,13 @@ class spell_hun_chimera_shot : public SpellScriptLoader aur->SetDuration(aur->GetSpellInfo()->GetMaxDuration(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_chimera_shot_SpellScript(); } @@ -158,7 +158,7 @@ class spell_hun_cobra_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_cobra_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_GENERIC_ENERGIZE_FOCUS) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SERPENT_STING)) @@ -166,7 +166,7 @@ class spell_hun_cobra_shot : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -182,13 +182,13 @@ class spell_hun_cobra_shot : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_cobra_shot_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_cobra_shot_SpellScript(); } @@ -218,13 +218,13 @@ class spell_hun_fire : public SpellScriptLoader spellMod->value = -(float)aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_hun_fire_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_fire_AuraScript(); } @@ -254,13 +254,13 @@ class spell_hun_improved_serpent_sting : public SpellScriptLoader spellMod->value = (float)aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_hun_improved_serpent_sting_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_improved_serpent_sting_AuraScript(); } @@ -276,7 +276,7 @@ class spell_hun_invigoration : public SpellScriptLoader { PrepareSpellScript(spell_hun_invigoration_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_INVIGORATION_TRIGGERED)) return false; @@ -291,13 +291,13 @@ class spell_hun_invigoration : public SpellScriptLoader unitTarget->CastSpell(unitTarget, SPELL_HUNTER_INVIGORATION_TRIGGERED, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_invigoration_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_invigoration_SpellScript(); } @@ -313,7 +313,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader { PrepareSpellScript(spell_hun_last_stand_pet_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_LAST_STAND_TRIGGERED)) return false; @@ -327,13 +327,13 @@ class spell_hun_last_stand_pet : public SpellScriptLoader caster->CastCustomSpell(caster, SPELL_HUNTER_PET_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_last_stand_pet_SpellScript(); } @@ -349,7 +349,7 @@ class spell_hun_masters_call : public SpellScriptLoader { PrepareSpellScript(spell_hun_masters_call_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MASTERS_CALL_TRIGGERED) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue())) @@ -378,14 +378,14 @@ class spell_hun_masters_call : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_masters_call_SpellScript(); } @@ -401,7 +401,7 @@ class spell_hun_misdirection : public SpellScriptLoader { PrepareAuraScript(spell_hun_misdirection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MISDIRECTION_PROC)) return false; @@ -425,7 +425,7 @@ class spell_hun_misdirection : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); DoCheckProc += AuraCheckProcFn(spell_hun_misdirection_AuraScript::CheckProc); @@ -433,7 +433,7 @@ class spell_hun_misdirection : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_misdirection_AuraScript(); } @@ -454,13 +454,13 @@ class spell_hun_misdirection_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_misdirection_proc_AuraScript(); } @@ -476,14 +476,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED)) return false; @@ -510,14 +510,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader caster->CastSpell(caster, SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED, false); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_pet_carrion_feeder_SpellScript(); } @@ -533,14 +533,14 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF)) return false; @@ -558,13 +558,13 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_pet_heart_of_the_phoenix_SpellScript(); } @@ -580,7 +580,7 @@ class spell_hun_ready_set_aim : public SpellScriptLoader { PrepareAuraScript(spell_hun_ready_set_aim_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_FIRE)) return false; @@ -596,13 +596,13 @@ class spell_hun_ready_set_aim : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_hun_ready_set_aim_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_ready_set_aim_AuraScript(); } @@ -618,7 +618,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_scatter_shot_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -632,13 +632,13 @@ class spell_hun_scatter_shot : public SpellScriptLoader caster->SendAttackSwingCancelAttack(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_scatter_shot_SpellScript(); } @@ -654,14 +654,14 @@ class spell_hun_steady_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_steady_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_STEADY_SHOT_FOCUS)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -671,13 +671,13 @@ class spell_hun_steady_shot : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_HUNTER_STEADY_SHOT_FOCUS, true); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_hun_steady_shot_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_steady_shot_SpellScript(); } @@ -723,13 +723,13 @@ class spell_hun_tame_beast : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_tame_beast_SpellScript(); } @@ -745,7 +745,7 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader { PrepareAuraScript(spell_hun_thrill_of_the_hunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_THRILL_OF_THE_HUNT)) return false; @@ -761,13 +761,13 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader //GetTarget()->CastCustomSpell(GetTarget(), SPELL_HUNTER_THRILL_OF_THE_HUNT, &focus, NULL, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_thrill_of_the_hunt_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 1cdf9a1d6a9..f994bb7b420 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -49,7 +49,7 @@ class spell_item_trigger_spell : public SpellScriptLoader public: spell_item_trigger_spell_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(_triggeredSpellId)) return false; @@ -63,13 +63,13 @@ class spell_item_trigger_spell : public SpellScriptLoader caster->CastSpell(caster, _triggeredSpellId, true, item); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_trigger_spell_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_trigger_spell_SpellScript(_triggeredSpellId); } @@ -90,7 +90,7 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader { PrepareAuraScript(spell_item_aegis_of_preservation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_AEGIS_HEAL)) return false; @@ -103,13 +103,13 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_AEGIS_HEAL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_item_aegis_of_preservation_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_aegis_of_preservation_AuraScript(); } @@ -132,13 +132,13 @@ class spell_item_arcane_shroud : public SpellScriptLoader amount += 2 * diff; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_arcane_shroud_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_arcane_shroud_AuraScript(); } @@ -159,7 +159,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader { PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PROTECTION_OF_ANCIENT_KINGS)) return false; @@ -188,14 +188,14 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PROTECTION_OF_ANCIENT_KINGS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_item_blessing_of_ancient_kings_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_blessing_of_ancient_kings_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_blessing_of_ancient_kings_AuraScript(); } @@ -222,7 +222,7 @@ class spell_item_defibrillate : public SpellScriptLoader public: spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (_failSpell && !sSpellMgr->GetSpellInfo(_failSpell)) return false; @@ -239,7 +239,7 @@ class spell_item_defibrillate : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); } @@ -249,7 +249,7 @@ class spell_item_defibrillate : public SpellScriptLoader uint32 _failSpell; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_defibrillate_SpellScript(_chance, _failSpell); } @@ -274,7 +274,7 @@ class spell_item_desperate_defense : public SpellScriptLoader { PrepareAuraScript(spell_item_desperate_defense_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DESPERATE_RAGE)) return false; @@ -287,13 +287,13 @@ class spell_item_desperate_defense : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_DESPERATE_RAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_item_desperate_defense_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_desperate_defense_AuraScript(); } @@ -319,12 +319,12 @@ class spell_item_deviate_fish : public SpellScriptLoader { PrepareSpellScript(spell_item_deviate_fish_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint32 spellId = SPELL_SLEEPY; spellId <= SPELL_HEALTHY_SPIRIT; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -339,13 +339,13 @@ class spell_item_deviate_fish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_deviate_fish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_deviate_fish_SpellScript(); } @@ -369,7 +369,7 @@ class spell_item_flask_of_the_north : public SpellScriptLoader { PrepareSpellScript(spell_item_flask_of_the_north_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_SP) || !sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_AP) || !sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_STR)) return false; @@ -409,13 +409,13 @@ class spell_item_flask_of_the_north : public SpellScriptLoader caster->CastSpell(caster, possibleSpells[irand(0, (possibleSpells.size() - 1))], true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_flask_of_the_north_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_flask_of_the_north_SpellScript(); } @@ -438,7 +438,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader { PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_SELF) || !sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_TARGET)) return false; @@ -457,13 +457,13 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_gnomish_death_ray_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_gnomish_death_ray_SpellScript(); } @@ -489,12 +489,12 @@ class spell_item_make_a_wish : public SpellScriptLoader { PrepareSpellScript(spell_item_make_a_wish_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MR_PINCHYS_BLESSING) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_MIGHTY_MR_PINCHY) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_FURIOUS_MR_PINCHY) || !sSpellMgr->GetSpellInfo(SPELL_TINY_MAGICAL_CRAWDAD) || !sSpellMgr->GetSpellInfo(SPELL_MR_PINCHYS_GIFT)) return false; @@ -515,13 +515,13 @@ class spell_item_make_a_wish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_make_a_wish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_make_a_wish_SpellScript(); } @@ -571,13 +571,13 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader CreateItem(effIndex, newitemid); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_mingos_fortune_generator_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_mingos_fortune_generator_SpellScript(); } @@ -598,7 +598,7 @@ class spell_item_necrotic_touch : public SpellScriptLoader { PrepareAuraScript(spell_item_necrotic_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ITEM_NECROTIC_TOUCH_PROC)) return false; @@ -617,14 +617,14 @@ class spell_item_necrotic_touch : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ITEM_NECROTIC_TOUCH_PROC, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_item_necrotic_touch_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_necrotic_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_necrotic_touch_AuraScript(); } @@ -648,7 +648,7 @@ class spell_item_net_o_matic : public SpellScriptLoader { PrepareSpellScript(spell_item_net_o_matic_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED3)) return false; @@ -670,13 +670,13 @@ class spell_item_net_o_matic : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_net_o_matic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_net_o_matic_SpellScript(); } @@ -700,12 +700,12 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED3)) return false; @@ -725,13 +725,13 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_noggenfogger_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_noggenfogger_elixir_SpellScript(); } @@ -754,13 +754,13 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader target->HandleEmoteCommand(EMOTE_STATE_DANCE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_piccolo_of_the_flaming_fire_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_piccolo_of_the_flaming_fire_SpellScript(); } @@ -785,12 +785,12 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader { PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint32 spellId = SPELL_FLIP_OUT_MALE; spellId <= SPELL_YAAARRRR_FEMALE; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -812,13 +812,13 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_savory_deviate_delight_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_savory_deviate_delight_SpellScript(); } @@ -846,7 +846,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader { PrepareSpellScript(spell_item_scroll_of_recall_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -885,13 +885,13 @@ class spell_item_scroll_of_recall : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_scroll_of_recall_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_scroll_of_recall_SpellScript(); } @@ -926,13 +926,13 @@ class spell_item_unsated_craving : public SpellScriptLoader return true; } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_item_unsated_craving_AuraScript::CheckProc); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_unsated_craving_AuraScript(); } @@ -957,13 +957,13 @@ class spell_item_shadows_fate : public SpellScriptLoader caster->CastSpell(target, SPELL_SOUL_FEAST, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnProc += AuraProcFn(spell_item_shadows_fate_AuraScript::HandleProc); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_shadows_fate_AuraScript(); } @@ -988,7 +988,7 @@ class spell_item_shadowmourne : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_DAMAGE)) return false; @@ -1022,14 +1022,14 @@ class spell_item_shadowmourne : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_item_shadowmourne_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_shadowmourne_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_shadowmourne_AuraScript(); } @@ -1045,7 +1045,7 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_VISUAL_LOW) || !sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_VISUAL_HIGH) || !sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_BUFF)) return false; @@ -1080,14 +1080,14 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_SHADOWMOURNE_VISUAL_HIGH); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_STAT, AuraEffectHandleModes(AURA_EFFECT_HANDLE_REAL | AURA_EFFECT_HANDLE_REAPPLY)); AfterEffectRemove += AuraEffectRemoveFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_shadowmourne_soul_fragment_AuraScript(); } @@ -1114,7 +1114,7 @@ class spell_item_six_demon_bag : public SpellScriptLoader { PrepareSpellScript(spell_item_six_demon_bag_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FROSTBOLT) || !sSpellMgr->GetSpellInfo(SPELL_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_FELHOUND_MINION) || !sSpellMgr->GetSpellInfo(SPELL_FIREBALL) || !sSpellMgr->GetSpellInfo(SPELL_CHAIN_LIGHTNING) || !sSpellMgr->GetSpellInfo(SPELL_ENVELOPING_WINDS)) return false; @@ -1152,13 +1152,13 @@ class spell_item_six_demon_bag : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_six_demon_bag_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_six_demon_bag_SpellScript(); } @@ -1181,13 +1181,13 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader amount += diff; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_the_eye_of_diminution_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_the_eye_of_diminution_AuraScript(); } @@ -1211,11 +1211,11 @@ class spell_item_underbelly_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_underbelly_elixir_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED3)) return false; @@ -1234,13 +1234,13 @@ class spell_item_underbelly_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_underbelly_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_underbelly_elixir_SpellScript(); } @@ -1262,7 +1262,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader { PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_HOLD_VISUAL) || !sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_SHOOT) || !sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_SHOOT_SELF)) return false; @@ -1286,13 +1286,13 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_red_rider_air_rifle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_red_rider_air_rifle_SpellScript(); } @@ -1337,13 +1337,13 @@ class spell_item_create_heart_candy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_create_heart_candy_SpellScript(); } @@ -1358,7 +1358,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader { PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -1384,14 +1384,14 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader caster->learnSpell(discoveredSpellId, false); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_item_book_of_glyph_mastery_SpellScript::CheckRequirement); OnEffectHitTarget += SpellEffectFn(spell_item_book_of_glyph_mastery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_book_of_glyph_mastery_SpellScript(); } @@ -1425,13 +1425,13 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_item_gift_of_the_harvester_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_gift_of_the_harvester_SpellScript(); } @@ -1465,13 +1465,13 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader return SpellCastResult::SPELL_FAILED_CUSTOM_ERROR; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_item_map_of_the_geyser_fields_SpellScript::CheckSinkholes); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_map_of_the_geyser_fields_SpellScript(); } @@ -1493,7 +1493,7 @@ class spell_item_vanquished_clutches : public SpellScriptLoader { PrepareSpellScript(spell_item_vanquished_clutches_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CRUSHER) || !sSpellMgr->GetSpellInfo(SPELL_CONSTRICTOR) || !sSpellMgr->GetSpellInfo(SPELL_CORRUPTOR)) return false; @@ -1507,13 +1507,13 @@ class spell_item_vanquished_clutches : public SpellScriptLoader caster->CastSpell(caster, spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_vanquished_clutches_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_vanquished_clutches_SpellScript(); } @@ -1544,7 +1544,7 @@ class spell_item_ashbringer : public SpellScriptLoader { PrepareSpellScript(spell_item_ashbringer_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -1562,13 +1562,13 @@ class spell_item_ashbringer : public SpellScriptLoader player->PlayDirectSound(sound_id, player); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_ashbringer_SpellScript::OnDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_ashbringer_SpellScript(); } @@ -1620,13 +1620,13 @@ class spell_magic_eater_food : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_magic_eater_food_AuraScript::HandleTriggerSpell, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_magic_eater_food_AuraScript(); } @@ -1647,13 +1647,13 @@ class spell_item_shimmering_vessel : public SpellScriptLoader target->setDeathState(DeathState::JUST_RESPAWNED); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_shimmering_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_shimmering_vessel_SpellScript(); } @@ -1674,12 +1674,12 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader { PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_PURIFIED_HELBOAR_MEAT) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_TOXIC_HELBOAR_MEAT)) return false; @@ -1692,13 +1692,13 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(50) ? SPELL_SUMMON_PURIFIED_HELBOAR_MEAT : SPELL_SUMMON_TOXIC_HELBOAR_MEAT, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_purify_helboar_meat_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_purify_helboar_meat_SpellScript(); } @@ -1718,7 +1718,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader { PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD)) return false; @@ -1735,13 +1735,13 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_crystal_prison_dummy_dnd_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_crystal_prison_dummy_dnd_SpellScript(); } @@ -1765,7 +1765,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_reindeer_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_310) || !sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_280) || !sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_60) || !sSpellMgr->GetSpellInfo(SPELL_REINDEER_100) @@ -1803,13 +1803,13 @@ class spell_item_reindeer_transformation : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_reindeer_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_reindeer_transformation_SpellScript(); } @@ -1830,7 +1830,7 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader { PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NIGH_INVULNERABILITY) || !sSpellMgr->GetSpellInfo(SPELL_COMPLETE_VULNERABILITY)) return false; @@ -1849,13 +1849,13 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_nigh_invulnerability_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_nigh_invulnerability_SpellScript(); } @@ -1876,7 +1876,7 @@ class spell_item_poultryizer : public SpellScriptLoader { PrepareSpellScript(spell_item_poultryizer_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_BACKFIRE)) return false; @@ -1889,13 +1889,13 @@ class spell_item_poultryizer : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), roll_chance_i(80) ? SPELL_POULTRYIZER_SUCCESS : SPELL_POULTRYIZER_BACKFIRE, true, GetCastItem()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_poultryizer_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_poultryizer_SpellScript(); } @@ -1916,11 +1916,11 @@ class spell_item_socrethars_stone : public SpellScriptLoader { PrepareSpellScript(spell_item_socrethars_stone_SpellScript); - bool Load() OVERRIDE + bool Load() override { return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742); } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_TO_SEAT) || !sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_FROM_SEAT)) return false; @@ -1943,13 +1943,13 @@ class spell_item_socrethars_stone : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_socrethars_stone_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_socrethars_stone_SpellScript(); } @@ -1971,14 +1971,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader { PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_DEMON_BROILED_SURPRISE) || !sObjectMgr->GetCreatureTemplate(NPC_ABYSSAL_FLAMEBRINGER) || !sObjectMgr->GetQuestTemplate(QUEST_SUPER_HOT_STEW)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -2001,14 +2001,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader return SpellCastResult::SPELL_FAILED_NOT_HERE; } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_demon_broiled_surprise_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_item_demon_broiled_surprise_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_demon_broiled_surprise_SpellScript(); } @@ -2028,7 +2028,7 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader { PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RAPTOR_CAPTURE_CREDIT)) return false; @@ -2047,13 +2047,13 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_complete_raptor_capture_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_complete_raptor_capture_SpellScript(); } @@ -2074,7 +2074,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader { PrepareSpellScript(spell_item_impale_leviroth_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_LEVIROTH)) return false; @@ -2088,13 +2088,13 @@ class spell_item_impale_leviroth : public SpellScriptLoader target->CastSpell(target, SPELL_LEVIROTH_SELF_IMPALE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_impale_leviroth_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_impale_leviroth_SpellScript(); } @@ -2119,7 +2119,7 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MOUNT_RAM_100) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_RAM_60) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_KODO_100) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_KODO_60)) return false; @@ -2155,13 +2155,13 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_brewfest_mount_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_brewfest_mount_transformation_SpellScript(); } @@ -2182,14 +2182,14 @@ class spell_item_nitro_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_nitro_boots_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCastItem()) return false; return true; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_BACKFIRE)) return false; @@ -2202,13 +2202,13 @@ class spell_item_nitro_boots : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(95) ? SPELL_NITRO_BOOTS_SUCCESS : SPELL_NITRO_BOOTS_BACKFIRE, true, GetCastItem()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_nitro_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_nitro_boots_SpellScript(); } @@ -2229,12 +2229,12 @@ class spell_item_teach_language : public SpellScriptLoader { PrepareSpellScript(spell_item_teach_language_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LEARN_GNOMISH_BINARY) || !sSpellMgr->GetSpellInfo(SPELL_LEARN_GOBLIN_BINARY)) return false; @@ -2249,13 +2249,13 @@ class spell_item_teach_language : public SpellScriptLoader caster->CastSpell(caster, caster->GetTeam() == ALLIANCE ? SPELL_LEARN_GNOMISH_BINARY : SPELL_LEARN_GOBLIN_BINARY, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_teach_language_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_teach_language_SpellScript(); } @@ -2275,12 +2275,12 @@ class spell_item_rocket_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_rocket_boots_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROCKET_BOOTS_PROC)) return false; @@ -2304,14 +2304,14 @@ class spell_item_rocket_boots : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_item_rocket_boots_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_rocket_boots_SpellScript(); } @@ -2332,7 +2332,7 @@ class spell_item_pygmy_oil : public SpellScriptLoader { PrepareSpellScript(spell_item_pygmy_oil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_PYGMY_AURA) || !sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_SMALLER_AURA)) return false; @@ -2357,13 +2357,13 @@ class spell_item_pygmy_oil : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_pygmy_oil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_pygmy_oil_SpellScript(); } @@ -2384,13 +2384,13 @@ class spell_item_unusual_compass : public SpellScriptLoader caster->SetFacingTo(frand(0.0f, 2.0f * M_PI)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_unusual_compass_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_unusual_compass_SpellScript(); } @@ -2413,12 +2413,12 @@ class spell_item_chicken_cover : public SpellScriptLoader { PrepareSpellScript(spell_item_chicken_cover_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CHICKEN_NET) || !sSpellMgr->GetSpellInfo(SPELL_CAPTURE_CHICKEN_ESCAPE) || !sObjectMgr->GetQuestTemplate(QUEST_CHICKEN_PARTY) || !sObjectMgr->GetQuestTemplate(QUEST_FLOWN_THE_COOP)) return false; @@ -2438,13 +2438,13 @@ class spell_item_chicken_cover : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_chicken_cover_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_chicken_cover_SpellScript(); } @@ -2466,13 +2466,13 @@ class spell_item_muisek_vessel : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_muisek_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_muisek_vessel_SpellScript(); } @@ -2497,13 +2497,13 @@ class spell_item_greatmothers_soulcatcher : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_FORCE_CAST_SUMMON_GNOME_SOUL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_greatmothers_soulcatcher_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 0c73e8c767d..2f02c63aa4c 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -85,7 +85,7 @@ class spell_mage_frostjaw : public SpellScriptLoader { PrepareSpellScript(spell_mage_frostjaw_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROSTJAW)) return false; @@ -104,13 +104,13 @@ class spell_mage_frostjaw : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_mage_frostjaw_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_frostjaw_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_mastery.cpp b/src/server/scripts/Spells/spell_mastery.cpp index dadc56e5744..ddae3b7303c 100644 --- a/src/server/scripts/Spells/spell_mastery.cpp +++ b/src/server/scripts/Spells/spell_mastery.cpp @@ -108,13 +108,13 @@ class spell_mastery_unshackled_fury : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mastery_unshackled_fury_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mastery_unshackled_fury_AuraScript(); } @@ -143,13 +143,13 @@ class spell_mastery_shield_discipline : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mastery_shield_discipline_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mastery_shield_discipline_AuraScript(); } @@ -188,13 +188,13 @@ class spell_mastery_combo_breaker : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_mastery_combo_breaker_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mastery_combo_breaker_SpellScript(); } @@ -241,13 +241,13 @@ class spell_mastery_blood_shield : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_mastery_blood_shield_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mastery_blood_shield_SpellScript(); } @@ -293,13 +293,13 @@ class spell_mastery_ignite : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_mastery_ignite_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mastery_ignite_SpellScript(); } @@ -338,13 +338,13 @@ class spell_mastery_hand_of_light : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_mastery_hand_of_light_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mastery_hand_of_light_SpellScript(); } @@ -361,7 +361,7 @@ class spell_mastery_elemental_overload : public SpellScriptLoader { PrepareSpellScript(spell_mastery_elemental_overload_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(403) || !sSpellMgr->GetSpellInfo(421) || !sSpellMgr->GetSpellInfo(51505) || !sSpellMgr->GetSpellInfo(117014)) return false; @@ -435,13 +435,13 @@ class spell_mastery_elemental_overload : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_mastery_elemental_overload_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mastery_elemental_overload_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_monk.cpp b/src/server/scripts/Spells/spell_monk.cpp index 20e2775e13c..88ee371690f 100644 --- a/src/server/scripts/Spells/spell_monk.cpp +++ b/src/server/scripts/Spells/spell_monk.cpp @@ -1331,7 +1331,7 @@ class spell_monk_renewing_mist : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_monk_renewing_mist_AuraScript::OnTick, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_monk_renewing_mist_AuraScript::Update, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); @@ -1339,7 +1339,7 @@ class spell_monk_renewing_mist : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_monk_renewing_mist_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 57dbdef94dd..25a479aed0f 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -65,7 +65,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader { PrepareAuraScript(spell_gen_pet_calculate_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -155,7 +155,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { switch (m_scriptSpellId) { @@ -174,7 +174,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_pet_calculate_AuraScript(); } @@ -189,7 +189,7 @@ class spell_warl_pet_scaling_01 : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_scaling_01_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -298,7 +298,7 @@ class spell_warl_pet_scaling_01 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_warl_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warl_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -311,7 +311,7 @@ class spell_warl_pet_scaling_01 : public SpellScriptLoader uint32 _tempBonus; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_01_AuraScript(); } @@ -326,7 +326,7 @@ class spell_warl_pet_scaling_02 : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -411,7 +411,7 @@ class spell_warl_pet_scaling_02 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_warl_pet_scaling_02_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warl_pet_scaling_02_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -424,7 +424,7 @@ class spell_warl_pet_scaling_02 : public SpellScriptLoader uint32 _tempBonus; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_02_AuraScript(); } @@ -439,7 +439,7 @@ class spell_warl_pet_scaling_03 : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_scaling_03_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -482,7 +482,7 @@ class spell_warl_pet_scaling_03 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03_AuraScript::CalculateFrostResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03_AuraScript::CalculateArcaneResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); @@ -490,7 +490,7 @@ class spell_warl_pet_scaling_03 : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_03_AuraScript(); } @@ -505,7 +505,7 @@ class spell_warl_pet_scaling_04 : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -524,13 +524,13 @@ class spell_warl_pet_scaling_04 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_04_AuraScript(); } @@ -545,7 +545,7 @@ class spell_warl_pet_scaling_05 : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -597,7 +597,7 @@ class spell_warl_pet_scaling_05 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); @@ -605,7 +605,7 @@ class spell_warl_pet_scaling_05 : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_05_AuraScript(); } @@ -620,7 +620,7 @@ class spell_warl_pet_passive : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_passive_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -671,14 +671,14 @@ class spell_warl_pet_passive : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_AuraScript::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_AuraScript::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_passive_AuraScript(); } @@ -693,7 +693,7 @@ class spell_warl_pet_passive_damage_done : public SpellScriptLoader { PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -722,14 +722,14 @@ class spell_warl_pet_passive_damage_done : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_passive_damage_done_AuraScript(); } @@ -744,7 +744,7 @@ class spell_sha_pet_scaling_04 : public SpellScriptLoader { PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -781,14 +781,14 @@ class spell_sha_pet_scaling_04 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_pet_scaling_04_AuraScript(); } @@ -901,7 +901,7 @@ class spell_hun_pet_scaling_01 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_hun_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_hun_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -914,7 +914,7 @@ class spell_hun_pet_scaling_01 : public SpellScriptLoader uint32 _tempHealth; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_01_AuraScript(); } @@ -929,7 +929,7 @@ class spell_hun_pet_scaling_02 : public SpellScriptLoader { PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -993,7 +993,7 @@ class spell_hun_pet_scaling_02 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02_AuraScript::CalculateFrostResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02_AuraScript::CalculateFireResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); @@ -1001,7 +1001,7 @@ class spell_hun_pet_scaling_02 : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_02_AuraScript(); } @@ -1016,7 +1016,7 @@ class spell_hun_pet_scaling_03 : public SpellScriptLoader { PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1080,7 +1080,7 @@ class spell_hun_pet_scaling_03 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03_AuraScript::CalculateArcaneResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); @@ -1088,7 +1088,7 @@ class spell_hun_pet_scaling_03 : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_03_AuraScript(); } @@ -1103,7 +1103,7 @@ class spell_hun_pet_scaling_04 : public SpellScriptLoader { PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1161,7 +1161,7 @@ class spell_hun_pet_scaling_04 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); @@ -1169,7 +1169,7 @@ class spell_hun_pet_scaling_04 : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_04_AuraScript(); } @@ -1184,7 +1184,7 @@ class spell_hun_pet_passive_crit : public SpellScriptLoader { PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1233,14 +1233,14 @@ class spell_hun_pet_passive_crit : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit_AuraScript::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit_AuraScript::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_passive_crit_AuraScript(); } @@ -1255,7 +1255,7 @@ class spell_hun_pet_passive_damage_done : public SpellScriptLoader { PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1274,13 +1274,13 @@ class spell_hun_pet_passive_damage_done : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_passive_damage_done_AuraScript(); } @@ -1295,7 +1295,7 @@ class spell_dk_pet_scaling_01 : public SpellScriptLoader { PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1365,7 +1365,7 @@ class spell_dk_pet_scaling_01 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectRemoveFn(spell_dk_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_dk_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -1377,7 +1377,7 @@ class spell_dk_pet_scaling_01 : public SpellScriptLoader uint32 _tempHealth; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_pet_scaling_01_AuraScript(); } @@ -1392,7 +1392,7 @@ class spell_dk_pet_scaling_02 : public SpellScriptLoader { PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1414,13 +1414,13 @@ class spell_dk_pet_scaling_02 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_pet_scaling_02_AuraScript(); } @@ -1435,7 +1435,7 @@ class spell_dk_pet_scaling_03 : public SpellScriptLoader { PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1476,14 +1476,14 @@ class spell_dk_pet_scaling_03 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_pet_scaling_03_AuraScript(); } @@ -1498,7 +1498,7 @@ class spell_dk_rune_weapon_scaling_02 : public SpellScriptLoader { PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TypeID::TYPEID_PLAYER) return false; @@ -1535,14 +1535,14 @@ class spell_dk_rune_weapon_scaling_02 : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02_AuraScript::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_rune_weapon_scaling_02_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 49fe3ab42af..9530fca4e94 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -78,7 +78,7 @@ class spell_pri_evangelism : public SpellScriptLoader { PrepareAuraScript(spell_pri_evangelism_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_EVANGELISM_PROC)) return false; @@ -95,12 +95,12 @@ class spell_pri_evangelism : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_EVANGELISM_PROC, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_pri_evangelism_AuraScript::HandleEffectStackProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_evangelism_AuraScript(); } @@ -116,7 +116,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader { PrepareAuraScript(spell_pri_divine_aegis_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_AEGIS)) return false; @@ -143,14 +143,14 @@ class spell_pri_divine_aegis : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_DIVINE_AEGIS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_divine_aegis_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_divine_aegis_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_divine_aegis_AuraScript(); } @@ -166,7 +166,7 @@ class spell_pri_item_greater_heal_refund : public SpellScriptLoader { PrepareAuraScript(spell_pri_item_greater_heal_refund_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_ITEM_EFFICIENCY)) return false; @@ -179,13 +179,13 @@ class spell_pri_item_greater_heal_refund : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_PRIEST_ITEM_EFFICIENCY, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_pri_item_greater_heal_refund_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_item_greater_heal_refund_AuraScript(); } @@ -201,7 +201,7 @@ class spell_pri_leap_of_faith : public SpellScriptLoader { PrepareSpellScript(spell_pri_leap_of_faith_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_LEAP_OF_FAITH_EFFECT)) return false; @@ -232,13 +232,13 @@ class spell_pri_leap_of_faith : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pri_leap_of_faith_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_leap_of_faith_SpellScript(); } @@ -264,13 +264,13 @@ class spell_pri_lightwell_renew : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_lightwell_renew_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_lightwell_renew_AuraScript(); } @@ -286,14 +286,14 @@ class spell_pri_mana_leech : public SpellScriptLoader { PrepareAuraScript(spell_pri_mana_leech_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_MANA_LEECH_PROC)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -311,7 +311,7 @@ class spell_pri_mana_leech : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_mana_leech_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -321,7 +321,7 @@ class spell_pri_mana_leech : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_mana_leech_AuraScript(); } @@ -342,13 +342,13 @@ class spell_pri_mind_sear : public SpellScriptLoader unitList.remove_if(Skyfire::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_mind_sear_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_mind_sear_SpellScript(); } @@ -364,12 +364,12 @@ class spell_pri_penance : public SpellScriptLoader { PrepareSpellScript(spell_pri_penance_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { SpellInfo const* firstRankSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PRIEST_PENANCE_R1); if (!firstRankSpellInfo) @@ -414,14 +414,14 @@ class spell_pri_penance : public SpellScriptLoader return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pri_penance_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_pri_penance_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_penance_SpellScript; } @@ -437,7 +437,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader { PrepareAuraScript(spell_pri_power_word_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED)) return false; @@ -501,7 +501,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0); @@ -509,7 +509,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_power_word_shield_AuraScript(); } @@ -538,13 +538,13 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_prayer_of_mending_heal_SpellScript(); } @@ -560,14 +560,14 @@ class spell_pri_renew : public SpellScriptLoader { PrepareAuraScript(spell_pri_renew_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_TOUCH)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -587,13 +587,13 @@ class spell_pri_renew : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_pri_renew_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_renew_AuraScript(); } @@ -615,13 +615,13 @@ class spell_pri_shadow_word_death : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_PRIEST_SHADOW_WORD_DEATH, &damage, 0, 0, true); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_pri_shadow_word_death_SpellScript::HandleDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_shadow_word_death_SpellScript(); } @@ -637,7 +637,7 @@ class spell_pri_shadowform : public SpellScriptLoader { PrepareAuraScript(spell_pri_shadowform_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH)) @@ -655,14 +655,14 @@ class spell_pri_shadowform : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(GetTarget()->HasAura(SPELL_PRIEST_GLYPH_OF_SHADOW) ? SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH : SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_pri_shadowform_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadowform_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_shadowform_AuraScript(); } @@ -678,7 +678,7 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader { PrepareAuraScript(spell_pri_vampiric_embrace_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL)) return false; @@ -700,14 +700,14 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader GetTarget()->CastCustomSpell((Unit*)NULL, SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL, &team, &self, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_embrace_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_embrace_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_vampiric_embrace_AuraScript(); } @@ -728,13 +728,13 @@ class spell_pri_vampiric_embrace_target : public SpellScriptLoader unitList.remove(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_vampiric_embrace_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_vampiric_embrace_target_SpellScript(); } @@ -750,7 +750,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader { PrepareAuraScript(spell_pri_vampiric_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_REPLENISHMENT)) return false; @@ -767,14 +767,14 @@ class spell_pri_vampiric_touch : public SpellScriptLoader eventInfo.GetProcTarget()->CastSpell((Unit*)NULL, SPELL_GEN_REPLENISHMENT, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_touch_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_touch_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_vampiric_touch_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 958cba7eec6..39fe059a2f0 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -63,7 +63,7 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_generic_quest_update_entry_SpellScript::HandleDummy, _effIndex, _spellEffect); } @@ -82,7 +82,7 @@ class spell_q55_sacred_cleansing : public SpellScriptLoader public: spell_q55_sacred_cleansing() : SpellScriptLoader("spell_q55_sacred_cleansing") { } - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_1, NPC_MORBENT, NPC_WEAKENED_MORBENT, true); } @@ -103,7 +103,7 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader { PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_THAUMATURGY_CHANNEL)) return false; @@ -117,13 +117,13 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader caster->CastSpell(caster, SPELL_THAUMATURGY_CHANNEL, false); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q2203_thaumaturgy_channel_AuraScript(); } @@ -146,12 +146,12 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader { PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_RESONATING_SKULL) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_BONE_DUST)) return false; @@ -165,13 +165,13 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q5206_test_fetid_skull_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q5206_test_fetid_skull_SpellScript(); } @@ -198,7 +198,7 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader { PrepareSpellScript(spell_q6124_6129_apply_salve_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -229,13 +229,13 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q6124_6129_apply_salve_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q6124_6129_apply_salve_SpellScript(); } @@ -254,7 +254,7 @@ class spell_q10255_administer_antidote : public SpellScriptLoader public: spell_q10255_administer_antidote() : SpellScriptLoader("spell_q10255_administer_antidote") { } - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_0, NPC_HELBOAR, NPC_DREADTUSK, true); } @@ -290,14 +290,14 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript(); } @@ -313,7 +313,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3) || !sSpellMgr->GetSpellInfo(SPELL_SCOURGING_CRYSTAL_CONTROLLER)) return false; @@ -329,13 +329,13 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_SCOURGING_CRYSTAL_CONTROLLER, true, GetCastItem()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11396_11399_scourging_crystal_controller_SpellScript(); }; @@ -351,7 +351,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -365,13 +365,13 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript target->RemoveAurasDueToSpell(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript(); }; @@ -390,7 +390,7 @@ class spell_q11515_fel_siphon_dummy : public SpellScriptLoader public: spell_q11515_fel_siphon_dummy() : SpellScriptLoader("spell_q11515_fel_siphon_dummy") { } - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_0, NPC_FELBLOOD_INITIATE, NPC_EMACIATED_FELBLOOD, true); } @@ -414,7 +414,7 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader { PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_MALE) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_ARCANE_PRISONER_KILL_CREDIT)) return false; @@ -434,13 +434,13 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11587_arcane_prisoner_rescue_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11587_arcane_prisoner_rescue_SpellScript(); } @@ -472,12 +472,12 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader { PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER && GetCastItem(); } - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_004A8) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SENTRYBOT_57K) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_DEFENDOTANK_66D) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_005B6) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_55D_COLLECTATRON) || !sSpellMgr->GetSpellInfo(SPELL_ROBOT_KILL_CREDIT)) return false; @@ -507,13 +507,13 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11730_ultrasonic_screwdriver_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11730_ultrasonic_screwdriver_SpellScript(); } @@ -558,13 +558,13 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12459_seeds_of_natures_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12459_seeds_of_natures_wrath_SpellScript(); } @@ -589,7 +589,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader { PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BANANAS_FALL_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_ORANGE_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_PAPAYA_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ADVENTUROUS_DWARF)) return false; @@ -610,13 +610,13 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12634_despawn_fruit_tosser_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12634_despawn_fruit_tosser_SpellScript(); } @@ -645,13 +645,13 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12683_take_sputum_sample_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12683_take_sputum_sample_SpellScript(); } @@ -706,13 +706,13 @@ class spell_q12851_going_bearback : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_q12851_going_bearback_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12851_going_bearback_AuraScript(); } @@ -735,12 +735,12 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader { PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGER_AID_OF_THE_EARTHEN)) return false; @@ -758,13 +758,13 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12937_relief_for_the_fallen_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12937_relief_for_the_fallen_SpellScript(); } @@ -786,7 +786,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader { PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_FEMALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_GENERIC_DISGUISE)) return false; @@ -803,13 +803,13 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q10041_q10040_who_are_they_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q10041_q10040_who_are_they_SpellScript(); } @@ -845,13 +845,13 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_symbol_of_life_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_symbol_of_life_dummy_SpellScript(); }; @@ -873,7 +873,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader { PrepareSpellScript(spell_q12659_ahunaes_knife_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -888,13 +888,13 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12659_ahunaes_knife_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12659_ahunaes_knife_SpellScript(); }; @@ -917,7 +917,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader { PrepareSpellScript(spell_q9874_liquid_fire_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -934,13 +934,13 @@ class spell_q9874_liquid_fire : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q9874_liquid_fire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q9874_liquid_fire_SpellScript(); }; @@ -962,7 +962,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader { PrepareSpellScript(spell_q12805_lifeblood_dummy_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -978,13 +978,13 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12805_lifeblood_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12805_lifeblood_dummy_SpellScript(); }; @@ -1018,13 +1018,13 @@ class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC, 0); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q13280_13283_plant_battle_standard_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13280_13283_plant_battle_standard_SpellScript(); } @@ -1047,7 +1047,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader { PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*spellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SUMMON_ANGRY_KVALDIR) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_MAKO) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_THRESHER) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_BLUE_SHARK)) return false; @@ -1060,13 +1060,13 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader caster->CastSpell(caster, RAND(SUMMON_ANGRY_KVALDIR, SUMMON_NORTH_SEA_MAKO, SUMMON_NORTH_SEA_THRESHER, SUMMON_NORTH_SEA_BLUE_SHARK)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q14112_14145_chum_the_water_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q14112_14145_chum_the_water_SpellScript(); } @@ -1089,7 +1089,7 @@ class spell_q9452_cast_net: public SpellScriptLoader { PrepareSpellScript(spell_q9452_cast_net_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -1103,13 +1103,13 @@ class spell_q9452_cast_net: public SpellScriptLoader caster->CastSpell(caster, SPELL_NEW_SUMMON_TEST, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q9452_cast_net_SpellScript(); } @@ -1143,13 +1143,13 @@ class spell_q12987_read_pronouncement : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_q12987_read_pronouncement_AuraScript::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12987_read_pronouncement_AuraScript(); } @@ -1200,13 +1200,13 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12277_wintergarde_mine_explosion_SpellScript(); } @@ -1232,13 +1232,13 @@ class spell_q12066_bunny_kill_credit : public SpellScriptLoader target->CastSpell(GetCaster(), SPELL_BUNNY_CREDIT_BEAM, false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12066_bunny_kill_credit_SpellScript(); } @@ -1283,13 +1283,13 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12735_song_of_cleansing_SpellScript(); } @@ -1314,13 +1314,13 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WYRMREST_DEFENDER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12372_cast_from_gossip_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12372_cast_from_gossip_trigger_SpellScript(); } @@ -1355,13 +1355,13 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad player->KilledMonsterCredit(NPC_WYRMREST_TEMPLE_CREDIT, 0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript(); } @@ -1383,13 +1383,13 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader defender->AI()->Talk(WHISPER_ON_HIT_BY_FORCE_WHISPER, defender->GetCharmerOrOwner()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12372_azure_on_death_force_whisper_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12372_azure_on_death_force_whisper_SpellScript(); } @@ -1423,13 +1423,13 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader target->CastSpell(target, SPELL_AGGRO_CHECK); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q11010_q11102_q11023_aggro_check_aura_AuraScript(); } @@ -1453,13 +1453,13 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader playerTarget->CastSpell(playerTarget, SPELL_FLAK_CANNON_TRIGGER, TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11010_q11102_q11023_aggro_check_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11010_q11102_q11023_aggro_check_SpellScript(); } @@ -1482,13 +1482,13 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader target->CastSpell(target, SPELL_CHOOSE_LOC); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_burst_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q11010_q11102_q11023_aggro_burst_AuraScript(); } @@ -1519,13 +1519,13 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader caster->SummonCreature(NPC_FEL_CANNON2, (*itr)->GetPositionX(), (*itr)->GetPositionY(), (*itr)->GetPositionZ()); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q11010_q11102_q11023_choose_loc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11010_q11102_q11023_choose_loc_SpellScript(); } @@ -1551,13 +1551,13 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad return SpellCastResult::SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript(); } @@ -1577,7 +1577,7 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader { PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GORGED_LURKING_BASILISK)) return false; @@ -1594,13 +1594,13 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12527_zuldrak_rat_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12527_zuldrak_rat_SpellScript(); } @@ -1625,13 +1625,13 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript(); } @@ -1651,7 +1651,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader { PrepareAuraScript(spell_q12730_quenching_mist_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FLICKERING_FLAMES)) return false; @@ -1663,13 +1663,13 @@ class spell_q12730_quenching_mist : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_FLICKERING_FLAMES); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12730_quenching_mist_AuraScript(); } @@ -1694,7 +1694,7 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public { PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RIDE)) return false; @@ -1711,13 +1711,13 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public GetHitCreature()->CastSpell(GetCaster(), SPELL_RIDE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript(); } @@ -1742,13 +1742,13 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript(); } @@ -1773,7 +1773,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12847_summon_soul_moveto_bunny_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } @@ -1801,7 +1801,7 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader { PrepareSpellScript(spell_q13011_bear_flank_master_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BEAR_FLANK_MASTER) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_BEAR_FLANK)) @@ -1809,7 +1809,7 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1830,13 +1830,13 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q13011_bear_flank_master_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13011_bear_flank_master_SpellScript(); } @@ -1851,7 +1851,7 @@ class spell_q13086_cannons_target : public SpellScriptLoader { PrepareSpellScript(spell_q13086_cannons_target_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue())) return false; @@ -1864,13 +1864,13 @@ class spell_q13086_cannons_target : public SpellScriptLoader GetCaster()->CastSpell(pos->GetPositionX(), pos->GetPositionY(), pos->GetPositionZ(), GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q13086_cannons_target_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13086_cannons_target_SpellScript(); } @@ -1902,7 +1902,7 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader { PrepareSpellScript(spell_q12690_burst_at_the_seams_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS) || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_DMG) @@ -1914,7 +1914,7 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_UNIT; } @@ -1950,14 +1950,14 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader GetCaster()->ToCreature()->DespawnOrUnsummon(2 * IN_MILLISECONDS); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12690_burst_at_the_seams_SpellScript::HandleKnockBack, EFFECT_1, SPELL_EFFECT_KNOCK_BACK); OnEffectHitTarget += SpellEffectFn(spell_q12690_burst_at_the_seams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12690_burst_at_the_seams_SpellScript(); } @@ -1978,7 +1978,7 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader { PrepareSpellScript(spell_q12308_escape_from_silverbrook_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_WORGEN)) return false; @@ -1990,13 +1990,13 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WORGEN, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12308_escape_from_silverbrook_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12308_escape_from_silverbrook_SpellScript(); } @@ -2022,13 +2022,13 @@ class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScriptLoa GetHitDest()->Relocate(&pos); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript::ModDest, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript(); } @@ -2058,7 +2058,7 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader { PrepareSpellScript(spell_q12641_death_comes_from_on_high_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FORGE_CREDIT) || !sSpellMgr->GetSpellInfo(SPELL_TOWN_HALL_CREDIT) || @@ -2093,13 +2093,13 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12641_death_comes_from_on_high_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12641_death_comes_from_on_high_SpellScript(); } @@ -2122,13 +2122,13 @@ class spell_q12619_emblazon_runeblade : public SpellScriptLoader caster->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12619_emblazon_runeblade_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12619_emblazon_runeblade_AuraScript(); } @@ -2149,13 +2149,13 @@ class spell_q12619_emblazon_runeblade_effect : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), false); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12619_emblazon_runeblade_effect_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12619_emblazon_runeblade_effect_SpellScript(); } @@ -2176,7 +2176,7 @@ class spell_q12919_gymers_grab : public SpellScriptLoader { PrepareSpellScript(spell_q12919_gymers_grab_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RIDE_GYMER)) return false; @@ -2192,13 +2192,13 @@ class spell_q12919_gymers_grab : public SpellScriptLoader GetHitCreature()->CastSpell(GetHitCreature(), SPELL_GRABBED, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12919_gymers_grab_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12919_gymers_grab_SpellScript(); } @@ -2229,13 +2229,13 @@ class spell_q12919_gymers_throw : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12919_gymers_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12919_gymers_throw_SpellScript(); } @@ -2257,7 +2257,7 @@ class spell_q28813_get_our_boys_back_dummy : public SpellScriptLoader { PrepareSpellScript(spell_q28813_get_our_boys_back_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RENEWED_LIFE)) return false; @@ -2275,13 +2275,13 @@ class spell_q28813_get_our_boys_back_dummy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnCast += SpellCastFn(spell_q28813_get_our_boys_back_dummy_SpellScript::HandleDummyEffect); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q28813_get_our_boys_back_dummy_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index e98c4dab177..d086e6c99aa 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -57,14 +57,14 @@ class spell_rog_blade_flurry : public SpellScriptLoader { PrepareAuraScript(spell_rog_blade_flurry_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -86,7 +86,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK, SPELLVALUE_BASE_POINT0, eventInfo.GetDamageInfo()->GetDamage(), _procTarget, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_rog_blade_flurry_AuraScript::CheckProc); if (m_scriptSpellId == SPELL_ROGUE_BLADE_FLURRY) @@ -99,7 +99,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_blade_flurry_AuraScript(); } @@ -117,14 +117,14 @@ class spell_rog_cheat_death : public SpellScriptLoader uint32 absorbChance; - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_CHEAT_DEATH_COOLDOWN)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { absorbChance = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); return GetUnitOwner()->ToPlayer(); @@ -155,14 +155,14 @@ class spell_rog_cheat_death : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_cheat_death_AuraScript(); } @@ -178,7 +178,7 @@ class spell_rog_crippling_poison : public SpellScriptLoader { PrepareAuraScript(spell_rog_crippling_poison_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_CRIPPLING_POISON)) return false; @@ -191,13 +191,13 @@ class spell_rog_crippling_poison : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_ROGUE_CRIPPLING_POISON, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_rog_crippling_poison_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_crippling_poison_AuraScript(); } @@ -220,13 +220,13 @@ class spell_rog_cut_to_the_chase : public SpellScriptLoader aur->SetDuration(aur->GetSpellInfo()->GetMaxDuration(), true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_rog_cut_to_the_chase_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_cut_to_the_chase_AuraScript(); } @@ -242,7 +242,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader { PrepareSpellScript(spell_rog_deadly_poison_SpellScript); - bool Load() OVERRIDE + bool Load() override { _stackAmount = 0; // at this point CastItem must already be initialized @@ -313,7 +313,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleBeforeHit); AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit); @@ -322,7 +322,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader uint8 _stackAmount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rog_deadly_poison_SpellScript(); } @@ -375,7 +375,7 @@ class spell_rog_preparation : public SpellScriptLoader { PrepareSpellScript(spell_rog_preparation_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -398,13 +398,13 @@ class spell_rog_preparation : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rog_preparation_SpellScript(); } @@ -420,7 +420,7 @@ class spell_rog_recuperate : public SpellScriptLoader { PrepareAuraScript(spell_rog_recuperate_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -446,14 +446,14 @@ class spell_rog_recuperate : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_recuperate_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_recuperate_AuraScript::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_recuperate_AuraScript(); } @@ -469,7 +469,7 @@ class spell_rog_rupture : public SpellScriptLoader { PrepareAuraScript(spell_rog_rupture_AuraScript); - bool Load() OVERRIDE + bool Load() override { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TypeID::TYPEID_PLAYER; @@ -499,13 +499,13 @@ class spell_rog_rupture : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_rupture_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_rupture_AuraScript(); } @@ -521,7 +521,7 @@ class spell_rog_stealth : public SpellScriptLoader { PrepareAuraScript(spell_rog_stealth_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_MASTER_OF_SUBTLETY_PASSIVE) || !sSpellMgr->GetSpellInfo(SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT) || @@ -551,14 +551,14 @@ class spell_rog_stealth : public SpellScriptLoader target->CastSpell(target, SPELL_ROGUE_MASTER_OF_SUBTLETY_PERIODIC, true); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_rog_stealth_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_rog_stealth_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_stealth_AuraScript(); } @@ -574,7 +574,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader { PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_TRICKS_OF_THE_TRADE_DMG_BOOST)) return false; @@ -583,7 +583,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { _redirectTarget = NULL; return true; @@ -611,7 +611,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Remove(AURA_REMOVE_BY_DEFAULT); // maybe handle by proc charges } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); DoCheckProc += AuraCheckProcFn(spell_rog_tricks_of_the_trade_AuraScript::CheckProc); @@ -622,7 +622,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Unit* _redirectTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_tricks_of_the_trade_AuraScript(); } @@ -643,13 +643,13 @@ class spell_rog_tricks_of_the_trade_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_proc_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_tricks_of_the_trade_proc_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 10fe72e0ecd..684c092c826 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -79,7 +79,7 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader { PrepareAuraScript(spell_sha_ancestral_awakening_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TIDAL_WAVES)) return false; @@ -94,13 +94,13 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_SHAMAN_ANCESTRAL_AWAKENING, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_awakening_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_ancestral_awakening_AuraScript(); } @@ -117,7 +117,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC)) return false; @@ -129,13 +129,13 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader GetCaster()->CastCustomSpell(SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC, SPELLVALUE_BASE_POINT0, GetEffectValue(), GetHitUnit(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_ancestral_awakening_proc_SpellScript(); } @@ -152,7 +152,7 @@ class spell_sha_bloodlust : public SpellScriptLoader { PrepareSpellScript(spell_sha_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED)) return false; @@ -172,7 +172,7 @@ class spell_sha_bloodlust : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_SATED, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); @@ -181,7 +181,7 @@ class spell_sha_bloodlust : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_bloodlust_SpellScript(); } @@ -198,7 +198,7 @@ class spell_sha_chain_heal : public SpellScriptLoader { PrepareSpellScript(spell_sha_chain_heal_SpellScript); - bool Load() OVERRIDE + bool Load() override { firstHeal = true; riptide = false; @@ -228,7 +228,7 @@ class spell_sha_chain_heal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } @@ -238,7 +238,7 @@ class spell_sha_chain_heal : public SpellScriptLoader uint32 amount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_chain_heal_SpellScript(); } @@ -254,7 +254,7 @@ class spell_sha_earth_shield : public SpellScriptLoader { PrepareAuraScript(spell_sha_earth_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EARTH_SHIELD_HEAL)) return false; @@ -290,7 +290,7 @@ class spell_sha_earth_shield : public SpellScriptLoader player->AddSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL, 0, time(NULL) + 3); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_earth_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_DUMMY); DoCheckProc += AuraCheckProcFn(spell_sha_earth_shield_AuraScript::CheckProc); @@ -298,7 +298,7 @@ class spell_sha_earth_shield : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_earth_shield_AuraScript(); } @@ -328,13 +328,13 @@ class spell_sha_fire_nova : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_fire_nova_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_fire_nova_SpellScript(); } @@ -350,7 +350,7 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader { PrepareAuraScript(spell_sha_glyph_of_healing_wave_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE)) return false; @@ -371,14 +371,14 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_sha_glyph_of_healing_wave_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_sha_glyph_of_healing_wave_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_glyph_of_healing_wave_AuraScript(); } @@ -395,7 +395,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader { PrepareSpellScript(spell_sha_healing_stream_totem_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { return sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL); } @@ -422,13 +422,13 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_healing_stream_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_healing_stream_totem_SpellScript(); } @@ -445,7 +445,7 @@ class spell_sha_heroism : public SpellScriptLoader { PrepareSpellScript(spell_sha_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION)) return false; @@ -465,7 +465,7 @@ class spell_sha_heroism : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_EXHAUSTION, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); @@ -474,7 +474,7 @@ class spell_sha_heroism : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_heroism_SpellScript(); } @@ -490,7 +490,7 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader { PrepareAuraScript(spell_sha_item_lightning_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD)) return false; @@ -503,13 +503,13 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_item_lightning_shield_AuraScript(); } @@ -525,7 +525,7 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader { PrepareAuraScript(spell_sha_item_lightning_shield_trigger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ITEM_MANA_SURGE)) return false; @@ -538,13 +538,13 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_trigger_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_item_lightning_shield_trigger_AuraScript(); } @@ -560,7 +560,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader { PrepareAuraScript(spell_sha_item_mana_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE)) return false; @@ -576,13 +576,13 @@ class spell_sha_item_mana_surge : public SpellScriptLoader //GetTarget()->CastCustomSpell(SPELL_SHAMAN_ITEM_MANA_SURGE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_item_mana_surge_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_item_mana_surge_AuraScript(); } @@ -599,7 +599,7 @@ class spell_sha_lava_lash : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_lash_SpellScript) - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -620,13 +620,13 @@ class spell_sha_lava_lash : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_lava_lash_SpellScript(); } @@ -641,7 +641,7 @@ class spell_sha_lava_surge : public SpellScriptLoader { PrepareAuraScript(spell_sha_lava_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_SURGE)) return false; @@ -654,13 +654,13 @@ class spell_sha_lava_surge : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_LAVA_SURGE, true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_lava_surge_AuraScript(); } @@ -675,14 +675,14 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_BURST)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -692,13 +692,13 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader GetCaster()->ToPlayer()->RemoveSpellCooldown(SPELL_SHAMAN_LAVA_BURST, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_lava_surge_proc_SpellScript(); } @@ -723,13 +723,13 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader amount = CalculatePct(owner->GetStat(STAT_SPIRIT), aurEff->GetAmount()); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_mana_tide_totem_AuraScript(); } @@ -745,7 +745,7 @@ class spell_sha_nature_guardian : public SpellScriptLoader { PrepareAuraScript(spell_sha_nature_guardian_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_NATURE_GUARDIAN)) return false; @@ -776,14 +776,14 @@ class spell_sha_nature_guardian : public SpellScriptLoader player->AddSpellCooldown(GetSpellInfo()->Id, 0, time(NULL) + aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue()); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_sha_nature_guardian_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_sha_nature_guardian_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_nature_guardian_AuraScript(); } @@ -799,7 +799,7 @@ class spell_sha_rolling_thunder : public SpellScriptLoader { PrepareAuraScript(spell_sha_rolling_thunder_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LIGHTNING_SHIELD)) return false; @@ -815,13 +815,13 @@ class spell_sha_rolling_thunder : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_rolling_thunder_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_rolling_thunder_AuraScript(); } @@ -837,7 +837,7 @@ class spell_sha_telluric_currents : public SpellScriptLoader { PrepareAuraScript(spell_sha_telluric_currents_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TELLURIC_CURRENTS)) return false; @@ -852,13 +852,13 @@ class spell_sha_telluric_currents : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_TELLURIC_CURRENTS, &basePoints0, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_telluric_currents_AuraScript(); } @@ -881,13 +881,13 @@ class spell_sha_thunderstorm : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_thunderstorm_SpellScript::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_thunderstorm_SpellScript(); } @@ -903,7 +903,7 @@ class spell_sha_tidal_waves : public SpellScriptLoader { PrepareAuraScript(spell_sha_tidal_waves_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TIDAL_WAVES)) return false; @@ -919,13 +919,13 @@ class spell_sha_tidal_waves : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_TIDAL_WAVES, &basePoints0, &basePoints1, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_tidal_waves_AuraScript(); } @@ -981,14 +981,14 @@ class spell_sha_ascendance : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_sha_ascendance_SpellScript::CheckRequirement); OnHit += SpellHitFn(spell_sha_ascendance_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_ascendance_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 85e9224282c..83991eef9ad 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -93,13 +93,13 @@ class spell_warl_chaotic_energy : public SpellScriptLoader spellMod->value = (float)(aurEff->GetAmount() / 100); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_warl_chaotic_energy_AuraScript::HandleEffectCalcSpellMod, EFFECT_1, SPELL_AURA_ADD_PCT_MODIFIER); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_chaotic_energy_AuraScript(); } @@ -115,7 +115,7 @@ class spell_warl_banish : public SpellScriptLoader { PrepareSpellScript(spell_warl_banish_SpellScript); - bool Load() OVERRIDE + bool Load() override { _removed = false; return true; @@ -144,7 +144,7 @@ class spell_warl_banish : public SpellScriptLoader PreventHitAura(); } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish); AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura); @@ -153,7 +153,7 @@ class spell_warl_banish : public SpellScriptLoader bool _removed; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_banish_SpellScript(); } @@ -199,14 +199,14 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_demonic_circle_summon_AuraScript(); } @@ -235,13 +235,13 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_demonic_circle_teleport_AuraScript(); } @@ -257,7 +257,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader { PrepareAuraScript(spell_warl_fel_synergy_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_FEL_SYNERGY_HEAL)) return false; @@ -277,14 +277,14 @@ class spell_warl_fel_synergy : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_WARLOCK_FEL_SYNERGY_HEAL, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); // TARGET_UNIT_PET } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warl_fel_synergy_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_fel_synergy_AuraScript(); } @@ -306,13 +306,13 @@ class spell_warl_healthstone_heal : public SpellScriptLoader SetHitHeal(heal); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_warl_healthstone_heal_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_healthstone_heal_SpellScript(); } @@ -329,12 +329,12 @@ class spell_warl_life_tap : public SpellScriptLoader { PrepareSpellScript(spell_warl_life_tap_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE)) return false; @@ -367,14 +367,14 @@ class spell_warl_life_tap : public SpellScriptLoader return SpellCastResult::SPELL_FAILED_FIZZLE; } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_warl_life_tap_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_life_tap_SpellScript(); } @@ -397,13 +397,13 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader targets.remove(GetExplTargetUnit()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warl_seed_of_corruption_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_seed_of_corruption_SpellScript(); } @@ -419,7 +419,7 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader { PrepareAuraScript(spell_warl_shadow_trance_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SHADOW_TRANCE)) return false; @@ -437,13 +437,13 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_WARLOCK_SHADOW_TRANCE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warl_shadow_trance_proc_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_shadow_trance_proc_AuraScript(); } @@ -459,7 +459,7 @@ class spell_warl_soul_swap : public SpellScriptLoader { PrepareSpellScript(spell_warl_soul_swap_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_CD_MARKER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) @@ -473,13 +473,13 @@ class spell_warl_soul_swap : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_DOT_MARKER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soul_swap_SpellScript(); } @@ -495,14 +495,14 @@ class spell_warl_soul_swap_override : public SpellScriptLoader { PrepareAuraScript(spell_warl_soul_swap_override_AuraScript); - bool Load() OVERRIDE + bool Load() override { _swapCaster = NULL; return true; } //! Forced to, pure virtual functions must have a body when linking - void Register() OVERRIDE { } + void Register() override { } public: void AddDot(uint32 id) { _dotList.push_back(id); } @@ -515,7 +515,7 @@ class spell_warl_soul_swap_override : public SpellScriptLoader Unit* _swapCaster; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_soul_swap_override_AuraScript(); } @@ -561,13 +561,13 @@ class spell_warl_soul_swap_dot_marker : public SpellScriptLoader swapSpellScript->SetOriginalSwapSource(swapVictim); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soul_swap_dot_marker_SpellScript(); } @@ -583,7 +583,7 @@ class spell_warl_soul_swap_exhale : public SpellScriptLoader { PrepareSpellScript(spell_warl_soul_swap_exhale_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_MOD_COST) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) @@ -635,14 +635,14 @@ class spell_warl_soul_swap_exhale : public SpellScriptLoader GetCaster()->RemoveAurasDueToSpell(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_warl_soul_swap_exhale_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_exhale_SpellScript::OnEffectHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soul_swap_exhale_SpellScript(); } @@ -659,7 +659,7 @@ class spell_warl_soulshatter : public SpellScriptLoader { PrepareSpellScript(spell_warl_soulshatter_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOULSHATTER)) return false; @@ -674,13 +674,13 @@ class spell_warl_soulshatter : public SpellScriptLoader caster->CastSpell(target, SPELL_WARLOCK_SOULSHATTER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soulshatter_SpellScript(); } @@ -697,7 +697,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL)) return false; @@ -715,13 +715,13 @@ class spell_warl_unstable_affliction : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_unstable_affliction_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index b300e79a299..aead98abbe9 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -83,7 +83,7 @@ class spell_warr_bloodthirst : public SpellScriptLoader { PrepareSpellScript(spell_warr_bloodthirst_SpellScript); - bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE + bool Validate(SpellInfo const* /*SpellEntry*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_BLOODTHIRST_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_BLOODTHIRST_HEAL)) @@ -103,13 +103,13 @@ class spell_warr_bloodthirst : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_warr_bloodthirst_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_bloodthirst_SpellScript(); } @@ -125,7 +125,7 @@ class spell_warr_charge : public SpellScriptLoader { PrepareSpellScript(spell_warr_charge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_WARBRINGER_ROOT) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_WARBRINGER_SLOW) || @@ -158,14 +158,14 @@ class spell_warr_charge : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_charge_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_warr_charge_SpellScript::HandleCharge, EFFECT_0, SPELL_EFFECT_CHARGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_charge_SpellScript(); } @@ -186,13 +186,13 @@ class spell_warr_concussion_blow : public SpellScriptLoader SetHitDamage(CalculatePct(GetCaster()->GetTotalAttackPowerValue(WeaponAttackType::BASE_ATTACK), GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_concussion_blow_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_concussion_blow_SpellScript(); } @@ -231,13 +231,13 @@ class spell_warr_deep_wounds : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_warr_deep_wounds_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_deep_wounds_SpellScript(); } @@ -281,13 +281,13 @@ class spell_warr_execute : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_execute_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_execute_SpellScript(); } @@ -309,13 +309,13 @@ class spell_warr_improved_spell_reflection : public SpellScriptLoader unitList.remove(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_improved_spell_reflection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_improved_spell_reflection_SpellScript(); } @@ -336,14 +336,14 @@ class spell_warr_intimidating_shout : public SpellScriptLoader unitList.remove(GetExplTargetWorldObject()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_intimidating_shout_SpellScript(); } @@ -360,7 +360,7 @@ class spell_warr_last_stand : public SpellScriptLoader { PrepareSpellScript(spell_warr_last_stand_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_LAST_STAND_TRIGGERED)) return false; @@ -374,14 +374,14 @@ class spell_warr_last_stand : public SpellScriptLoader caster->CastCustomSpell(caster, SPELL_WARRIOR_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL); } - void Register() OVERRIDE + void Register() override { // add dummy effect spell handler to Last Stand OnEffectHit += SpellEffectFn(spell_warr_last_stand_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_last_stand_SpellScript(); } @@ -397,14 +397,14 @@ class spell_warr_rallying_cry : public SpellScriptLoader { PrepareSpellScript(spell_warr_rallying_cry_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_RALLYING_CRY)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TypeID::TYPEID_PLAYER; } @@ -416,13 +416,13 @@ class spell_warr_rallying_cry : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_WARRIOR_RALLYING_CRY, &basePoints0, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_rallying_cry_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_rallying_cry_SpellScript(); } @@ -454,13 +454,13 @@ class spell_warr_rend : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_rend_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_rend_AuraScript(); } @@ -476,7 +476,7 @@ class spell_warr_retaliation : public SpellScriptLoader { PrepareAuraScript(spell_warr_retaliation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_RETALIATION_DAMAGE)) return false; @@ -495,14 +495,14 @@ class spell_warr_retaliation : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARRIOR_RETALIATION_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_retaliation_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_retaliation_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_retaliation_AuraScript(); } @@ -527,13 +527,13 @@ class spell_warr_shattering_throw : public SpellScriptLoader target->RemoveAurasWithMechanic(1 << MECHANIC_IMMUNE_SHIELD, AURA_REMOVE_BY_ENEMY_SPELL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_shattering_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_shattering_throw_SpellScript(); } @@ -548,7 +548,7 @@ class spell_warr_second_wind_proc : public SpellScriptLoader { PrepareAuraScript(spell_warr_second_wind_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SECOUND_WIND_PROC_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SECOUND_WIND_PROC_RANK_2) || @@ -582,14 +582,14 @@ class spell_warr_second_wind_proc : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_second_wind_proc_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_second_wind_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_second_wind_proc_AuraScript(); } @@ -609,13 +609,13 @@ class spell_warr_second_wind_trigger : public SpellScriptLoader amount = int32(GetUnitOwner()->CountPctFromMaxHealth(amount)); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_second_wind_trigger_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_second_wind_trigger_AuraScript(); } @@ -631,7 +631,7 @@ class spell_warr_sudden_death : public SpellScriptLoader { PrepareAuraScript(spell_warr_sudden_death_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_COLOSSUS_SMASH)) return false; @@ -645,13 +645,13 @@ class spell_warr_sudden_death : public SpellScriptLoader player->RemoveSpellCooldown(SPELL_WARRIOR_COLOSSUS_SMASH, true); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectRemoveFn(spell_warr_sudden_death_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); // correct? } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_sudden_death_AuraScript(); } @@ -667,14 +667,14 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader { PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -692,7 +692,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_sweeping_strikes_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -702,7 +702,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_sweeping_strikes_AuraScript(); } @@ -718,7 +718,7 @@ class spell_warr_sword_and_board : public SpellScriptLoader { PrepareAuraScript(spell_warr_sword_and_board_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SHIELD_SLAM)) return false; @@ -732,13 +732,13 @@ class spell_warr_sword_and_board : public SpellScriptLoader player->RemoveSpellCooldown(SPELL_WARRIOR_SHIELD_SLAM, true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warr_sword_and_board_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_sword_and_board_AuraScript(); } @@ -761,13 +761,13 @@ class spell_warr_victorious : public SpellScriptLoader GetTarget()->RemoveAura(GetId()); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warr_victorious_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_victorious_AuraScript(); } diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index e55e93480e7..711f6e03dd3 100644 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -29,7 +29,7 @@ class achievement_resilient_victory : public AchievementCriteriaScript public: achievement_resilient_victory() : AchievementCriteriaScript("achievement_resilient_victory") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (Battleground* bg = source->GetBattleground()) return bg->CheckAchievementCriteriaMeet(BG_CRITERIA_CHECK_RESILIENT_VICTORY, source, target); @@ -43,7 +43,7 @@ class achievement_bg_control_all_nodes : public AchievementCriteriaScript public: achievement_bg_control_all_nodes() : AchievementCriteriaScript("achievement_bg_control_all_nodes") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Battleground* bg = source->GetBattleground()) return bg->IsAllNodesControlledByTeam(source->GetTeam()); @@ -57,7 +57,7 @@ class achievement_save_the_day : public AchievementCriteriaScript public: achievement_save_the_day() : AchievementCriteriaScript("achievement_save_the_day") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (Battleground* bg = source->GetBattleground()) return bg->CheckAchievementCriteriaMeet(BG_CRITERIA_CHECK_SAVE_THE_DAY, source, target); @@ -71,7 +71,7 @@ class achievement_bg_ic_resource_glut : public AchievementCriteriaScript public: achievement_bg_ic_resource_glut() : AchievementCriteriaScript("achievement_bg_ic_resource_glut") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (source->HasAura(SPELL_OIL_REFINERY) && source->HasAura(SPELL_QUARRY)) return true; @@ -85,7 +85,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript public: achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -102,7 +102,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript public: achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -119,7 +119,7 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript public: achievement_bg_sa_artillery() : AchievementCriteriaScript("achievement_bg_sa_artillery") { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -139,7 +139,7 @@ class achievement_arena_kills : public AchievementCriteriaScript { } - bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* source, Unit* /*target*/) override { // this checks GetBattleground() for NULL already if (!source->InArena()) @@ -157,7 +157,7 @@ class achievement_sickly_gazelle : public AchievementCriteriaScript public: achievement_sickly_gazelle() : AchievementCriteriaScript("achievement_sickly_gazelle") { } - bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE + bool OnCheck(Player* /*source*/, Unit* target) override { if (!target) return false; @@ -175,7 +175,7 @@ class achievement_everything_counts : public AchievementCriteriaScript public: achievement_everything_counts() : AchievementCriteriaScript("achievement_everything_counts") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (Battleground* bg = source->GetBattleground()) return bg->CheckAchievementCriteriaMeet(BG_CRITERIA_CHECK_EVERYTHING_COUNTS, source, target); @@ -189,7 +189,7 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript public: achievement_bg_av_perfection() : AchievementCriteriaScript("achievement_bg_av_perfection") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (Battleground* bg = source->GetBattleground()) return bg->CheckAchievementCriteriaMeet(BG_CRITERIA_CHECK_AV_PERFECTION, source, target); @@ -203,7 +203,7 @@ class achievement_bg_sa_defense_of_ancients : public AchievementCriteriaScript public: achievement_bg_sa_defense_of_ancients() : AchievementCriteriaScript("achievement_bg_sa_defense_of_ancients") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (Battleground* bg = source->GetBattleground()) return bg->CheckAchievementCriteriaMeet(BG_CRITERIA_CHECK_DEFENSE_OF_THE_ANCIENTS, source, target); @@ -227,7 +227,7 @@ class achievement_tilted : public AchievementCriteriaScript public: achievement_tilted() : AchievementCriteriaScript("achievement_tilted") { } - bool OnCheck(Player* player, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* player, Unit* /*target*/) override { if (!player) return false; @@ -248,7 +248,7 @@ class achievement_not_even_a_scratch : public AchievementCriteriaScript public: achievement_not_even_a_scratch() : AchievementCriteriaScript("achievement_not_even_a_scratch") { } - bool OnCheck(Player* source, Unit* target) OVERRIDE + bool OnCheck(Player* source, Unit* target) override { if (Battleground* bg = source->GetBattleground()) return bg->CheckAchievementCriteriaMeet(BG_CRITERIA_CHECK_NOT_EVEN_A_SCRATCH, source, target); @@ -269,7 +269,7 @@ class achievement_flirt_with_disaster_perf_check : public AchievementCriteriaScr public: achievement_flirt_with_disaster_perf_check() : AchievementCriteriaScript("achievement_flirt_with_disaster_perf_check") { } - bool OnCheck(Player* player, Unit* /*target*/) OVERRIDE + bool OnCheck(Player* player, Unit* /*target*/) override { if (!player) return false; @@ -286,7 +286,7 @@ class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript public: achievement_killed_exp_or_honor_target() : AchievementCriteriaScript("achievement_killed_exp_or_honor_target") { } - bool OnCheck(Player* player, Unit* target) OVERRIDE + bool OnCheck(Player* player, Unit* target) override { return target && player->isHonorOrXPTarget(target); } diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index ecf9727e56d..41986812cde 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -54,7 +54,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript public: AreaTrigger_at_coilfang_waterfall() : AreaTriggerScript("at_coilfang_waterfall") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { if (GameObject* go = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f)) if (go->getLootState() == LootState::GO_READY) @@ -82,7 +82,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript public: AreaTrigger_at_legion_teleporter() : AreaTriggerScript("at_legion_teleporter") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { if (player->IsAlive() && !player->IsInCombat()) { @@ -120,7 +120,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript public: AreaTrigger_at_stormwright_shelf() : AreaTriggerScript("at_stormwright_shelf") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { if (!player->isDead() && player->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false); @@ -144,7 +144,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript public: AreaTrigger_at_scent_larkorwi() : AreaTriggerScript("at_scent_larkorwi") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { @@ -171,7 +171,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript public: AreaTrigger_at_last_rites() : AreaTriggerScript("at_last_rites") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE || @@ -229,7 +229,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript public: AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE || (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED))) @@ -266,7 +266,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript public: AreaTrigger_at_nats_landing() : AreaTriggerScript("at_nats_landing") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) override { if (!player->IsAlive() || !player->HasAura(SPELL_FISH_PASTE)) return false; @@ -311,7 +311,7 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript _triggerTimes[AT_BREWFEST_DUROTAR] = _triggerTimes[AT_BREWFEST_DUN_MOROGH] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { uint32 triggerId = trigger->id; // Second trigger happened too early after first, skip for now @@ -364,7 +364,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript _triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) override { float x = 0.0f, y = 0.0f, z = 0.0f; @@ -436,7 +436,7 @@ class AreaTrigger_at_frostgrips_hollow : public AreaTriggerScript stormforgedEradictorGUID = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* /* trigger */) OVERRIDE + bool OnTrigger(Player* player, AreaTriggerEntry const* /* trigger */) override { if (player->GetQuestStatus(QUEST_THE_LONESOME_WATCHER) != QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 79b74057432..b5e432552b8 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -68,7 +68,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { player->CastSpell(player, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -84,7 +84,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086)) player->CastSpell(player, 26095, false); @@ -102,7 +102,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->HasSkill(SKILL_ENGINEERING) && player->GetBaseSkillValue(SKILL_ENGINEERING) >= 300 && !player->HasSpell(22704)) player->CastSpell(player, 22864, false); @@ -125,7 +125,7 @@ class go_gilded_brazier : public GameObjectScript public: go_gilded_brazier() : GameObjectScript("go_gilded_brazier") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) { @@ -148,7 +148,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->GetQuestRewardStatus(7761)) player->CastSpell(player, 23460, true); @@ -166,7 +166,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->HasSkill(SKILL_ALCHEMY) && player->GetSkillValue(SKILL_ALCHEMY) >= 300 && !player->HasSpell(24266)) player->CastSpell(player, 24267, false); @@ -185,7 +185,7 @@ class go_tablet_of_the_seven : public GameObjectScript go_tablet_of_the_seven() : GameObjectScript("go_tablet_of_the_seven") { } /// @todo use gossip option ("Transcript the Tablet") instead, if Skyfire adds support. - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; @@ -206,7 +206,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, 33382, true); @@ -240,7 +240,7 @@ class go_ethereum_prison : public GameObjectScript public: go_ethereum_prison() : GameObjectScript("go_ethereum_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32)); @@ -290,7 +290,7 @@ class go_ethereum_stasis : public GameObjectScript public: go_ethereum_stasis() : GameObjectScript("go_ethereum_stasis") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); int Random = rand() % (sizeof(NpcStasisEntry) / sizeof(uint32)); @@ -316,7 +316,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) go->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -339,7 +339,7 @@ class go_sacred_fire_of_life : public GameObjectScript public: go_sacred_fire_of_life() : GameObjectScript("go_sacred_fire_of_life") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -367,7 +367,7 @@ class go_shrine_of_the_birds : public GameObjectScript public: go_shrine_of_the_birds() : GameObjectScript("go_shrine_of_the_birds") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { uint32 BirdEntry = 0; @@ -410,7 +410,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //player->CastSpell(player, SPELL_SUMMON_RIZZLE, false); @@ -439,7 +439,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) return false; @@ -459,7 +459,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || player->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -489,7 +489,7 @@ class go_fel_crystalforge : public GameObjectScript public: go_fel_crystalforge() : GameObjectScript("go_fel_crystalforge") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ player->PrepareQuestMenu(go->GetGUID()); /* return true*/ @@ -502,7 +502,7 @@ class go_fel_crystalforge : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -548,7 +548,7 @@ class go_bashir_crystalforge : public GameObjectScript public: go_bashir_crystalforge() : GameObjectScript("go_bashir_crystalforge") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ player->PrepareQuestMenu(go->GetGUID()); /* return true*/ @@ -561,7 +561,7 @@ class go_bashir_crystalforge : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -612,7 +612,7 @@ class go_matrix_punchograph : public GameObjectScript public: go_matrix_punchograph() : GameObjectScript("go_matrix_punchograph") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { switch (go->GetEntry()) { @@ -665,7 +665,7 @@ class go_scourge_cage : public GameObjectScript public: go_scourge_cage() : GameObjectScript("go_scourge_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (Creature* pNearestPrisoner = go->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) @@ -693,7 +693,7 @@ class go_arcane_prison : public GameObjectScript public: go_arcane_prison() : GameObjectScript("go_arcane_prison") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (player->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { @@ -719,7 +719,7 @@ class go_blood_filled_orb : public GameObjectScript public: go_blood_filled_orb() : GameObjectScript("go_blood_filled_orb") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -750,7 +750,7 @@ class go_jotunheim_cage : public GameObjectScript public: go_jotunheim_cage() : GameObjectScript("go_jotunheim_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); Creature* pPrisoner = go->FindNearestCreature(NPC_EBON_BLADE_PRISONER_HUMAN, 5.0f, true); @@ -800,7 +800,7 @@ class go_table_theka : public GameObjectScript public: go_table_theka() : GameObjectScript("go_table_theka") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (player->GetQuestStatus(QUEST_SPIDER_GOLD) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_SPIDER_GOLD); @@ -826,7 +826,7 @@ class go_inconspicuous_landmark : public GameObjectScript public: go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE + bool OnGossipHello(Player* player, GameObject* /*go*/) override { if (player->HasItemCount(ITEM_CUERGOS_KEY)) return false; @@ -852,7 +852,7 @@ class go_ethereal_teleport_pad : public GameObjectScript public: go_ethereal_teleport_pad() : GameObjectScript("go_ethereal_teleport_pad") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { if (!player->HasItemCount(ITEM_TELEPORTER_POWER_PACK)) return false; @@ -882,7 +882,7 @@ class go_dragonflayer_cage : public GameObjectScript public: go_dragonflayer_cage() : GameObjectScript("go_dragonflayer_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE) @@ -930,7 +930,7 @@ class go_tadpole_cage : public GameObjectScript public: go_tadpole_cage() : GameObjectScript("go_tadpole_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE) @@ -971,7 +971,7 @@ class go_amberpine_outhouse : public GameObjectScript public: go_amberpine_outhouse() : GameObjectScript("go_amberpine_outhouse") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { QuestStatus status = player->GetQuestStatus(QUEST_DOING_YOUR_DUTY); if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -985,7 +985,7 @@ class go_amberpine_outhouse : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF +1) @@ -1027,7 +1027,7 @@ class go_hive_pod : public GameObjectScript public: go_hive_pod() : GameObjectScript("go_hive_pod") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { player->SendLoot(go->GetGUID(), LootType::LOOT_CORPSE); go->SummonCreature(NPC_HIVE_AMBUSHER, go->GetPositionX()+1, go->GetPositionY(), go->GetPositionZ(), go->GetAngle(player), TempSummonType::TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); @@ -1041,7 +1041,7 @@ class go_massive_seaforium_charge : public GameObjectScript public: go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE + bool OnGossipHello(Player* /*player*/, GameObject* go) override { go->SetLootState(LootState::GO_JUST_DEACTIVATED); return true; @@ -1065,7 +1065,7 @@ class go_gjalerbron_cage : public GameObjectScript public: go_gjalerbron_cage() : GameObjectScript("go_gjalerbron_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if ((player->GetTeamId() == TEAM_ALLIANCE && player->GetQuestStatus(QUEST_ALLIANCE_OF_KEYS_AND_CAGES) == QUEST_STATUS_INCOMPLETE) || @@ -1092,7 +1092,7 @@ class go_large_gjalerbron_cage : public GameObjectScript public: go_large_gjalerbron_cage() : GameObjectScript("go_large_gjalerbron_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if ((player->GetTeamId() == TEAM_ALLIANCE && player->GetQuestStatus(QUEST_ALLIANCE_OF_KEYS_AND_CAGES) == QUEST_STATUS_INCOMPLETE) || @@ -1127,7 +1127,7 @@ class go_veil_skith_cage : public GameObjectScript public: go_veil_skith_cage() : GameObjectScript("go_veil_skith_cage") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_MISSING_FRIENDS) == QUEST_STATUS_INCOMPLETE) @@ -1164,7 +1164,7 @@ class go_frostblade_shrine : public GameObjectScript public: go_frostblade_shrine() : GameObjectScript("go_frostblade_shrine") { } - bool OnGossipHello(Player* player, GameObject* go) OVERRIDE + bool OnGossipHello(Player* player, GameObject* go) override { go->UseDoorOrButton(10); if (!player->HasAura(SPELL_RECENT_MEDITATION)) @@ -1193,7 +1193,7 @@ class go_midsummer_bonfire : public GameObjectScript public: go_midsummer_bonfire() : GameObjectScript("go_midsummer_bonfire") { } - bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) OVERRIDE + bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) override { player->CastSpell(player, STAMP_OUT_BONFIRE_QUEST_COMPLETE, true); player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 2e6be7586c7..6255b286a5b 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -57,13 +57,13 @@ class guard_generic : public CreatureScript { guard_genericAI(Creature* creature) : GuardAI(creature) { } - void Reset() OVERRIDE + void Reset() override { globalCooldown = 0; buffTimer = 0; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY) Talk(SAY_GUARD_SIL_AGGRO, who); @@ -71,7 +71,7 @@ class guard_generic : public CreatureScript DoCast(who, spell->Id); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Always decrease our global cooldown first if (globalCooldown > diff) @@ -220,7 +220,7 @@ class guard_generic : public CreatureScript } } - void ReceiveEmote(Player* player, uint32 textEmote) OVERRIDE + void ReceiveEmote(Player* player, uint32 textEmote) override { switch (me->GetEntry()) { @@ -243,7 +243,7 @@ class guard_generic : public CreatureScript uint32 buffTimer; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new guard_genericAI(creature); } @@ -266,7 +266,7 @@ class guard_shattrath_scryer : public CreatureScript { guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature) { } - void Reset() OVERRIDE + void Reset() override { banishTimer = 5000; exileTimer = 8500; @@ -274,7 +274,7 @@ class guard_shattrath_scryer : public CreatureScript canTeleport = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -316,7 +316,7 @@ class guard_shattrath_scryer : public CreatureScript bool canTeleport; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new guard_shattrath_scryerAI(creature); } @@ -331,7 +331,7 @@ class guard_shattrath_aldor : public CreatureScript { guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature) { } - void Reset() OVERRIDE + void Reset() override { banishTimer = 5000; exileTimer = 8500; @@ -339,7 +339,7 @@ class guard_shattrath_aldor : public CreatureScript canTeleport = false; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -380,7 +380,7 @@ class guard_shattrath_aldor : public CreatureScript bool canTeleport; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new guard_shattrath_aldorAI(creature); } diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index bea317abb91..49c81bbbd11 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -50,7 +50,7 @@ class item_only_for_flight : public ItemScript public: item_only_for_flight() : ItemScript("item_only_for_flight") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) override { uint32 itemId = item->GetEntry(); bool disabled = false; @@ -91,7 +91,7 @@ class item_nether_wraith_beacon : public ItemScript public: item_nether_wraith_beacon() : ItemScript("item_nether_wraith_beacon") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/) override { if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) { @@ -114,7 +114,7 @@ class item_gor_dreks_ointment : public ItemScript public: item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) OVERRIDE + bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) override { if (targets.GetUnitTarget() && targets.GetUnitTarget()->GetTypeId() == TypeID::TYPEID_UNIT && targets.GetUnitTarget()->GetEntry() == 20748 && !targets.GetUnitTarget()->HasAura(32578)) @@ -134,7 +134,7 @@ class item_incendiary_explosives : public ItemScript public: item_incendiary_explosives() : ItemScript("item_incendiary_explosives") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const & /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* item, SpellCastTargets const & /*targets*/) override { if (player->FindNearestCreature(26248, 15) || player->FindNearestCreature(26249, 15)) return false; @@ -155,7 +155,7 @@ class item_mysterious_egg : public ItemScript public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) OVERRIDE + bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) override { ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -175,7 +175,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") { } - bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) OVERRIDE + bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) override { ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -224,7 +224,7 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const & /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const & /*targets*/) override { GameObject* go = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) @@ -269,7 +269,7 @@ class item_petrov_cluster_bombs : public ItemScript public: item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") { } - bool OnUse(Player* player, Item* /*item*/, const SpellCastTargets & /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* /*item*/, const SpellCastTargets & /*targets*/) override { if (player->GetZoneId() != ZONE_ID_HOWLING) return false; @@ -333,7 +333,7 @@ class item_dehta_trap_smasher : public ItemScript public: item_dehta_trap_smasher() : ItemScript("item_dehta_trap_smasher") { } - bool OnUse(Player* player, Item* /*item*/, const SpellCastTargets & /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* /*item*/, const SpellCastTargets & /*targets*/) override { if (player->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) != QUEST_STATUS_INCOMPLETE) return false; @@ -369,7 +369,7 @@ class item_trident_of_nazjan : public ItemScript public: item_trident_of_nazjan() : ItemScript("item_Trident_of_Nazjan") { } - bool OnUse(Player* player, Item* item, const SpellCastTargets & /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* item, const SpellCastTargets & /*targets*/) override { if (player->GetQuestStatus(QUEST_THE_EMISSARY) == QUEST_STATUS_INCOMPLETE) { @@ -398,7 +398,7 @@ class item_captured_frog : public ItemScript public: item_captured_frog() : ItemScript("item_captured_frog") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) OVERRIDE + bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) override { if (player->GetQuestStatus(QUEST_THE_PERFECT_SPIES) == QUEST_STATUS_INCOMPLETE) { @@ -418,7 +418,7 @@ class item_eye_of_black_prince : public ItemScript public: item_eye_of_black_prince() : ItemScript("item_eye_of_black_prince") { } - bool OnUse(Player* /*player*/, Item* item, SpellCastTargets const& /*targets*/) OVERRIDE { + bool OnUse(Player* /*player*/, Item* item, SpellCastTargets const& /*targets*/) override { switch (item->GetEntry()) { ///// - Sha Touched Weapons - ///// diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index eb52f8f3c43..f9ad0fad1e7 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -43,20 +43,20 @@ class generic_creature : public CreatureScript uint32 BuffTimer; //This variable keeps track of buffs bool IsSelfRooted; - void Reset() OVERRIDE + void Reset() override { GlobalCooldown = 0; BuffTimer = 0; //Rebuff as soon as we can IsSelfRooted = false; } - void EnterCombat(Unit* who) OVERRIDE + void EnterCombat(Unit* who) override { if (!me->IsWithinMeleeRange(who)) IsSelfRooted = true; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { //Always decrease our global cooldown first if (GlobalCooldown > diff) @@ -163,7 +163,7 @@ class generic_creature : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new generic_creatureAI(creature); } @@ -186,7 +186,7 @@ class trigger_periodic : public CreatureScript uint32 timer, interval; const SpellInfo* spell; - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (timer <= diff) { @@ -199,7 +199,7 @@ class trigger_periodic : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new trigger_periodicAI(creature); } @@ -213,14 +213,14 @@ class trigger_death : public CreatureScript struct trigger_deathAI : public NullCreatureAI { trigger_deathAI(Creature* creature) : NullCreatureAI(creature) { } - void JustDied(Unit* killer) OVERRIDE + void JustDied(Unit* killer) override { if (me->m_spells[0]) me->CastSpell(killer, me->m_spells[0], true); } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new trigger_deathAI(creature); } diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 4dc974f59b5..238d3ac8606 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -51,7 +51,7 @@ class npc_innkeeper : public CreatureScript public: npc_innkeeper() : CreatureScript("npc_innkeeper") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (IsHolidayActive(HolidayIds::HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { @@ -88,7 +88,7 @@ class npc_innkeeper : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1 && IsHolidayActive(HolidayIds::HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 7f0c06d9166..1ec2efddce6 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -383,7 +383,7 @@ class npc_prof_alchemy : public CreatureScript return (player->HasSpell(S_TRANSMUTE) || player->HasSpell(S_ELIXIR) || player->HasSpell(S_POTION)); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -509,7 +509,7 @@ class npc_prof_alchemy : public CreatureScript } } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -548,7 +548,7 @@ class npc_prof_blacksmith : public CreatureScript return (player->HasSpell(S_HAMMER) || player->HasSpell(S_AXE) || player->HasSpell(S_SWORD)); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -739,7 +739,7 @@ class npc_prof_blacksmith : public CreatureScript } } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -809,7 +809,7 @@ class npc_engineering_tele_trinket : public CreatureScript return res; } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { uint32 npcTextId = 0; std::string gossipItem; @@ -849,7 +849,7 @@ class npc_engineering_tele_trinket : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -887,7 +887,7 @@ class npc_prof_leather : public CreatureScript public: npc_prof_leather() : CreatureScript("npc_prof_leather") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -975,7 +975,7 @@ class npc_prof_leather : public CreatureScript } } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -1010,7 +1010,7 @@ class npc_prof_tailor : public CreatureScript return (player->HasSpell(S_MOONCLOTH) || player->HasSpell(S_SHADOWEAVE) || player->HasSpell(S_SPELLFIRE)); } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1137,7 +1137,7 @@ class npc_prof_tailor : public CreatureScript } } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (sender) diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 349e619e183..4dd93c5cdf3 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -66,7 +66,7 @@ class npc_taxi : public CreatureScript public: npc_taxi() : CreatureScript("npc_taxi") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -183,7 +183,7 @@ class npc_taxi : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index e2a71409ff9..0ddb0811985 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -159,7 +159,7 @@ class npc_air_force_bots : public CreatureScript SpawnAssociation* SpawnAssoc; uint64 SpawnedGUID; - void Reset() OVERRIDE { } + void Reset() override { } Creature* SummonGuard() { @@ -186,7 +186,7 @@ class npc_air_force_bots : public CreatureScript return NULL; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!SpawnAssoc) @@ -263,7 +263,7 @@ class npc_air_force_bots : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_air_force_botsAI(creature); } @@ -289,7 +289,7 @@ class npc_lunaclaw_spirit : public CreatureScript public: npc_lunaclaw_spirit() : CreatureScript("npc_lunaclaw_spirit") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (player->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -298,7 +298,7 @@ class npc_lunaclaw_spirit : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -336,16 +336,16 @@ class npc_chicken_cluck : public CreatureScript uint32 ResetFlagTimer; - void Reset() OVERRIDE + void Reset() override { ResetFlagTimer = 120000; me->setFaction(FACTION_CHICKEN); me->RemoveFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { // Reset flags after a certain time has passed so that the next player has to start the 'event' again if (me->HasFlag(UNIT_FIELD_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER)) @@ -363,7 +363,7 @@ class npc_chicken_cluck : public CreatureScript DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* player, uint32 emote) OVERRIDE + void ReceiveEmote(Player* player, uint32 emote) override { switch (emote) { @@ -387,12 +387,12 @@ class npc_chicken_cluck : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_chicken_cluckAI(creature); } - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset(); @@ -400,7 +400,7 @@ class npc_chicken_cluck : public CreatureScript return true; } - bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) override { if (quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset(); @@ -432,7 +432,7 @@ class npc_dancing_flames : public CreatureScript bool Active; uint32 CanIteract; - void Reset() OVERRIDE + void Reset() override { Active = true; CanIteract = 3500; @@ -445,7 +445,7 @@ class npc_dancing_flames : public CreatureScript me->HandleEmoteCommand(EMOTE_ONESHOT_DANCE); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!Active) { @@ -460,9 +460,9 @@ class npc_dancing_flames : public CreatureScript } } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void ReceiveEmote(Player* player, uint32 emote) OVERRIDE + void ReceiveEmote(Player* player, uint32 emote) override { if (me->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()) && me->IsWithinDistInMap(player, 30.0f)) { @@ -492,7 +492,7 @@ class npc_dancing_flames : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_dancing_flamesAI(creature); } @@ -586,7 +586,7 @@ class npc_doctor : public CreatureScript std::list Patients; std::vector Coordinates; - void Reset() OVERRIDE + void Reset() override { PlayerGUID = 0; @@ -687,12 +687,12 @@ class npc_doctor : public CreatureScript } } - void UpdateAI(uint32 diff) OVERRIDE; + void UpdateAI(uint32 diff) override; - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override { if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622)) CAST_AI(npc_doctor::npc_doctorAI, creature->AI())->BeginEvent(player); @@ -700,7 +700,7 @@ class npc_doctor : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_doctorAI(creature); } @@ -722,7 +722,7 @@ class npc_injured_patient : public CreatureScript uint64 DoctorGUID; Location* Coord; - void Reset() OVERRIDE + void Reset() override { DoctorGUID = 0; Coord = NULL; @@ -755,9 +755,9 @@ class npc_injured_patient : public CreatureScript } } - void EnterCombat(Unit* /*who*/)OVERRIDE { } + void EnterCombat(Unit* /*who*/)override { } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { Player* player = caster->ToPlayer(); if (!player || !me->IsAlive() || spell->Id != 20804) @@ -797,7 +797,7 @@ class npc_injured_patient : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { //lower HP on every world tick makes it a useful counter, not officlone though if (me->IsAlive() && me->GetHealth() > 6) @@ -817,7 +817,7 @@ class npc_injured_patient : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_injured_patientAI(creature); } @@ -924,7 +924,7 @@ class npc_garments_of_quests : public CreatureScript uint32 RunAwayTimer; - void Reset() OVERRIDE + void Reset() override { CasterGUID = 0; @@ -938,9 +938,9 @@ class npc_garments_of_quests : public CreatureScript me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_LESSER_HEAL_R2 || spell->Id == SPELL_FORTITUDE_R1) { @@ -1050,9 +1050,9 @@ class npc_garments_of_quests : public CreatureScript } } - void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } + void WaypointReached(uint32 /*waypointId*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (CanRun && !me->IsInCombat()) { @@ -1094,7 +1094,7 @@ class npc_garments_of_quests : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_garments_of_questsAI(creature); } @@ -1118,16 +1118,16 @@ class npc_guardian : public CreatureScript { npc_guardianAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE + void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE + void EnterCombat(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) OVERRIDE + void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) return; @@ -1140,7 +1140,7 @@ class npc_guardian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_guardianAI(creature); } @@ -1155,7 +1155,7 @@ class npc_mount_vendor : public CreatureScript public: npc_mount_vendor() : CreatureScript("npc_mount_vendor") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1230,7 +1230,7 @@ class npc_mount_vendor : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_TRADE) @@ -1254,7 +1254,7 @@ class npc_rogue_trainer : public CreatureScript public: npc_rogue_trainer() : CreatureScript("npc_rogue_trainer") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1281,7 +1281,7 @@ class npc_rogue_trainer : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -1370,7 +1370,7 @@ class npc_sayge : public CreatureScript public: npc_sayge() : CreatureScript("npc_sayge") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1439,7 +1439,7 @@ class npc_sayge : public CreatureScript } } - bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -1501,8 +1501,8 @@ class npc_steam_tonk : public CreatureScript { npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } void OnPossess(bool apply) { @@ -1519,7 +1519,7 @@ class npc_steam_tonk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_steam_tonkAI(creature); } @@ -1544,17 +1544,17 @@ class npc_tonk_mine : public CreatureScript uint32 ExplosionTimer; - void Reset() OVERRIDE + void Reset() override { ExplosionTimer = 3000; } - void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*who*/) OVERRIDE { } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } + void AttackStart(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (ExplosionTimer <= diff) { @@ -1566,7 +1566,7 @@ class npc_tonk_mine : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_tonk_mineAI(creature); } @@ -1590,7 +1590,7 @@ class npc_brewfest_reveler : public CreatureScript { npc_brewfest_revelerAI(Creature* creature) : ScriptedAI(creature) { } - void ReceiveEmote(Player* player, uint32 emote) OVERRIDE + void ReceiveEmote(Player* player, uint32 emote) override { if (!IsHolidayActive(HolidayIds::HOLIDAY_BREWFEST)) return; @@ -1600,7 +1600,7 @@ class npc_brewfest_reveler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_brewfest_revelerAI(creature); } @@ -1629,7 +1629,7 @@ class npc_training_dummy : public CreatureScript uint32 resetTimer; uint32 despawnTimer; - void Reset() OVERRIDE + void Reset() override { me->SetControlled(true, UNIT_STATE_STUNNED);//disable rotate me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);//imune to knock aways like blast wave @@ -1638,7 +1638,7 @@ class npc_training_dummy : public CreatureScript despawnTimer = 15000; } - void EnterEvadeMode() OVERRIDE + void EnterEvadeMode() override { if (!_EnterEvadeMode()) return; @@ -1646,13 +1646,13 @@ class npc_training_dummy : public CreatureScript Reset(); } - void DamageTaken(Unit* /*doneBy*/, uint32& damage) OVERRIDE + void DamageTaken(Unit* /*doneBy*/, uint32& damage) override { resetTimer = 5000; damage = 0; } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; @@ -1680,10 +1680,10 @@ class npc_training_dummy : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { } + void MoveInLineOfSight(Unit* /*who*/) override { } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_training_dummyAI(creature); } @@ -1723,12 +1723,12 @@ class npc_wormhole : public CreatureScript { npc_wormholeAI(Creature* creature) : PassiveAI(creature) { } - void InitializeAI() OVERRIDE + void InitializeAI() override { _showUnderground = urand(0, 100) == 0; // Guessed value, it is really rare though } - uint32 GetData(uint32 type) const OVERRIDE + uint32 GetData(uint32 type) const override { return (type == DATA_SHOW_UNDERGROUND && _showUnderground) ? 1 : 0; } @@ -1737,7 +1737,7 @@ class npc_wormhole : public CreatureScript bool _showUnderground; }; - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsSummon()) { @@ -1759,7 +1759,7 @@ class npc_wormhole : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); @@ -1794,7 +1794,7 @@ class npc_wormhole : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_wormholeAI(creature); } @@ -1821,7 +1821,7 @@ class npc_pet_trainer : public CreatureScript public: npc_pet_trainer() : CreatureScript("npc_pet_trainer") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1839,7 +1839,7 @@ class npc_pet_trainer : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -1916,7 +1916,7 @@ class npc_locksmith : public CreatureScript public: npc_locksmith() : CreatureScript("npc_locksmith") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { // Arcatraz Key if (player->GetQuestRewardStatus(QUEST_HOW_TO_BRAKE_IN_TO_THE_ARCATRAZ) && !player->HasItemCount(ITEM_ARCATRAZ_KEY, 1, true)) @@ -1961,7 +1961,7 @@ class npc_locksmith : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -2021,7 +2021,7 @@ class npc_experience : public CreatureScript public: npc_experience() : CreatureScript("npc_experience") { } - bool OnGossipHello(Player* player, Creature* creature) OVERRIDE + bool OnGossipHello(Player* player, Creature* creature) override { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_OFF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -2029,7 +2029,7 @@ class npc_experience : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override { player->PlayerTalkClass->ClearMenus(); bool noXPGain = player->HasFlag(PLAYER_FIELD_PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN); //PLAYER_FIELD_FLAGS_NO_XP_GAIN @@ -2298,7 +2298,7 @@ class npc_firework : public CreatureScript return 0; } - void Reset() OVERRIDE + void Reset() override { if (GameObject* launcher = FindNearestLauncher()) { @@ -2343,7 +2343,7 @@ class npc_firework : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_fireworkAI(creature); } @@ -2368,7 +2368,7 @@ class npc_spring_rabbit : public CreatureScript public: npc_spring_rabbit() : CreatureScript("npc_spring_rabbit") { } - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_spring_rabbitAI(creature); } @@ -2383,7 +2383,7 @@ class npc_spring_rabbit : public CreatureScript uint32 searchTimer; uint64 rabbitGUID; - void Reset() OVERRIDE + void Reset() override { inLove = false; rabbitGUID = 0; @@ -2394,16 +2394,16 @@ class npc_spring_rabbit : public CreatureScript me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) OVERRIDE { } + void EnterCombat(Unit* /*who*/) override { } - void DoAction(int32 /*param*/) OVERRIDE + void DoAction(int32 /*param*/) override { inLove = true; if (Unit* owner = me->GetOwner()) owner->CastSpell(owner, SPELL_SPRING_FLING, true); } - void UpdateAI(uint32 diff) OVERRIDE + void UpdateAI(uint32 diff) override { if (inLove) { @@ -2491,7 +2491,7 @@ class npc_training_target : public CreatureScript uint32 entry; }; - CreatureAI* GetAI(Creature* creature) const OVERRIDE + CreatureAI* GetAI(Creature* creature) const override { return new npc_training_targetAI(creature); } diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index c39d343dec1..be8595faab2 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -72,7 +72,6 @@ #endif //COMPILER == COMPILER_GNU -#define OVERRIDE override #define FINAL final diff --git a/src/server/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h index cf34f9423e9..e0d0fcdb51f 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.h +++ b/src/server/worldserver/CommandLine/CliRunnable.h @@ -28,7 +28,7 @@ class CliRunnable : public ACE_Based::Runnable { public: - void run() OVERRIDE; + void run() override; }; #endif diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 0f0cef1ac40..9ab3cd1885c 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -91,7 +91,7 @@ class FreezeDetectorRunnable : public ACE_Based::Runnable void SetDelayTime(uint32 t) { _delaytime = t; } - void run() OVERRIDE + void run() override { if (!_delaytime) return; diff --git a/src/server/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h index b12bb4c0314..82533336d13 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.h +++ b/src/server/worldserver/RemoteAccess/RARunnable.h @@ -33,7 +33,7 @@ class RARunnable : public ACE_Based::Runnable public: RARunnable(); virtual ~RARunnable(); - void run() OVERRIDE; + void run() override; private: ACE_Reactor* m_Reactor; diff --git a/src/server/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h index 9f5f6394026..fa3b99f8151 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.h +++ b/src/server/worldserver/RemoteAccess/RASocket.h @@ -38,9 +38,9 @@ class RASocket : public ACE_Svc_Handler RASocket(); virtual ~RASocket() { } - virtual int svc() OVERRIDE; - virtual int open(void* = 0) OVERRIDE; - virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE, ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) OVERRIDE; + virtual int svc() override; + virtual int open(void* = 0) override; + virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE, ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) override; private: int recv_line(std::string& outLine); diff --git a/src/server/worldserver/SFSoap/SFSoap.h b/src/server/worldserver/SFSoap/SFSoap.h index bd2fc4cffb1..7149fb328a3 100644 --- a/src/server/worldserver/SFSoap/SFSoap.h +++ b/src/server/worldserver/SFSoap/SFSoap.h @@ -31,7 +31,7 @@ class SFSoapRunnable : public ACE_Based::Runnable public: SFSoapRunnable() : _port(0) { } - void run() OVERRIDE; + void run() override; void SetListenArguments(const std::string& host, uint16 port) { diff --git a/src/server/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h index cdde2d7d1ca..ebb7aa5588a 100644 --- a/src/server/worldserver/WorldThread/WorldRunnable.h +++ b/src/server/worldserver/WorldThread/WorldRunnable.h @@ -28,7 +28,7 @@ class WorldRunnable : public ACE_Based::Runnable { public: - void run() OVERRIDE; + void run() override; }; #endif