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

26
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
View File

@@ -84,7 +84,7 @@ public:
{
boss_arlokkAI(Creature* creature) : BossAI(creature, DATA_ARLOKK) { }
void Reset()
void Reset() override
{
if (events.IsInPhase(PHASE_TWO))
me->HandleStatModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, 35.0f, false); // hack
@@ -97,13 +97,13 @@ public:
me->GetMotionMaster()->MovePoint(0, PosMoveOnSpawn[0]);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(7000, 9000), 0, PHASE_ONE);
@@ -139,7 +139,7 @@ public:
}
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
BossAI::EnterEvadeMode();
if (GameObject* object = ObjectAccessor::GetGameObject(*me, instance->GetData64(GO_GONG_OF_BETHEKK)))
@@ -147,7 +147,7 @@ public:
me->DespawnOrUnsummon(4000);
}
void SetData(uint32 id, uint32 /*value*/)
void SetData(uint32 id, uint32 /*value*/) override
{
if (id == 1)
--_summonCountA;
@@ -155,7 +155,7 @@ public:
--_summonCountB;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -289,7 +289,7 @@ public:
uint64 _triggersSideBGUID[5];
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetZulGurubAI<boss_arlokkAI>(creature);
}
@@ -325,7 +325,7 @@ public:
{
npc_zulian_prowlerAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { }
void Reset()
void Reset() override
{
if (me->GetPositionY() < -1625.0f)
_sideData = 1;
@@ -340,20 +340,20 @@ public:
_events.ScheduleEvent(EVENT_ATTACK, 6000);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
me->GetMotionMaster()->Clear(false);
me->RemoveAura(SPELL_SNEAK_RANK_1_1);
me->RemoveAura(SPELL_SNEAK_RANK_1_2);
}
void SpellHit(Unit* caster, SpellInfo const* spell)
void SpellHit(Unit* caster, SpellInfo const* spell) override
{
if (spell->Id == SPELL_MARK_OF_ARLOKK_TRIGGER) // Should only hit if line of sight
me->Attack(caster, true);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (Unit* arlokk = ObjectAccessor::GetUnit(*me, _instance->GetData64(NPC_ARLOKK)))
{
@@ -363,7 +363,7 @@ public:
me->DespawnOrUnsummon(4000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (UpdateVictim())
{
@@ -393,7 +393,7 @@ public:
InstanceScript* _instance;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetZulGurubAI<npc_zulian_prowlerAI>(creature);
}

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
View File

@@ -38,17 +38,17 @@ public:
{
boss_gahzrankaAI(Creature* creature) : BossAI(creature, DATA_GAHZRANKA) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_FROSTBREATH, 8000);
@@ -56,7 +56,7 @@ public:
events.ScheduleEvent(EVENT_SLAM, 17000);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -91,7 +91,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_gahzrankaAI(creature);
}

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
View File

@@ -36,24 +36,24 @@ public:
{
boss_grilekAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_AVATAR, urand(15000, 25000));
events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(15000, 25000));
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -92,7 +92,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_grilekAI(creature);
}

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
View File

@@ -62,17 +62,17 @@ public:
{
boss_hakkarAI(Creature* creature) : BossAI(creature, DATA_HAKKAR) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90000);
@@ -93,7 +93,7 @@ public:
Talk(SAY_AGGRO);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -158,7 +158,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_hakkarAI>(creature);
}

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
View File

@@ -37,17 +37,17 @@ public:
{
boss_hazzarahAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_MANABURN, urand(4000, 10000));
@@ -55,7 +55,7 @@ public:
events.ScheduleEvent(EVENT_ILLUSIONS, urand(10000, 18000));
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -100,7 +100,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_hazzarahAI(creature);
}

20
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
View File

@@ -74,18 +74,18 @@ public:
{
boss_jeklikAI(Creature* creature) : BossAI(creature, DATA_JEKLIK) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
Talk(SAY_AGGRO);
@@ -100,7 +100,7 @@ public:
DoCast(me, SPELL_BAT_FORM);
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
if (events.IsInPhase(PHASE_ONE) && !HealthAbovePct(50))
{
@@ -117,7 +117,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -188,7 +188,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetZulGurubAI<boss_jeklikAI>(creature);
}
@@ -206,15 +206,15 @@ public:
uint32 Bomb_Timer;
void Reset()
void Reset() override
{
Bomb_Timer = 2000;
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -234,7 +234,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_batriderAI(creature);
}

26
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
View File

@@ -54,17 +54,17 @@ public:
{
boss_jindoAI(Creature* creature) : BossAI(creature, DATA_JINDO) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_BRAINWASHTOTEM, 20000);
@@ -75,7 +75,7 @@ public:
Talk(SAY_AGGRO);
}
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 new boss_jindoAI(creature);
}
@@ -192,16 +192,16 @@ public:
InstanceScript* instance;
void Reset()
void Reset() override
{
Heal_Timer = 2000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//Heal_Timer
if (Heal_Timer <= diff)
@@ -217,7 +217,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_healing_wardAI>(creature);
}
@@ -239,15 +239,15 @@ public:
uint32 ShadowShock_Timer;
void Reset()
void Reset() override
{
ShadowShock_Timer = 1000;
DoCast(me, SPELL_INVISIBLE, true);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//ShadowShock_Timer
@@ -262,7 +262,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_shade_of_jindoAI(creature);
}

38
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
View File

@@ -101,7 +101,7 @@ public:
{
boss_mandokirAI(Creature* creature) : BossAI(creature, DATA_MANDOKIR) { }
void Reset()
void Reset() override
{
if (me->GetPositionZ() > 140.0f)
{
@@ -117,7 +117,7 @@ public:
me->Mount(MODEL_OHGAN_MOUNT);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
// Do not want to unsummon Ohgan
for (int i = 0; i < CHAINED_SPIRT_COUNT; ++i)
@@ -127,7 +127,7 @@ public:
instance->SaveToDB();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_OVERPOWER, urand(7000, 9000));
@@ -150,7 +150,7 @@ public:
DoZoneInCombat();
}
void KilledUnit(Unit* victim)
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
return;
@@ -166,7 +166,7 @@ public:
}
}
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 type, uint32 id) override
{
if (type == WAYPOINT_MOTION_TYPE)
{
@@ -180,7 +180,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
events.Update(diff);
@@ -266,7 +266,7 @@ public:
uint64 chainedSpirtGUIDs[CHAINED_SPIRT_COUNT];
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetZulGurubAI<boss_mandokirAI>(creature);
}
@@ -288,19 +288,19 @@ public:
{
npc_ohganAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
void Reset()
void Reset() override
{
SunderArmor_Timer = 5000;
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
instance->SetBossState(DATA_OHGAN, DONE);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
// Return since we have no target
if (!UpdateVictim())
@@ -321,7 +321,7 @@ public:
InstanceScript* instance;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetZulGurubAI<npc_ohganAI>(creature);
}
@@ -342,20 +342,20 @@ public:
{
npc_vilebranch_speakerAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
void Reset()
void Reset() override
{
demoralizing_Shout_Timer = urand(2000, 4000);
cleave_Timer = urand(5000, 8000);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
instance->SetBossState(DATA_MANDOKIR, SPECIAL);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
// Return since we have no target
if (!UpdateVictim())
@@ -384,7 +384,7 @@ public:
InstanceScript* instance;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_vilebranch_speakerAI>(creature);
}
@@ -407,13 +407,13 @@ public:
caster->CastSpell(target, SPELL_WATCH_CHARGE);
}
void Register()
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(spell_threatening_gaze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
AuraScript* GetAuraScript() const override
{
return new spell_threatening_gaze_AuraScript();
}

18
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
View File

@@ -61,27 +61,27 @@ public:
{
boss_marliAI(Creature* creature) : BossAI(creature, DATA_MARLI) { }
void Reset()
void Reset() override
{
if (events.IsInPhase(PHASE_THREE))
me->HandleStatModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, 35.0f, false); // hack
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1000, 0, PHASE_ONE);
Talk(SAY_AGGRO);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -202,7 +202,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_marliAI(creature);
}
@@ -220,16 +220,16 @@ public:
uint32 LevelUp_Timer;
void Reset()
void Reset() override
{
LevelUp_Timer = 3000;
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//Return since we have no target
if (!UpdateVictim())
@@ -247,7 +247,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_spawn_of_marliAI(creature);
}

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
View File

@@ -44,7 +44,7 @@ public:
bool Invisible;
bool Ambushed;
void Reset()
void Reset() override
{
_Reset();
Invisible_Timer = urand(8000, 18000);
@@ -57,17 +57,17 @@ public:
Ambushed = false;
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -152,7 +152,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_renatakiAI(creature);
}

28
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
View File

@@ -76,7 +76,7 @@ public:
bool Enraged;
bool WasDead;
void Reset()
void Reset() override
{
if (events.IsInPhase(PHASE_TWO))
me->HandleStatModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, 35.0f, false); // hack
@@ -85,13 +85,13 @@ public:
WasDead = false;
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_DEATH);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_MORTALCLEAVE, 4000, 0, PHASE_ONE); // Phase 1
@@ -101,12 +101,12 @@ public:
Talk(SAY_AGGRO);
}
void JustReachedHome()
void JustReachedHome() override
{
instance->SetBossState(DATA_THEKAL, NOT_STARTED);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -237,7 +237,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<boss_thekalAI>(creature);
}
@@ -266,7 +266,7 @@ public:
InstanceScript* instance;
void Reset()
void Reset() override
{
Shield_Timer = 1000;
BloodLust_Timer = 16000;
@@ -282,11 +282,11 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -390,7 +390,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_zealot_lorkhanAI>(creature);
}
@@ -424,7 +424,7 @@ public:
InstanceScript* instance;
void Reset()
void Reset() override
{
SweepingStrikes_Timer = 13000;
SinisterStrike_Timer = 8000;
@@ -441,11 +441,11 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -544,7 +544,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return GetInstanceAI<npc_zealot_zathAI>(creature);
}

12
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
View File

@@ -80,7 +80,7 @@ public:
{
boss_venoxisAI(Creature* creature) : BossAI(creature, DATA_VENOXIS) { }
void Reset()
void Reset() override
{
_Reset();
// remove all spells and auras from previous attempts
@@ -93,14 +93,14 @@ public:
events.SetPhase(PHASE_ONE);
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
Talk(SAY_VENOXIS_DEATH);
me->RemoveAllAuras();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
me->SetReactState(REACT_AGGRESSIVE);
@@ -119,7 +119,7 @@ public:
DoZoneInCombat();
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
// check if venoxis is ready to transform
if (!_transformed && !HealthAbovePct(50))
@@ -136,7 +136,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -251,7 +251,7 @@ public:
bool _frenzied;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_venoxisAI(creature);
}

10
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
View File

@@ -36,24 +36,24 @@ public:
{
boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) { }
void Reset()
void Reset() override
{
_Reset();
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
_JustDied();
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(5000, 10000));
events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(8000, 16000));
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -84,7 +84,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_wushoolayAI(creature);
}

18
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
View File

@@ -34,7 +34,7 @@ public:
LoadDoorData(doorData);
}
void Initialize()
void Initialize() override
{
_zealotLorkhanGUID = 0;
_zealotZathGUID = 0;
@@ -45,13 +45,13 @@ public:
_goGongOfBethekkGUID = 0;
}
bool IsEncounterInProgress() const
bool IsEncounterInProgress() const override
{
// not active in Zul'Gurub
return false;
}
void OnCreatureCreate(Creature* creature)
void OnCreatureCreate(Creature* creature) override
{
switch (creature->GetEntry())
{
@@ -76,7 +76,7 @@ public:
}
}
void OnGameObjectCreate(GameObject* go)
void OnGameObjectCreate(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -95,7 +95,7 @@ public:
}
}
void OnGameObjectRemove(GameObject* go)
void OnGameObjectRemove(GameObject* go) override
{
switch (go->GetEntry())
{
@@ -107,7 +107,7 @@ public:
}
}
uint64 GetData64(uint32 uiData) const
uint64 GetData64(uint32 uiData) const override
{
switch (uiData)
{
@@ -133,7 +133,7 @@ public:
return 0;
}
std::string GetSaveData()
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
@@ -144,7 +144,7 @@ public:
return saveStream.str();
}
void Load(const char* str)
void Load(const char* str) override
{
if (!str)
{
@@ -188,7 +188,7 @@ public:
uint64 _goGongOfBethekkGUID;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
InstanceScript* GetInstanceScript(InstanceMap* map) const override
{
return new instance_zulgurub_InstanceMapScript(map);
}