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

28
src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
View File

@@ -51,13 +51,13 @@ public:
{
boss_gruulAI(Creature* creature) : BossAI(creature, DATA_GRUUL) { }
void Reset()
void Reset() override
{
_Reset();
_caveInTimer = 29000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -69,7 +69,7 @@ public:
events.ScheduleEvent(EVENT_GROUND_SLAM, 35000);
}
void KilledUnit(Unit* /*who*/)
void KilledUnit(Unit* /*who*/) override
{
if (events.GetNextEventTime(EVENT_RECENTLY_SPOKEN) == 0)
{
@@ -78,13 +78,13 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -136,7 +136,7 @@ public:
uint32 _caveInTimer;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_gruulAI>(creature);
}
@@ -157,13 +157,13 @@ public:
target->KnockbackFrom(GetCaster()->GetPositionX(), GetCaster()->GetPositionY(), 15.0f, 15.0f);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gruul_ground_slam_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_gruul_ground_slam_SpellScript();
}
@@ -184,13 +184,13 @@ public:
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_STONED, true);
}
void Register()
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_gruul_ground_slam_trigger_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_gruul_ground_slam_trigger_AuraScript();
}
@@ -214,13 +214,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_gruul_shatter_SpellScript();
}
@@ -249,13 +249,13 @@ public:
SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius)));
}
void Register()
void Register() override
{
OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_gruul_shatter_effect_SpellScript();
}

60
src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
View File

@@ -71,13 +71,13 @@ public:
{
boss_high_king_maulgarAI(Creature* creature) : BossAI(creature, DATA_MAULGAR) { }
void Reset()
void Reset() override
{
_Reset();
me->SetLootMode(0);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_RECENTLY_SPOKEN) == 0)
{
@@ -86,14 +86,14 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
if (instance->GetData(DATA_ADDS_KILLED) == MAX_ADD_NUMBER)
_JustDied();
}
void DoAction(int32 actionId)
void DoAction(int32 actionId) override
{
if (me->IsAlive())
{
@@ -110,7 +110,7 @@ public:
}
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -121,7 +121,7 @@ public:
events.ScheduleEvent(EVENT_CHECK_HEALTH, 500);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -171,7 +171,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_high_king_maulgarAI>(creature);
}
@@ -193,14 +193,14 @@ public:
SummonList summons;
InstanceScript* instance;
void Reset()
void Reset() override
{
events.Reset();
summons.DespawnAll();
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!who)
return;
@@ -209,7 +209,7 @@ public:
me->GetMotionMaster()->MoveChase(who, 25.0f);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SetInCombatWithZone();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -219,17 +219,17 @@ public:
events.ScheduleEvent(EVENT_ADD_ABILITY3, 20000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
instance->SetData(DATA_ADDS_KILLED, 1);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -259,7 +259,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_olm_the_summonerAI>(creature);
}
@@ -280,13 +280,13 @@ public:
EventMap events;
InstanceScript* instance;
void Reset()
void Reset() override
{
events.Reset();
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SetInCombatWithZone();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -297,12 +297,12 @@ public:
events.ScheduleEvent(EVENT_ADD_ABILITY4, 30000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
instance->SetData(DATA_ADDS_KILLED, 1);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -337,7 +337,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_kiggler_the_crazedAI>(creature);
}
@@ -358,13 +358,13 @@ public:
EventMap events;
InstanceScript* instance;
void Reset()
void Reset() override
{
events.Reset();
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SetInCombatWithZone();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -374,12 +374,12 @@ public:
events.ScheduleEvent(EVENT_ADD_ABILITY3, 20000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
instance->SetData(DATA_ADDS_KILLED, 1);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -409,7 +409,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_blindeye_the_seerAI>(creature);
}
@@ -430,13 +430,13 @@ public:
EventMap events;
InstanceScript* instance;
void Reset()
void Reset() override
{
events.Reset();
instance->SetBossState(DATA_MAULGAR, NOT_STARTED);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (!who)
return;
@@ -445,7 +445,7 @@ public:
me->GetMotionMaster()->MoveChase(who, 25.0f);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SetInCombatWithZone();
instance->SetBossState(DATA_MAULGAR, IN_PROGRESS);
@@ -455,12 +455,12 @@ public:
events.ScheduleEvent(EVENT_ADD_ABILITY3, 20000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
instance->SetData(DATA_ADDS_KILLED, 1);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -489,7 +489,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_krosh_firehandAI>(creature);
}

20
src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
View File

@@ -39,7 +39,7 @@ public:
_addsKilled = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -55,7 +55,7 @@ public:
}
}
void OnCreatureRemove(Creature* creature)
void OnCreatureRemove(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -69,7 +69,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -80,7 +80,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -91,7 +91,7 @@ public:
}
}
bool SetBossState(uint32 id, EncounterState state)
bool SetBossState(uint32 id, EncounterState state) override
{
if (!InstanceScript::SetBossState(id, state))
return false;
@@ -101,21 +101,21 @@ public:
return true;
}
void SetData(uint32 type, uint32 /*id*/)
void SetData(uint32 type, uint32 /*id*/) override
{
if (type == DATA_ADDS_KILLED)
if (Creature* maulgar = instance->GetCreature(_maulgarGUID))
maulgar->AI()->DoAction(++_addsKilled);
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
if (type == DATA_ADDS_KILLED)
return _addsKilled;
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -126,7 +126,7 @@ public:
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) override
{
if (!str)
{
@@ -163,7 +163,7 @@ public:
uint64 _maulgarGUID;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_gruuls_lair_InstanceMapScript(map);
}