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

22
src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
View File

@@ -38,7 +38,7 @@ class boss_dred : public CreatureScript
public:
boss_dred() : CreatureScript("boss_dred") {}
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_dredAI>(creature);
}
@@ -49,26 +49,26 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
_raptorCount = 0;
}
uint32 GetData(uint32 data) const
uint32 GetData(uint32 data) const override
{
if (data == me->GetEntry())
return uint32(_raptorCount);
return 0;
}
void SetData(uint32 type, uint32)
void SetData(uint32 type, uint32) override
{
if (type == me->GetEntry())
++_raptorCount;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
BossAI::EnterCombat(who);
_raptorCount = 0;
@@ -85,7 +85,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -159,13 +159,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dred_grievious_bite_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_dred_grievious_bite_AuraScript();
}
@@ -185,13 +185,13 @@ public:
GetCaster()->SummonCreature(RAND(NPC_DRAKKARI_GUTRIPPER, NPC_DRAKKARI_SCYTHECLAW), -522.02f, -718.89f, 30.26f, 2.41f);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dred_raptor_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_dred_raptor_call_SpellScript();
}
@@ -204,7 +204,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
if (!target)
return false;

36
src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
View File

@@ -72,7 +72,7 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
instance->SetBossState(DATA_NOVOS_CRYSTALS, IN_PROGRESS);
@@ -86,22 +86,22 @@ public:
_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 type, uint32)
void SetData(uint32 type, uint32) override
{
if (type == me->GetEntry())
_achievement = false;
}
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -139,14 +139,14 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
instance->SetBossState(DATA_NOVOS_CRYSTALS, DONE);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -155,7 +155,7 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) && summon->GetEntry() != NPC_CRYSTAL_CHANNEL_TARGET && summon->GetEntry() != NPC_CRYSTAL_HANDLER)
@@ -164,7 +164,7 @@ public:
summon->SetInCombatWithZone();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -232,7 +232,7 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return !SelectTargetFromPlayerList(80.0f);
}
@@ -246,7 +246,7 @@ public:
bool _achievement;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_novosAI>(creature);
}
@@ -267,13 +267,13 @@ public:
target->CastSpell(GetCaster(), SPELL_BEAM_CHANNEL, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_novos_despawn_crystal_handler_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_novos_despawn_crystal_handler_SpellScript();
}
@@ -295,13 +295,13 @@ public:
crystal->SetGoState(GO_STATE_READY);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_novos_crystal_handler_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_novos_crystal_handler_death_AuraScript();
}
@@ -322,13 +322,13 @@ public:
GetCaster()->CastSpell((Unit*)NULL, SPELL_COPY_OF_SUMMON_MINIONS, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_novos_summon_minions_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_novos_summon_minions_SpellScript();
}
@@ -339,7 +339,7 @@ class achievement_oh_novos : public AchievementCriteriaScript
public:
achievement_oh_novos() : AchievementCriteriaScript("achievement_oh_novos") { }
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
return target && target->GetAI()->GetData(target->GetEntry());
}

26
src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
View File

@@ -57,7 +57,7 @@ class boss_tharon_ja : public CreatureScript
public:
boss_tharon_ja() : CreatureScript("boss_tharon_ja") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_tharon_jaAI>(creature);
}
@@ -68,7 +68,7 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);
@@ -77,7 +77,7 @@ public:
me->CastSpell(me, SPELL_CLEAR_GIFT, true);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -87,7 +87,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_TURN_FLESH, 1000);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -96,7 +96,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_TURN_BONES && me->IsAlive())
{
@@ -106,7 +106,7 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
@@ -119,7 +119,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -212,13 +212,13 @@ public:
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_tharon_ja_curse_of_life_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_tharon_ja_curse_of_life_AuraScript();
}
@@ -250,14 +250,14 @@ public:
GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_tharon_ja_dummy_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_tharon_ja_dummy_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_tharon_ja_dummy_AuraScript();
}
@@ -278,13 +278,13 @@ public:
target->RemoveAura(SPELL_GIFT_OF_THARON_JA);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript();
}

30
src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
View File

@@ -52,14 +52,14 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
events2.Reset();
events2.ScheduleEvent(EVENT_SPAWN_INVADERS, 30000);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
events.ScheduleEvent(EVENT_SPELL_INFECTED_WOUND, urand(6000, 10000));
events.ScheduleEvent(EVENT_SPELL_CRUSH, urand(3000, 5000));
@@ -76,13 +76,13 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DEATH);
BossAI::JustDied(killer);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -91,12 +91,12 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())
@@ -142,7 +142,7 @@ public:
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const
bool CheckEvadeIfOutOfCombatArea() const override
{
return me->GetHomePosition().GetExactDist2d(me) > 60.0f;
}
@@ -151,7 +151,7 @@ public:
EventMap events2;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_trollgoreAI>(creature);
}
@@ -172,13 +172,13 @@ public:
target->CastSpell(GetCaster(), SPELL_CONSUME_AURA, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_trollgore_consume_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_trollgore_consume_SpellScript();
}
@@ -206,14 +206,14 @@ public:
target->DespawnOrUnsummon(1);
}
void Register()
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
AuraScript* GetAuraScript() const override
{
return new spell_trollgore_corpse_explode_AuraScript();
}
@@ -234,13 +234,13 @@ public:
target->CastSpell(GetCaster(), uint32(GetEffectValue()), true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_trollgore_invader_taunt_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_trollgore_invader_taunt_SpellScript();
}
@@ -253,7 +253,7 @@ public:
{
}
bool OnCheck(Player* /*player*/, Unit* target)
bool OnCheck(Player* /*player*/, Unit* target) override
{
if (!target)
return false;

20
src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
View File

@@ -28,7 +28,7 @@ public:
LoadDoorData(doorData);
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -41,7 +41,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -54,14 +54,14 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() override
{
std::ostringstream saveStream;
saveStream << "D K " << GetBossSaveData();
return saveStream.str();
}
void Load(const char* in)
void Load(const char* in) override
{
if( !in )
return;
@@ -83,7 +83,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_drak_tharon_keep_InstanceScript(map);
}
@@ -98,7 +98,7 @@ public:
{
PrepareAuraScript(spell_dtk_raise_dead_AuraScript)
bool Load()
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
}
@@ -109,13 +109,13 @@ public:
GetUnitOwner()->SummonCreature(NPC_RISEN_DRAKKARI_WARRIOR, *GetUnitOwner());
}
void Register()
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_dtk_raise_dead_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_dtk_raise_dead_AuraScript();
}
@@ -135,13 +135,13 @@ public:
GetCaster()->CastSpell(GetCaster(), RAND(SPELL_SUMMON_DRAKKARI_SHAMAN, SPELL_SUMMON_DRAKKARI_GUARDIAN), true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dtk_summon_random_drakkari_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_dtk_summon_random_drakkari_SpellScript();
}