nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-29 00:23:48 +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

16
src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
View File

@@ -55,7 +55,7 @@ class boss_archavon : public CreatureScript
InstanceScript* pInstance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
if (pInstance)
@@ -73,7 +73,7 @@ class boss_archavon : public CreatureScript
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasAura(SPELL_STONED_AURA))
{
@@ -83,7 +83,7 @@ class boss_archavon : public CreatureScript
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000);
events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000);
@@ -96,7 +96,7 @@ class boss_archavon : public CreatureScript
}
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
if (pInstance)
{
@@ -104,7 +104,7 @@ class boss_archavon : public CreatureScript
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
{
@@ -163,7 +163,7 @@ class boss_archavon : public CreatureScript
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_archavonAI(creature);
}
@@ -204,13 +204,13 @@ class spell_archavon_rock_shards : public SpellScriptLoader
caster->CastSpell(target, spellId, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_archavon_rock_shards_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_archavon_rock_shards_SpellScript();
}

26
src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
View File

@@ -74,7 +74,7 @@ public:
me->SummonCreature(NPC_TEMPEST_MINION, TempestMinions[i], TEMPSUMMON_CORPSE_DESPAWN, 0);
}
void Reset()
void Reset() override
{
events.Reset();
ResetSummons();
@@ -93,7 +93,7 @@ public:
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasAura(SPELL_STONED_AURA))
return;
@@ -101,25 +101,25 @@ public:
ScriptedAI::AttackStart(who);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void SummonedCreatureDies(Creature* cr, Unit*)
void SummonedCreatureDies(Creature* cr, Unit*) override
{
summons.Despawn(cr);
events.ScheduleEvent(EVENT_SUMMON_NEXT_MINION, 4000);
}
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* target, const SpellInfo* spellInfo) override
{
// restore minions health
if (spellInfo->Id == SPELL_OVERCHARGE)
target->SetFullHealth();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.Reset();
if (summons.size() < 4)
@@ -136,7 +136,7 @@ public:
pInstance->SetData(EVENT_EMALON, IN_PROGRESS);
}
void JustDied(Unit* )
void JustDied(Unit* ) override
{
summons.DespawnAll();
events.Reset();
@@ -144,7 +144,7 @@ public:
pInstance->SetData(EVENT_EMALON, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -185,7 +185,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_emalonAI(creature);
}
@@ -212,13 +212,13 @@ public:
PreventDefaultAction();
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_voa_overcharge_AuraScript::HandlePeriodicDummy, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_voa_overcharge_AuraScript();
}
@@ -245,13 +245,13 @@ public:
SetHitDamage(damage);
}
void Register()
void Register() override
{
OnHit += SpellHitFn(spell_voa_lightning_nova_SpellScript::HandleOnHit);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_voa_lightning_nova_SpellScript();
}

28
src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
View File

@@ -46,7 +46,7 @@ public:
EventMap events;
uint32 rotateTimer;
void Reset()
void Reset() override
{
rotateTimer = 0;
events.Reset();
@@ -64,7 +64,7 @@ public:
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasAura(SPELL_STONED_AURA))
return;
@@ -72,7 +72,7 @@ public:
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->CastSpell(me, SPELL_BURNING_FURY, true);
@@ -84,13 +84,13 @@ public:
pInstance->SetData(EVENT_KORALON, IN_PROGRESS);
}
void JustDied(Unit* )
void JustDied(Unit* ) override
{
if (pInstance)
pInstance->SetData(EVENT_KORALON, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (rotateTimer)
{
@@ -144,7 +144,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_koralonAI(creature);
}
@@ -165,13 +165,13 @@ public:
GetCaster()->CastSpell(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), SPELL_FLAMING_CINDER_MISSILE, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_voa_flaming_cinder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_voa_flaming_cinder_SpellScript();
}
@@ -186,7 +186,7 @@ public:
{
PrepareAuraScript(spell_koralon_meteor_fists_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_METEOR_FISTS_DAMAGE))
return false;
@@ -199,13 +199,13 @@ public:
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, NULL, aurEff);
}
void Register()
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_koralon_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_koralon_meteor_fists_AuraScript();
}
@@ -220,7 +220,7 @@ public:
{
PrepareAuraScript(spell_flame_warder_meteor_fists_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_FW_METEOR_FISTS_DAMAGE))
return false;
@@ -233,13 +233,13 @@ public:
GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, NULL, aurEff);
}
void Register()
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_flame_warder_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_flame_warder_meteor_fists_AuraScript();
}

28
src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
View File

@@ -63,7 +63,7 @@ public:
EventMap events;
SummonList summons;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
@@ -81,14 +81,14 @@ public:
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->HasAura(SPELL_STONED_AURA))
return;
ScriptedAI::AttackStart(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->CastSpell(me, SPELL_FROZEN_MALLET, true);
@@ -100,7 +100,7 @@ public:
pInstance->SetData(EVENT_TORAVON, IN_PROGRESS);
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
if (pInstance)
{
@@ -109,12 +109,12 @@ public:
}
}
void JustSummoned(Creature* cr)
void JustSummoned(Creature* cr) override
{
summons.Summon(cr);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -149,7 +149,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_toravonAI(creature);
}
@@ -168,19 +168,19 @@ public:
uint32 switchTimer;
void Reset()
void Reset() override
{
switchTimer = 9000;
me->CastSpell(me, SPELL_FROZEN_ORB_AURA, true);
me->CastSpell(me, SPELL_FROZEN_ORB_DMG, true);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SetInCombatWithZone();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
switchTimer += diff;
if (switchTimer >= 10000)
@@ -193,7 +193,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_frozen_orbAI(creature);
}
@@ -210,12 +210,12 @@ public:
{
}
void Reset()
void Reset() override
{
me->CastSpell(me, SPELL_FROZEN_ORB_STALKER_VISUAL, true);
}
void JustSummoned(Creature* cr)
void JustSummoned(Creature* cr) override
{
if (InstanceScript* pInstance = me->GetInstanceScript())
if (Creature* toravon = ObjectAccessor::GetCreature(*me, pInstance->GetData64(EVENT_TORAVON)))
@@ -224,7 +224,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_frozen_orb_stalkerAI(creature);
}

24
src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
View File

@@ -30,7 +30,7 @@ public:
{
}
void Initialize()
void Initialize() override
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
memset(&bossGUIDs, 0, sizeof(bossGUIDs));
@@ -42,7 +42,7 @@ public:
stoned = false;
}
void OnPlayerEnter(Player* )
void OnPlayerEnter(Player* ) override
{
if (stoned)
{
@@ -55,7 +55,7 @@ public:
}
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
checkTimer += diff;
if (checkTimer >= 60000)
@@ -115,7 +115,7 @@ public:
}
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -128,7 +128,7 @@ public:
return false;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -147,21 +147,21 @@ public:
}
}
uint64 GetData64(uint32 identifier) const
uint64 GetData64(uint32 identifier) const override
{
if (identifier < MAX_ENCOUNTER)
return bossGUIDs[identifier];
return 0;
}
uint32 GetData(uint32 identifier) const
uint32 GetData(uint32 identifier) const override
{
if (identifier == DATA_STONED)
return (uint32)stoned;
return 0;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch(type)
{
@@ -196,7 +196,7 @@ public:
}
}
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/)
bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override
{
switch (criteria_id)
{
@@ -218,7 +218,7 @@ public:
return false;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -229,7 +229,7 @@ public:
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if (!in)
{
@@ -269,7 +269,7 @@ public:
uint64 bossGUIDs[MAX_ENCOUNTER];
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_vault_of_archavon_InstanceMapScript(map);
}