nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-03 11:03:47 +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

38
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
View File

@@ -89,13 +89,13 @@ public:
uint8 noQuillTimes;
bool startPath;
void JustReachedHome()
void JustReachedHome() override
{
BossAI::JustReachedHome();
startPath = true;
}
void Reset()
void Reset() override
{
BossAI::Reset();
platform = 0;
@@ -105,13 +105,13 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 0);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
me->SetModelVisible(true);
BossAI::JustDied(killer);
@@ -127,16 +127,16 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() == NPC_EMBER_OF_ALAR)
summon->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FIRE, true);
}
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
if (damage >= me->GetHealth() && platform < POINT_MIDDLE)
{
@@ -157,7 +157,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != POINT_MOTION_TYPE)
{
@@ -177,7 +177,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (startPath)
{
@@ -326,7 +326,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_alarAI>(creature);
}
@@ -339,7 +339,7 @@ public:
{
}
bool Execute(uint64 /*execTime*/, uint32 /*diff*/)
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
_caster->CastSpell(_caster, _spellId, true);
return true;
@@ -371,13 +371,13 @@ public:
GetUnitOwner()->m_Events.AddEvent(new CastQuill(GetUnitOwner(), SPELL_QUILL_MISSILE_2 + 2), GetUnitOwner()->m_Events.CalculateTime(24 * 40));
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alar_flame_quills_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_alar_flame_quills_AuraScript();
}
@@ -400,13 +400,13 @@ public:
Unit::DealDamage(GetCaster(), alar, alar->CountPctFromMaxHealth(2));
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_alar_ember_blast_SpellScript::HandleForceCast, EFFECT_2, SPELL_EFFECT_FORCE_CAST);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_alar_ember_blast_SpellScript();
}
@@ -441,14 +441,14 @@ public:
GetUnitOwner()->SetStandState(UNIT_STAND_STATE_STAND);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_alar_ember_blast_death_AuraScript::OnApply, EFFECT_2, SPELL_AURA_MOD_INVISIBILITY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_alar_ember_blast_death_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_MOD_INVISIBILITY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_alar_ember_blast_death_AuraScript();
}
@@ -469,13 +469,13 @@ public:
GetUnitOwner()->SetDisplayId(DISPLAYID_INVISIBLE);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_alar_dive_bomb_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_alar_dive_bomb_AuraScript();
}

26
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
View File

@@ -67,32 +67,32 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
me->SetModelVisible(true);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (who && me->Attack(who, true))
me->GetMotionMaster()->MoveChase(who, (events.GetNextEventTime(EVENT_SPELL_VOID_BOLT) == 0 ? 30.0f : 0.0f));
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50))
Talk(SAY_KILL);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
me->SetModelVisible(true);
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -105,14 +105,14 @@ public:
events.ScheduleEvent(EVENT_SPAWN_PORTALS, 50000);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (!summon->IsTrigger())
summon->SetInCombatWithZone();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -221,13 +221,13 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetDistance2d(432.59f, -371.93f) > 105.0f;
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_high_astromancer_solarianAI>(creature);
}
@@ -251,13 +251,13 @@ public:
target->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), false);
}
void Register()
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
AuraScript* GetAuraScript() const override
{
return new spell_astromancer_wrath_of_the_astromancer_AuraScript();
}
@@ -282,14 +282,14 @@ public:
GetUnitOwner()->HandleStatModifier(UnitMods(UNIT_MOD_ARMOR), TOTAL_PCT, 400.0f, false);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_astromancer_solarian_transform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_astromancer_solarian_transform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_astromancer_solarian_transform_AuraScript();
}

74
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -193,7 +193,7 @@ public:
}
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
if (type == DATA_RESURRECT_CAST && data == DATA_RESURRECT_CAST)
{
@@ -218,7 +218,7 @@ public:
window->SetGoState(state);
}
void Reset()
void Reset() override
{
BossAI::Reset();
events2.Reset();
@@ -233,13 +233,13 @@ public:
me->SetWalk(false);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (phase == PHASE_FINAL && events.GetNextEventTime(EVENT_GRAVITY_LAPSE_END) == 0)
BossAI::AttackStart(who);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (phase == PHASE_NONE && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who))
{
@@ -251,25 +251,25 @@ public:
}
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() == NPC_NETHER_VAPOR)
summon->GetMotionMaster()->MoveRandom(20.0f);
}
void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
if (phase == PHASE_FINAL)
return;
@@ -307,7 +307,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -315,7 +315,7 @@ public:
BossAI::JustDied(killer);
}
void MovementInform(uint32 type, uint32 point)
void MovementInform(uint32 type, uint32 point) override
{
if (type != POINT_MOTION_TYPE)
return;
@@ -359,7 +359,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (EnterEvadeIfOutOfCombatArea())
return;
@@ -700,13 +700,13 @@ public:
DoMeleeAttackIfReady();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetHomePosition().GetExactDist2d(me) > 165.0f || !SelectTargetFromPlayerList(165.0f);
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kaelthasAI>(creature);
}
@@ -721,7 +721,7 @@ public:
{
PrepareSpellScript(spell_kaelthas_kael_phase_two_SpellScript);
bool Load()
bool Load() override
{
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -730,12 +730,12 @@ public:
return true;
}
void Register()
void Register() override
{
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_kael_phase_two_SpellScript();
}
@@ -757,13 +757,13 @@ public:
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_REMOTE_TOY_STUN, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_kaelthas_remote_toy_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_kaelthas_remote_toy_AuraScript();
}
@@ -785,13 +785,13 @@ public:
GetCaster()->CastSpell(GetCaster(), i, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_summon_weapons_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_summon_weapons_SpellScript();
}
@@ -811,13 +811,13 @@ public:
GetCaster()->GetAI()->SetData(DATA_RESURRECT_CAST, DATA_RESURRECT_CAST);
}
void Register()
void Register() override
{
BeforeCast += SpellCastFn(spell_kaelthas_resurrection_SpellScript::HandleBeforeCast);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_resurrection_SpellScript();
}
@@ -838,13 +838,13 @@ public:
targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true));
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kaelthas_mind_control_SpellScript::SelectTarget, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_mind_control_SpellScript();
}
@@ -864,13 +864,13 @@ public:
Unit::DealDamage(GetUnitOwner(), GetUnitOwner(), GetUnitOwner()->CountPctFromMaxHealth(5) + 1);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_kaelthas_burn_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_kaelthas_burn_AuraScript();
}
@@ -885,7 +885,7 @@ public:
{
PrepareAuraScript(spell_kaelthas_flame_strike_AuraScript);
bool Load()
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
}
@@ -897,13 +897,13 @@ public:
GetUnitOwner()->ToCreature()->DespawnOrUnsummon(2000);
}
void Register()
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_kaelthas_flame_strike_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_kaelthas_flame_strike_AuraScript();
}
@@ -916,7 +916,7 @@ public:
{
}
bool Execute(uint64 /*execTime*/, uint32 /*diff*/)
bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override
{
if (_owner->IsBeingTeleportedNear())
_owner->m_Events.AddEvent(new lapseTeleport(_owner), _owner->m_Events.CalculateTime(1));
@@ -941,7 +941,7 @@ public:
{
PrepareSpellScript(spell_kaelthas_gravity_lapse_SpellScript);
bool Load()
bool Load() override
{
_currentSpellId = SPELL_GRAVITY_LAPSE_TELEPORT1;
return true;
@@ -958,7 +958,7 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_gravity_lapse_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
@@ -967,7 +967,7 @@ public:
uint32 _currentSpellId;
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_gravity_lapse_SpellScript();
}
@@ -1000,13 +1000,13 @@ public:
GetCaster()->CastSpell(*itr, SPELL_NETHER_BEAM_DAMAGE, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_nether_beam_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_nether_beam_SpellScript();
}
@@ -1028,13 +1028,13 @@ public:
GetCaster()->SummonCreature(NPC_NETHER_VAPOR, GetCaster()->GetPositionX() + 6 * cos(i / 5.0f * 2 * M_PI), GetCaster()->GetPositionY() + 6 * sin(i / 5.0f * 2 * M_PI), GetCaster()->GetPositionZ() + 7.0f + i, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 30000);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_kaelthas_summon_nether_vapor_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_kaelthas_summon_nether_vapor_SpellScript();
}

14
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
View File

@@ -41,24 +41,24 @@ public:
me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_PERIODIC_MANA_LEECH, true);
}
void Reset()
void Reset() override
{
BossAI::Reset();
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER && roll_chance_i(50))
Talk(SAY_SLAY);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -70,7 +70,7 @@ public:
me->CallForHelp(105.0f);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -106,13 +106,13 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetDistance2d(432.59f, 371.93f) > 105.0f;
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_void_reaverAI>(creature);
}

18
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
View File

@@ -25,7 +25,7 @@ public:
uint64 KaelStateRightGUID;
uint64 KaelStateLeftGUID;
void Initialize()
void Initialize() override
{
SetBossNumber(MAX_ENCOUNTER);
AlarGUID = 0;
@@ -39,7 +39,7 @@ public:
KaelStateLeftGUID = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -64,7 +64,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* gobject)
void OnGameObjectCreate(GameObject* gobject) override
{
switch (gobject->GetEntry())
{
@@ -80,7 +80,7 @@ public:
}
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
switch (identifier)
{
@@ -106,7 +106,7 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -117,7 +117,7 @@ public:
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) override
{
if (!str)
{
@@ -150,7 +150,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_the_eye_InstanceMapScript(map);
}
@@ -172,13 +172,13 @@ public:
return true;
}
void Register()
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_the_eye_counterchargeScript::PrepareProc);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_the_eye_counterchargeScript();
}