nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-28 08:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): apply clang-tidy modernize-use-override (#3817)

Browse Source
This commit is contained in:
Francesco Borzì
2020-12-06 18:04:55 +01:00
committed by GitHub
parent 9facd81e54
commit d4a58700d4
561 changed files with 9574 additions and 9574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
View File

@@ -65,7 +65,7 @@ class RestoreFight : public BasicEvent
public:
RestoreFight(Creature* owner) : _owner(owner) { }
bool Execute(uint64 /*execTime*/, uint32 /*diff*/)
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
_owner->SetReactState(REACT_AGGRESSIVE);
_owner->SetInCombatWithZone();
@@ -81,7 +81,7 @@ class boss_drakkari_colossus : public CreatureScript
public:
boss_drakkari_colossus() : CreatureScript("boss_drakkari_colossus") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_drakkari_colossusAI (creature);
}
@@ -91,11 +91,11 @@ public:
{
}
void MoveInLineOfSight(Unit* /*who*/)
void MoveInLineOfSight(Unit* /*who*/) override
{
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_INFORM)
{
@@ -105,7 +105,7 @@ public:
}
}
void Reset()
void Reset() override
{
BossAI::Reset();
for (uint8 i = 0; i < 5; i++)
@@ -115,19 +115,19 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
me->CastSpell(me, SPELL_FREEZE_ANIM, true);
}
void JustReachedHome()
void JustReachedHome() override
{
BossAI::JustReachedHome();
me->CastSpell(me, SPELL_FREEZE_ANIM, true);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
events.ScheduleEvent(EVENT_COLOSSUS_MIGHTY_BLOW, 10000);
@@ -135,7 +135,7 @@ public:
events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_2, 1000);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
if (summon->GetEntry() == NPC_DRAKKARI_ELEMENTAL)
{
@@ -153,14 +153,14 @@ public:
summons.Summon(summon);
}
void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
summons.Despawn(summon);
if (summon->GetEntry() == NPC_DRAKKARI_ELEMENTAL)
Unit::Kill(me, me);
}
void SummonedCreatureDespawn(Creature* summon)
void SummonedCreatureDespawn(Creature* summon) override
{
summons.Despawn(summon);
if (summon->GetEntry() == NPC_DRAKKARI_ELEMENTAL)
@@ -172,13 +172,13 @@ public:
}
}
void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage >= me->GetHealth())
damage = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -231,7 +231,7 @@ class boss_drakkari_elemental : public CreatureScript
public:
boss_drakkari_elemental() : CreatureScript("boss_drakkari_elemental") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new boss_drakkari_elementalAI (pCreature);
}
@@ -247,27 +247,27 @@ public:
EventMap events;
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_INFORM)
events.CancelEvent(EVENT_ELEMENTAL_HEALTH);
}
void Reset()
void Reset() override
{
me->CastSpell(me, SPELL_ELEMENTAL_SPAWN_EFFECT, false);
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
Talk(EMOTE_ALTAR);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -312,7 +312,7 @@ class npc_living_mojo : public CreatureScript
public:
npc_living_mojo() : CreatureScript("npc_living_mojo") { }
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_living_mojoAI (pCreature);
}
@@ -325,14 +325,14 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
events.ScheduleEvent(EVENT_MOJO_MOJO_PUDDLE, 13000);
events.ScheduleEvent(EVENT_MOJO_MOJO_WAVE, 15000);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->ToTempSummon())
return;
@@ -340,7 +340,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->ToTempSummon())
{
@@ -353,7 +353,7 @@ public:
ScriptedAI::AttackStart(who);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_MERGE)
{
@@ -363,7 +363,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (me->ToTempSummon() || !UpdateVictim())
return;
@@ -407,13 +407,13 @@ public:
GetCaster()->CastSpell(GetCaster(), SPELL_FREEZE_ANIM, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_drakkari_colossus_emerge_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_drakkari_colossus_emerge_SpellScript();
}
@@ -434,13 +434,13 @@ public:
GetCaster()->CastSpell(target, SPELL_SURGE_DAMAGE, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_drakkari_colossus_surge_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_drakkari_colossus_surge_SpellScript();
}
@@ -464,13 +464,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_drakkari_colossus_face_me_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_drakkari_colossus_face_me_SpellScript();
}

14
src/server/scripts/Northrend/Gundrak/boss_eck.cpp
View File

@@ -30,7 +30,7 @@ class boss_eck : public CreatureScript
public:
boss_eck() : CreatureScript("boss_eck") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_eckAI>(creature);
}
@@ -41,7 +41,7 @@ public:
{
}
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
me->GetMotionMaster()->MovePoint(POINT_START, 1638.55f, 919.76f, 104.95f, false);
@@ -49,7 +49,7 @@ public:
me->SetReactState(REACT_PASSIVE);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == POINT_START)
{
@@ -58,12 +58,12 @@ public:
}
}
void Reset()
void Reset() override
{
BossAI::Reset();
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
events.ScheduleEvent(EVENT_ECK_BERSERK, urand(60000, 90000));
@@ -72,12 +72,12 @@ public:
events.ScheduleEvent(EVENT_ECK_SPRING, 8000);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
BossAI::JustDied(killer);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

30
src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
View File

@@ -48,7 +48,7 @@ class boss_gal_darah : public CreatureScript
public:
boss_gal_darah() : CreatureScript("boss_gal_darah") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_gal_darahAI>(creature);
}
@@ -62,20 +62,20 @@ public:
uint8 phaseCounter;
std::set<uint64> impaledList;
void Reset()
void Reset() override
{
BossAI::Reset();
impaledList.clear();
phaseCounter = 0;
}
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
me->CastSpell(me, SPELL_START_VISUAL, false);
}
void JustReachedHome()
void JustReachedHome() override
{
BossAI::JustReachedHome();
me->CastSpell(me, SPELL_START_VISUAL, false);
@@ -98,7 +98,7 @@ public:
}
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -108,7 +108,7 @@ public:
me->InterruptNonMeleeSpells(true);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
uint32 despawnTime = 0;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true))
@@ -120,18 +120,18 @@ public:
summon->DespawnOrUnsummon(despawnTime);
}
uint32 GetData(uint32 /*type*/) const
uint32 GetData(uint32 /*type*/) const override
{
return impaledList.size();
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -140,7 +140,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -219,13 +219,13 @@ public:
target->CastSpell(GetCaster(), SPELL_IMPALING_CHARGE_VEHICLE, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_galdarah_impaling_charge_SpellScript::HandleApplyAura, EFFECT_1, SPELL_EFFECT_APPLY_AURA);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_galdarah_impaling_charge_SpellScript();
}
@@ -246,13 +246,13 @@ public:
target->RemoveAurasDueToSpell(SPELL_TRANSFORM_TO_RHINO);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_galdarah_transform_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_galdarah_transform_SpellScript();
}
@@ -265,7 +265,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
if (!target)
return false;

20
src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
View File

@@ -48,7 +48,7 @@ class boss_moorabi : public CreatureScript
public:
boss_moorabi() : CreatureScript("boss_moorabi") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_moorabiAI>(creature);
}
@@ -61,14 +61,14 @@ public:
EventMap events2;
void Reset()
void Reset() override
{
BossAI::Reset();
events2.Reset();
events2.ScheduleEvent(EVENT_PHANTOM, 21000);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -80,7 +80,7 @@ public:
events.ScheduleEvent(EVENT_TRANSFORMATION, 12000);
}
void SpellHitTarget(Unit* /*caster*/, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* /*caster*/, const SpellInfo* spellInfo) override
{
if (spellInfo->Id == SPELL_TRANSFORMATION)
{
@@ -90,14 +90,14 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
Talk(EMOTE_ALTAR);
BossAI::JustDied(killer);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -106,7 +106,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!me->IsInCombat())
{
@@ -174,13 +174,13 @@ public:
GetUnitOwner()->SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f * (GetUnitOwner()->GetHealthPct() / 100.0f));
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_moorabi_mojo_frenzy_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_moorabi_mojo_frenzy_AuraScript();
}
@@ -193,7 +193,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
return target && target->GetDisplayId() == target->GetNativeDisplayId();
}

24
src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
View File

@@ -59,7 +59,7 @@ class boss_slad_ran : public CreatureScript
public:
boss_slad_ran() : CreatureScript("boss_slad_ran") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_slad_ranAI(creature);
}
@@ -70,26 +70,26 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
_achievement = true;
}
uint32 GetData(uint32 data) const
uint32 GetData(uint32 data) const override
{
if (data == me->GetEntry())
return uint32(_achievement);
return 0;
}
void SetData(uint32 data, uint32)
void SetData(uint32 data, uint32) override
{
if (data == me->GetEntry())
_achievement = false;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -101,14 +101,14 @@ public:
events.ScheduleEvent(EVENT_CHECK_HEALTH2, 1000);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
Talk(EMOTE_ALTAR);
BossAI::JustDied(killer);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -117,13 +117,13 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summon->SetInCombatWithZone();
summons.Summon(summon);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -204,13 +204,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_sladran_grip_of_sladran_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_sladran_grip_of_sladran_AuraScript();
}
@@ -223,7 +223,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
if (!target)
return false;

18
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
View File

@@ -21,7 +21,7 @@ class instance_gundrak : public InstanceMapScript
public:
instance_gundrak() : InstanceMapScript("instance_gundrak", 604) { }
InstanceScript* GetInstanceScript(InstanceMap* pMap) const
InstanceScript* GetInstanceScript(InstanceMap* pMap) const override
{
return new instance_gundrak_InstanceMapScript(pMap);
}
@@ -39,7 +39,7 @@ public:
uint32 _keysInCount;
uint32 _activateTimer;
void Initialize()
void Initialize() override
{
SetBossNumber(MAX_ENCOUNTERS);
LoadDoorData(doorData);
@@ -52,7 +52,7 @@ public:
memset(&_bridgeGUIDs, 0, sizeof(_bridgeGUIDs));
}
void OnGameObjectCreate(GameObject* gameobject)
void OnGameObjectCreate(GameObject* gameobject) override
{
switch (gameobject->GetEntry())
{
@@ -102,7 +102,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* gameobject)
void OnGameObjectRemove(GameObject* gameobject) override
{
switch (gameobject->GetEntry())
{
@@ -116,7 +116,7 @@ public:
}
}
void SetData(uint32 type, uint32)
void SetData(uint32 type, uint32) override
{
switch (type)
{
@@ -151,7 +151,7 @@ public:
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
{
@@ -188,14 +188,14 @@ public:
return true;
}
std::string GetSaveData()
std::string GetSaveData() override
{
std::ostringstream saveStream;
saveStream << "G D " << GetBossSaveData();
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
return;
@@ -216,7 +216,7 @@ public:
}
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
if (!_activateTimer)
return;