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

20
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
View File

@@ -41,7 +41,7 @@ public:
EventMap events;
bool canAttack;
void Reset()
void Reset() override
{
events.Reset();
@@ -53,12 +53,12 @@ public:
instance->SetData(DATA_BROGGOK, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
}
void JustSummoned(Creature* summoned)
void JustSummoned(Creature* summoned) override
{
summoned->setFaction(16);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -66,7 +66,7 @@ public:
summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID());
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || !canAttack)
return;
@@ -96,7 +96,7 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (instance)
{
@@ -106,7 +106,7 @@ public:
}
}
void DoAction(int32 action)
void DoAction(int32 action) override
{
switch (action)
{
@@ -127,7 +127,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_broggokAI(creature);
}
@@ -163,7 +163,7 @@ public:
{
PrepareAuraScript(spell_broggok_poison_cloud_AuraScript);
bool Validate(SpellInfo const* spellInfo)
bool Validate(SpellInfo const* spellInfo) override
{
if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].TriggerSpell))
return false;
@@ -179,13 +179,13 @@ public:
GetTarget()->CastCustomSpell(triggerSpell, SPELLVALUE_RADIUS_MOD, mod, (Unit*)NULL, TRIGGERED_FULL_MASK, NULL, aurEff);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_broggok_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_broggok_poison_cloud_AuraScript();
}

24
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
View File

@@ -73,7 +73,7 @@ public:
uint32 checkTimer;
bool addYell;
void Reset()
void Reset() override
{
addYell = false;
checkTimer = 5000;
@@ -87,7 +87,7 @@ public:
instance->SetData(DATA_KELIDAN, NOT_STARTED);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events.ScheduleEvent(EVENT_SPELL_VOLLEY, 1000);
events.ScheduleEvent(EVENT_SPELL_CORRUPTION, 5000);
@@ -100,13 +100,13 @@ public:
instance->SetData(DATA_KELIDAN, IN_PROGRESS);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (urand(0, 1))
Talk(SAY_KILL);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_CHANNELER_ENGAGED)
{
@@ -177,7 +177,7 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DIE);
if (instance)
@@ -212,7 +212,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_SAPPED, apply);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
{
@@ -264,7 +264,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_kelidan_the_breakerAI(creature);
}
@@ -282,7 +282,7 @@ public:
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
}
@@ -294,7 +294,7 @@ public:
return nullptr;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
if (Creature* kelidan = GetKelidan())
kelidan->AI()->DoAction(ACTION_CHANNELER_ENGAGED);
@@ -304,13 +304,13 @@ public:
events.ScheduleEvent(EVENT_SPELL_MARK, urand(5000, 6500));
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (Creature* kelidan = GetKelidan())
kelidan->AI()->DoAction(ACTION_CHANNELER_DIED);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -336,7 +336,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_shadowmoon_channelerAI(creature);
}

12
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
View File

@@ -41,7 +41,7 @@ public:
InstanceScript* instance;
EventMap events;
void Reset()
void Reset() override
{
events.Reset();
if (!instance)
@@ -51,7 +51,7 @@ public:
instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
events.ScheduleEvent(EVENT_SPELL_ACID, 15000);
@@ -66,13 +66,13 @@ public:
instance->HandleGameObject(instance->GetData64(DATA_DOOR2), false);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER && urand(0, 1))
Talk(SAY_KILL);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DIE);
@@ -85,7 +85,7 @@ public:
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -120,7 +120,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_the_makerAI(creature);
}

20
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
View File

@@ -27,7 +27,7 @@ public:
uint64 _broggokLeverGUID;
void Initialize()
void Initialize() override
{
memset(&_auiEncounter, 0, sizeof(_auiEncounter));
memset(&_bossGUIDs, 0, sizeof(_bossGUIDs));
@@ -41,7 +41,7 @@ public:
_broggokLeverGUID = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -60,13 +60,13 @@ public:
}
}
void OnUnitDeath(Unit* unit)
void OnUnitDeath(Unit* unit) override
{
if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == NPC_NASCENT_FEL_ORC)
PrisonerDied(unit->GetGUID());
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
if (go->GetEntry() == 181766) //Final exit door
_doorGUIDs[0] = go->GetGUID();
@@ -102,7 +102,7 @@ public:
_broggokLeverGUID = go->GetGUID(); //Broggok lever
}
uint64 GetData64(uint32 data) const
uint64 GetData64(uint32 data) const override
{
switch (data)
{
@@ -128,7 +128,7 @@ public:
return 0;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -145,7 +145,7 @@ public:
SaveToDB();
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -156,7 +156,7 @@ public:
return saveStream.str();
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
switch (type)
{
@@ -168,7 +168,7 @@ public:
return 0;
}
void Load(const char* strIn)
void Load(const char* strIn) override
{
if (!strIn)
{
@@ -316,7 +316,7 @@ public:
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_blood_furnace_InstanceMapScript(map);
}

14
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
View File

@@ -48,14 +48,14 @@ public:
{
}
void Reset()
void Reset() override
{
Talk(SAY_WIPE);
BossAI::Reset();
_targetGUID = 0;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -67,7 +67,7 @@ public:
events.ScheduleEvent(EVENT_ORBITAL_STRIKE, 20000);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -76,20 +76,20 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
Talk(SAY_SUMMON);
summons.Summon(summon);
summon->SetInCombatWithZone();
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DIE);
BossAI::JustDied(killer);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -163,7 +163,7 @@ public:
uint64 _targetGUID;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_omor_the_unscarredAI>(creature);
}

56
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
View File

@@ -62,7 +62,7 @@ public:
{
}
void Reset()
void Reset() override
{
BossAI::Reset();
me->SetVisible(true);
@@ -71,23 +71,23 @@ public:
me->SummonCreature(NPC_HELLFIRE_SENTRY, -1383.39f, 1711.82f, 82.7961f, 5.67232f);
}
void AttackStart(Unit*)
void AttackStart(Unit*) override
{
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() != NPC_HELLFIRE_SENTRY)
summon->SetInCombatWithZone();
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
instance->SetBossState(DATA_VAZRUDEN, DONE);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == POINT_MIDDLE)
{
@@ -97,7 +97,7 @@ public:
}
}
void SummonedCreatureDies(Creature* summon, Unit*)
void SummonedCreatureDies(Creature* summon, Unit*) override
{
summons.Despawn(summon);
if (summon->GetEntry() == NPC_HELLFIRE_SENTRY && summons.size() == 0)
@@ -112,21 +112,21 @@ public:
}
}
void SummonedCreatureDespawn(Creature* summon)
void SummonedCreatureDespawn(Creature* summon) override
{
summons.Despawn(summon);
if (summon->GetEntry() != NPC_HELLFIRE_SENTRY)
BossAI::EnterEvadeMode();
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if (!me->IsVisible() && summons.size() == 0)
BossAI::EnterEvadeMode();
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_vazruden_the_heraldAI(creature);
}
@@ -143,25 +143,25 @@ public:
{
}
void Reset()
void Reset() override
{
me->SetCanFly(true);
me->SetDisableGravity(true);
events.Reset();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
me->DespawnOrUnsummon(1);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
events.ScheduleEvent(EVENT_CHANGE_POS, 0);
events.ScheduleEvent(EVENT_SPELL_FIREBALL, 5000);
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (me->IsLevitating())
me->Attack(who, true);
@@ -169,7 +169,7 @@ public:
ScriptedAI::AttackStart(who);
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_FLY_DOWN)
{
@@ -179,7 +179,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == POINT_MOTION_TYPE && id == POINT_MIDDLE)
{
@@ -192,7 +192,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -234,7 +234,7 @@ public:
EventMap events;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_nazanAI(creature);
}
@@ -249,24 +249,24 @@ public:
{
boss_vazrudenAI(Creature* creature) : ScriptedAI(creature) { }
void Reset()
void Reset() override
{
events.Reset();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
Talk(SAY_WIPE);
me->DespawnOrUnsummon(1);
}
void EnterCombat(Unit*)
void EnterCombat(Unit*) override
{
events.ScheduleEvent(EVENT_AGGRO_TALK, 5000);
events.ScheduleEvent(EVENT_SPELL_REVENGE, 4000);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -275,13 +275,13 @@ public:
}
}
void JustDied(Unit*)
void JustDied(Unit*) override
{
me->CastSpell(me, SPELL_CALL_NAZAN, true);
Talk(SAY_DIE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -305,7 +305,7 @@ public:
EventMap events;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_vazrudenAI(creature);
}
@@ -326,13 +326,13 @@ public:
target->CastSpell(target, SPELL_SUMMON_LIQUID_FIRE, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_vazruden_fireball_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_vazruden_fireball_SpellScript();
}
@@ -353,13 +353,13 @@ public:
target->GetAI()->DoAction(ACTION_FLY_DOWN);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_vazruden_call_nazan_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_vazruden_call_nazan_SpellScript();
}

14
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
View File

@@ -46,12 +46,12 @@ public:
_taunted = false;
}
void Reset()
void Reset() override
{
BossAI::Reset();
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_AGGRO);
BossAI::EnterCombat(who);
@@ -61,7 +61,7 @@ public:
events.ScheduleEvent(EVENT_RETALIATION, 1000);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!_taunted)
{
@@ -75,7 +75,7 @@ public:
BossAI::MoveInLineOfSight(who);
}
void KilledUnit(Unit*)
void KilledUnit(Unit*) override
{
if (events.GetNextEventTime(EVENT_KILL_TALK) == 0)
{
@@ -84,13 +84,13 @@ public:
}
}
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
Talk(SAY_DIE);
BossAI::JustDied(killer);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -141,7 +141,7 @@ public:
bool _taunted;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_watchkeeper_gargolmarAI(creature);
}

12
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
View File

@@ -15,13 +15,13 @@ public:
{
instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize()
void Initialize() override
{
SetBossNumber(MAX_ENCOUNTERS);
felIronChestGUID = 0;
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -32,7 +32,7 @@ public:
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -43,14 +43,14 @@ public:
return true;
}
std::string GetSaveData()
std::string GetSaveData() override
{
std::ostringstream saveStream;
saveStream << "H R " << GetBossSaveData();
return saveStream.str();
}
void Load(const char* strIn)
void Load(const char* strIn) override
{
if (!strIn)
return;
@@ -77,7 +77,7 @@ public:
uint64 felIronChestGUID;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_ramparts_InstanceMapScript(map);
}

24
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
View File

@@ -71,7 +71,7 @@ class DealDebrisDamage : public BasicEvent
public:
DealDebrisDamage(Creature& creature, uint64 targetGUID) : _owner(creature), _targetGUID(targetGUID) { }
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/)
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override
{
if (Unit* target = ObjectAccessor::GetUnit(_owner, _targetGUID))
target->CastSpell(target, SPELL_DEBRIS_DAMAGE, true, nullptr, nullptr, _owner.GetGUID());
@@ -96,7 +96,7 @@ public:
EventMap events2;
void Reset()
void Reset() override
{
events2.Reset();
events2.ScheduleEvent(EVENT_RANDOM_TAUNT, 90000);
@@ -106,7 +106,7 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
if (events.GetNextEventTime(EVENT_RECENTLY_SPOKEN) == 0)
{
@@ -115,15 +115,15 @@ public:
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
events2.Reset();
_EnterCombat();
@@ -134,7 +134,7 @@ public:
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (events2.ExecuteEvent())
@@ -248,7 +248,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_magtheridonAI>(creature);
}
@@ -269,13 +269,13 @@ public:
target->CastSpell(target, SPELL_BLAZE_SUMMON, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_magtheridon_blaze_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_magtheridon_blaze_SpellScript();
}
@@ -305,7 +305,7 @@ public:
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_MIND_EXHAUSTION, true);
}
void Register()
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_magtheridon_shadow_grasp_AuraScript::HandleDummyApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp_AuraScript::HandleDummyRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
@@ -313,7 +313,7 @@ public:
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_magtheridon_shadow_grasp_AuraScript();
}

20
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
View File

@@ -33,7 +33,7 @@ public:
LoadMinionData(minionData);
}
void Initialize()
void Initialize() override
{
_wardersSet.clear();
_cubesSet.clear();
@@ -41,7 +41,7 @@ public:
_magtheridonGUID = 0;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -57,7 +57,7 @@ public:
}
}
void OnCreatureRemove(Creature* creature)
void OnCreatureRemove(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -67,7 +67,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -89,7 +89,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -111,7 +111,7 @@ public:
}
}
bool SetBossState(uint32 id, EncounterState state)
bool SetBossState(uint32 id, EncounterState state) override
{
if (!InstanceScript::SetBossState(id, state))
return false;
@@ -141,7 +141,7 @@ public:
return true;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
switch (type)
{
@@ -163,7 +163,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -174,7 +174,7 @@ public:
return saveStream.str();
}
void Load(char const* str)
void Load(char const* str) override
{
if (!str)
{
@@ -214,7 +214,7 @@ public:
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_magtheridons_lair_InstanceMapScript(map);
}

28
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
View File

@@ -56,7 +56,7 @@ public:
boss_grand_warlock_nethekurseAI(Creature* creature) : BossAI(creature, DATA_NETHEKURSE) { }
EventMap events2;
void Reset()
void Reset() override
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
EventStage = EVENT_STAGE_NONE;
@@ -75,13 +75,13 @@ public:
me->SummonCreature(NPC_FEL_ORC_CONVERT, 189.616f, 259.866f, -13.1966f, 1.95748f);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DIE);
_JustDied();
}
void SetData(uint32 data, uint32 value)
void SetData(uint32 data, uint32 value) override
{
if (data != SETDATA_DATA)
return;
@@ -108,7 +108,7 @@ public:
}
}
void AttackStart(Unit* who)
void AttackStart(Unit* who) override
{
if (EventStage < EVENT_STAGE_MAIN)
return;
@@ -119,14 +119,14 @@ public:
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
summon->SetReactState(REACT_DEFENSIVE);
summon->SetRegeneratingHealth(false);
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (me->IsWithinDistInMap(who, 30.0f))
{
@@ -155,16 +155,16 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Talk(SAY_SLAY);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
uint32 eventId = events2.ExecuteEvent();
@@ -238,7 +238,7 @@ public:
uint32 EventStage;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_grand_warlock_nethekurseAI>(creature);
}
@@ -258,13 +258,13 @@ public:
amount = 1000;
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_tsh_shadow_sear_AuraScript::CalculateDamageAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_tsh_shadow_sear_AuraScript();
}
@@ -295,13 +295,13 @@ public:
}
}
void Register()
void Register() override
{
OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_tsh_shadow_bolt_SpellScript::SelectRandomPlayer, EFFECT_0, TARGET_UNIT_TARGET_ENEMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_tsh_shadow_bolt_SpellScript();
}

18
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
View File

@@ -79,7 +79,7 @@ public:
return summons.GetCreatureWithEntry(NPC_RIGHT_HEAD);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
@@ -99,12 +99,12 @@ public:
events.ScheduleEvent(EVENT_RESET_THREAT, 30000);
}
void JustSummoned(Creature* summoned)
void JustSummoned(Creature* summoned) override
{
summons.Summon(summoned);
}
void KilledUnit(Unit* /*victim*/)
void KilledUnit(Unit* /*victim*/) override
{
Creature* head = nullptr;
uint32 eventId = EVENT_KILL_YELL_LEFT;
@@ -125,7 +125,7 @@ public:
events2.ScheduleEvent(eventId, 3000);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Creature* LeftHead = GetLeftHead();
Creature* RightHead = GetRightHead();
@@ -141,7 +141,7 @@ public:
instance->SetBossState(DATA_OMROGG, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events2.Update(diff);
switch (uint32 eventId = events2.ExecuteEvent())
@@ -209,7 +209,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_warbringer_omroggAI>(creature);
}
@@ -224,13 +224,13 @@ public:
{
npc_omrogg_headsAI(Creature* creature) : NullCreatureAI(creature) { timer = 0; }
void SetData(uint32 data, uint32 value)
void SetData(uint32 data, uint32 value) override
{
if (data == SETDATA_DATA && value == SETDATA_YELL)
timer = 1;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (timer)
{
@@ -246,7 +246,7 @@ public:
uint32 timer;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_omrogg_headsAI>(creature);
}

16
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
View File

@@ -52,7 +52,7 @@ public:
{
boss_warchief_kargath_bladefistAI(Creature* creature) : BossAI(creature, DATA_KARGATH) { }
void InitializeAI()
void InitializeAI() override
{
BossAI::InitializeAI();
if (instance)
@@ -60,7 +60,7 @@ public:
executioner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
_JustDied();
@@ -70,7 +70,7 @@ public:
executioner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
_EnterCombat();
@@ -82,7 +82,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_CHARGE, 0);
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
if (summon->GetEntry() != NPC_SHATTERED_ASSASSIN)
summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
@@ -90,13 +90,13 @@ public:
summons.Summon(summon);
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() == TYPEID_PLAYER)
Talk(SAY_SLAY);
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type != POINT_MOTION_TYPE || id != 1)
return;
@@ -105,7 +105,7 @@ public:
events.ScheduleEvent(EVENT_MOVE_TO_NEXT_POINT, 0);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -165,7 +165,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_warchief_kargath_bladefistAI>(creature);
}

28
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
View File

@@ -12,7 +12,7 @@ class instance_shattered_halls : public InstanceMapScript
public:
instance_shattered_halls() : InstanceMapScript("instance_shattered_halls", 540) { }
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_shattered_halls_InstanceMapScript(map);
}
@@ -21,7 +21,7 @@ public:
{
instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { }
void Initialize()
void Initialize() override
{
SetBossNumber(ENCOUNTER_COUNT);
nethekurseDoor1GUID = 0;
@@ -34,13 +34,13 @@ public:
RescueTimer = 100 * MINUTE * IN_MILLISECONDS;
}
void OnPlayerEnter(Player* player)
void OnPlayerEnter(Player* player) override
{
if (TeamIdInInstance == TEAM_NEUTRAL)
TeamIdInInstance = player->GetTeamId();
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -57,7 +57,7 @@ public:
}
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
if (TeamIdInInstance == TEAM_NEUTRAL)
{
@@ -95,7 +95,7 @@ public:
}
}
bool SetBossState(uint32 type, EncounterState state)
bool SetBossState(uint32 type, EncounterState state) override
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -118,7 +118,7 @@ public:
return true;
}
void SetData(uint32 type, uint32 data)
void SetData(uint32 type, uint32 data) override
{
if (type == DATA_ENTERED_ROOM && data == DATA_ENTERED_ROOM && RescueTimer == 100 * MINUTE * IN_MILLISECONDS)
{
@@ -132,7 +132,7 @@ public:
}
}
uint64 GetData64(uint32 data) const
uint64 GetData64(uint32 data) const override
{
switch (data)
{
@@ -146,7 +146,7 @@ public:
return 0;
}
void Update(uint32 diff)
void Update(uint32 diff) override
{
if (RescueTimer && RescueTimer < 100 * MINUTE * IN_MILLISECONDS)
{
@@ -177,7 +177,7 @@ public:
}
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -188,7 +188,7 @@ public:
return saveStream.str();
}
void Load(const char* strIn)
void Load(const char* strIn) override
{
if (!strIn)
{
@@ -255,14 +255,14 @@ public:
target->CastSpell(target, 30953, true);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_tsh_shoot_flame_arrow_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_tsh_shoot_flame_arrow_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_tsh_shoot_flame_arrow_SpellScript();
}
@@ -273,7 +273,7 @@ class at_shattered_halls_execution : public AreaTriggerScript
public:
at_shattered_halls_execution() : AreaTriggerScript("at_shattered_halls_execution") { }
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/) override
{
if (InstanceScript* instanceScript = player->GetInstanceScript())
instanceScript->SetData(DATA_ENTERED_ROOM, DATA_ENTERED_ROOM);