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

30
src/server/scripts/World/achievement_scripts.cpp
View File

@@ -20,7 +20,7 @@ class achievement_resilient_victory : public AchievementCriteriaScript
public:
achievement_resilient_victory() : AchievementCriteriaScript("achievement_resilient_victory") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AB && bg->ToBattlegroundAB()->IsTeamScores500Disadvantage(source->GetTeamId());
@@ -32,7 +32,7 @@ class achievement_bg_control_all_nodes : public AchievementCriteriaScript
public:
achievement_bg_control_all_nodes() : AchievementCriteriaScript("achievement_bg_control_all_nodes") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->AllNodesConrolledByTeam(source->GetTeamId());
@@ -44,7 +44,7 @@ class achievement_save_the_day : public AchievementCriteriaScript
public:
achievement_save_the_day() : AchievementCriteriaScript("achievement_save_the_day") { }
bool OnCheck(Player* source, Unit* target)
bool OnCheck(Player* source, Unit* target) override
{
if (!target)
return false;
@@ -63,7 +63,7 @@ class achievement_bg_ic_resource_glut : public AchievementCriteriaScript
public:
achievement_bg_ic_resource_glut() : AchievementCriteriaScript("achievement_bg_ic_resource_glut") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_IC && bg->ToBattlegroundIC()->IsResourceGlutAllowed(source->GetTeamId());
@@ -75,7 +75,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript
public:
achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
return vehicle->GetEntry() == NPC_GLAIVE_THROWER_H || vehicle->GetEntry() == NPC_GLAIVE_THROWER_A;
@@ -89,7 +89,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript
public:
achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
return vehicle->GetEntry() == NPC_KEEP_CANNON;
@@ -103,7 +103,7 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript
public:
achievement_bg_sa_artillery() : AchievementCriteriaScript("achievement_bg_sa_artillery") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
return vehicle->GetEntry() == NPC_ANTI_PERSONNAL_CANNON;
@@ -120,7 +120,7 @@ public:
{
}
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
return source->InArena() && source->GetBattleground()->GetArenaType() == _arenaType;
}
@@ -134,7 +134,7 @@ class achievement_sickly_gazelle : public AchievementCriteriaScript
public:
achievement_sickly_gazelle() : AchievementCriteriaScript("achievement_sickly_gazelle") { }
bool OnCheck(Player* /*source*/, Unit* target)
bool OnCheck(Player* /*source*/, Unit* target) override
{
if (!target)
return false;
@@ -152,7 +152,7 @@ class achievement_everything_counts : public AchievementCriteriaScript
public:
achievement_everything_counts() : AchievementCriteriaScript("achievement_everything_counts") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AV && bg->ToBattlegroundAV()->IsBothMinesControlledByTeam(source->GetTeamId());
@@ -164,7 +164,7 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript
public:
achievement_bg_av_perfection() : AchievementCriteriaScript("achievement_bg_av_perfection") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_AV && bg->ToBattlegroundAV()->IsAllTowersControlledAndCaptainAlive(source->GetTeamId());
@@ -176,7 +176,7 @@ class achievement_sa_defense_of_the_ancients : public AchievementCriteriaScript
public:
achievement_sa_defense_of_the_ancients() : AchievementCriteriaScript("achievement_sa_defense_of_the_ancients") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
Battleground* bg = source->GetBattleground();
return bg && bg->GetBgTypeID(true) == BATTLEGROUND_SA && bg->ToBattlegroundSA()->AllowDefenseOfTheAncients(source);
@@ -198,7 +198,7 @@ class achievement_tilted : public AchievementCriteriaScript
public:
achievement_tilted() : AchievementCriteriaScript("achievement_tilted") {}
bool OnCheck(Player* player, Unit* /*target*/)
bool OnCheck(Player* player, Unit* /*target*/) override
{
if (!player)
return false;
@@ -220,7 +220,7 @@ class achievement_not_even_a_scratch : public AchievementCriteriaScript
public:
achievement_not_even_a_scratch() : AchievementCriteriaScript("achievement_not_even_a_scratch") { }
bool OnCheck(Player* source, Unit* /*target*/)
bool OnCheck(Player* source, Unit* /*target*/) override
{
if (!source)
return false;
@@ -235,7 +235,7 @@ class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript
public:
achievement_killed_exp_or_honor_target() : AchievementCriteriaScript("achievement_killed_exp_or_honor_target") { }
bool OnCheck(Player* player, Unit* target)
bool OnCheck(Player* player, Unit* target) override
{
return target && player->isHonorOrXPTarget(target);
}

22
src/server/scripts/World/areatrigger_scripts.cpp
View File

@@ -38,7 +38,7 @@ public:
{
}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (player->IsAlive() && !player->IsInCombat())
if (player->HasItemCount(39319)) // Scepter of Domination
@@ -71,7 +71,7 @@ public:
{
}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (GameObject* go = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f))
if (go->getLootState() == GO_READY)
@@ -103,7 +103,7 @@ public:
{
}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (player->IsAlive() && !player->IsInCombat())
{
@@ -145,7 +145,7 @@ public:
{
}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (!player->isDead() && player->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE)
player->CastSpell(player, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false);
@@ -173,7 +173,7 @@ public:
{
}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE)
{
@@ -204,7 +204,7 @@ public:
{
}
bool OnTrigger(Player* player, AreaTrigger const* trigger)
bool OnTrigger(Player* player, AreaTrigger const* trigger) override
{
QuestStatus QLR = player->GetQuestStatus(QUEST_LAST_RITES);
QuestStatus QBT = player->GetQuestStatus(QUEST_BREAKING_THROUGH);
@@ -263,7 +263,7 @@ public:
AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") { }
bool OnTrigger(Player* player, AreaTrigger const* trigger)
bool OnTrigger(Player* player, AreaTrigger const* trigger) override
{
if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE ||
(player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED)))
@@ -300,7 +300,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript
public:
AreaTrigger_at_nats_landing() : AreaTriggerScript("at_nats_landing") { }
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (!player->IsAlive() || !player->HasAura(SPELL_FISH_PASTE))
return false;
@@ -335,7 +335,7 @@ class AreaTrigger_at_sentry_point : public AreaTriggerScript
public:
AreaTrigger_at_sentry_point() : AreaTriggerScript("at_sentry_point") { }
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
auto quest_status = player->GetQuestStatus(QUEST_MISSING_DIPLO_PT14);
if (!player->IsAlive() || quest_status == QUEST_STATUS_NONE || quest_status == QUEST_STATUS_REWARDED)
@@ -378,7 +378,7 @@ public:
_triggerTimes[AT_BREWFEST_DUROTAR] = _triggerTimes[AT_BREWFEST_DUN_MOROGH] = 0;
}
bool OnTrigger(Player* player, AreaTrigger const* trigger)
bool OnTrigger(Player* player, AreaTrigger const* trigger) override
{
uint32 triggerId = trigger->entry;
// Second trigger happened too early after first, skip for now
@@ -431,7 +431,7 @@ public:
_triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0;
}
bool OnTrigger(Player* player, AreaTrigger const* trigger)
bool OnTrigger(Player* player, AreaTrigger const* trigger) override
{
float x = 0.0f, y = 0.0f, z = 0.0f;

78
src/server/scripts/World/boss_emerald_dragons.cpp
View File

@@ -83,7 +83,7 @@ struct emerald_dragonAI : public WorldBossAI
{
}
void Reset()
void Reset() override
{
WorldBossAI::Reset();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
@@ -95,14 +95,14 @@ struct emerald_dragonAI : public WorldBossAI
}
// Target killed during encounter, mark them as suspectible for Aura Of Nature
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
who->CastSpell(who, SPELL_MARK_OF_NATURE, true);
}
// Execute and reschedule base events shared between all Emerald Dragons
void ExecuteEvent(uint32 eventId)
void ExecuteEvent(uint32 eventId) override
{
switch (eventId)
{
@@ -126,7 +126,7 @@ struct emerald_dragonAI : public WorldBossAI
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -161,12 +161,12 @@ public:
{
}
void Reset()
void Reset() override
{
_roamTimer = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -198,7 +198,7 @@ public:
uint32 _roamTimer;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_dream_fogAI(creature);
}
@@ -238,21 +238,21 @@ public:
{
}
void Reset()
void Reset() override
{
_stage = 1;
emerald_dragonAI::Reset();
events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_YSONDRE_AGGRO);
WorldBossAI::EnterCombat(who);
}
// Summon druid spirits on 75%, 50% and 25% health
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
if (!HealthAbovePct(100 - 25 * _stage))
{
@@ -264,7 +264,7 @@ public:
}
}
void ExecuteEvent(uint32 eventId)
void ExecuteEvent(uint32 eventId) override
{
switch (eventId)
{
@@ -282,7 +282,7 @@ public:
uint8 _stage;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_ysondreAI(creature);
}
@@ -326,20 +326,20 @@ public:
{
}
void Reset()
void Reset() override
{
_stage = 1;
emerald_dragonAI::Reset();
events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10000);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_LETHON_AGGRO);
WorldBossAI::EnterCombat(who);
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
if (!HealthAbovePct(100 - 25 * _stage))
{
@@ -349,7 +349,7 @@ public:
}
}
void SpellHitTarget(Unit* target, SpellInfo const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
{
if (spell->Id == SPELL_DRAW_SPIRIT && target->GetTypeId() == TYPEID_PLAYER)
{
@@ -359,7 +359,7 @@ public:
}
}
void ExecuteEvent(uint32 eventId)
void ExecuteEvent(uint32 eventId) override
{
switch (eventId)
{
@@ -377,7 +377,7 @@ public:
uint8 _stage;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_lethonAI(creature);
}
@@ -394,7 +394,7 @@ public:
{
}
void IsSummonedBy(Unit* summoner)
void IsSummonedBy(Unit* summoner) override
{
if (!summoner)
return;
@@ -403,7 +403,7 @@ public:
me->GetMotionMaster()->MoveFollow(summoner, 0.0f, 0.0f);
}
void MovementInform(uint32 moveType, uint32 data)
void MovementInform(uint32 moveType, uint32 data) override
{
if (moveType == FOLLOW_MOTION_TYPE && data == _summonerGuid)
{
@@ -416,7 +416,7 @@ public:
uint64 _summonerGuid;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_spirit_shadeAI(creature);
}
@@ -452,27 +452,27 @@ public:
{
}
void Reset()
void Reset() override
{
_stage = 1;
emerald_dragonAI::Reset();
events.ScheduleEvent(EVENT_VOLATILE_INFECTION, 12000);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() == TYPEID_PLAYER)
DoCast(who, SPELL_PUTRID_MUSHROOM, true);
emerald_dragonAI::KilledUnit(who);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_EMERISS_AGGRO);
WorldBossAI::EnterCombat(who);
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
if (!HealthAbovePct(100 - 25 * _stage))
{
@@ -482,7 +482,7 @@ public:
}
}
void ExecuteEvent(uint32 eventId)
void ExecuteEvent(uint32 eventId) override
{
switch (eventId)
{
@@ -500,7 +500,7 @@ public:
uint8 _stage;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_emerissAI(creature);
}
@@ -544,7 +544,7 @@ public:
{
}
void Reset()
void Reset() override
{
me->RemoveAurasDueToSpell(SPELL_SHADE);
_stage = 1;
@@ -558,18 +558,18 @@ public:
events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
Talk(SAY_TAERAR_AGGRO);
emerald_dragonAI::EnterCombat(who);
}
void SummonedCreatureDies(Creature* /*summon*/, Unit*)
void SummonedCreatureDies(Creature* /*summon*/, Unit*) override
{
--_shades;
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
// At 75, 50 or 25 percent health, we need to activate the shades and go "banished"
// Note: _stage holds the amount of times they have been summoned
@@ -596,7 +596,7 @@ public:
}
}
void ExecuteEvent(uint32 eventId)
void ExecuteEvent(uint32 eventId) override
{
switch (eventId)
{
@@ -614,7 +614,7 @@ public:
}
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!me->IsInCombat())
return;
@@ -650,7 +650,7 @@ public:
uint8 _stage; // check which "shade phase" we're at (75-50-25 percentage counters)
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_taerarAI(creature);
}
@@ -674,13 +674,13 @@ public:
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SLEEP));
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dream_fog_sleep_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_dream_fog_sleep_SpellScript();
}
@@ -713,7 +713,7 @@ public:
{
PrepareSpellScript(spell_mark_of_nature_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_NATURE))
return false;
@@ -733,14 +733,14 @@ public:
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_AURA_OF_NATURE, true);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_nature_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_mark_of_nature_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
SpellScript* GetSpellScript() const
SpellScript* GetSpellScript() const override
{
return new spell_mark_of_nature_SpellScript();
}

2
src/server/scripts/World/character_creation.cpp
View File

@@ -21,7 +21,7 @@ public:
{
}
void OnFirstLogin(Player* player)
void OnFirstLogin(Player* player) override
{
switch (player->getClass())
{

10
src/server/scripts/World/chat_log.cpp
View File

@@ -14,7 +14,7 @@ class ChatLogScript : public PlayerScript
public:
ChatLogScript() : PlayerScript("ChatLogScript") { }
void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg)
void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg) override
{
switch (type)
{
@@ -44,7 +44,7 @@ public:
}
}
void OnChat(Player* player, uint32 /*type*/, uint32 lang, std::string& msg, Player* receiver)
void OnChat(Player* player, uint32 /*type*/, uint32 lang, std::string& msg, Player* receiver) override
{
if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_WHISPER))
sLog->outChat("[WHISPER] Player %s tells %s: %s",
@@ -54,7 +54,7 @@ public:
player->GetName().c_str(), receiver ? receiver->GetName().c_str() : "<unknown>", msg.c_str());
}
void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group)
void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group) override
{
//! NOTE:
//! LANG_ADDON can only be sent by client in "PARTY", "RAID", "GUILD", "BATTLEGROUND", "WHISPER"
@@ -113,7 +113,7 @@ public:
}
}
void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild)
void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Guild* guild) override
{
switch (type)
{
@@ -134,7 +134,7 @@ public:
}
}
void OnChat(Player* player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Channel* channel)
void OnChat(Player* player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Channel* channel) override
{
bool isSystem = channel &&
(channel->HasFlag(CHANNEL_FLAG_TRADE) ||

24
src/server/scripts/World/go_scripts.cpp
View File

@@ -101,7 +101,7 @@ public:
_timer = 1;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (_timer)
{
@@ -118,7 +118,7 @@ public:
uint32 _timer;
};
GameObjectAI* GetAI(GameObject* go) const
GameObjectAI* GetAI(GameObject* go) const override
{
return new go_witherbark_totem_bundleAI(go);
}
@@ -287,19 +287,19 @@ public:
go->SummonCreature(NPC_WINTERFIN_TADPOLE, go->GetPositionX() + cos(2 * M_PI * i / 3.0f) * 0.60f, go->GetPositionY() + sin(2 * M_PI * i / 3.0f) * 0.60f, go->GetPositionZ() + 0.5f, go->GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
}
void OnStateChanged(uint32 state, Unit* /*unit*/)
void OnStateChanged(uint32 state, Unit* /*unit*/) override
{
if (requireSummon == 1 && state == GO_READY)
requireSummon = 2;
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if (go->isSpawned() && requireSummon == 2)
SummonTadpoles();
}
bool GossipHello(Player* player, bool /*reportUse*/)
bool GossipHello(Player* player, bool /*reportUse*/) override
{
if (requireSummon)
return false;
@@ -320,7 +320,7 @@ public:
}
};
GameObjectAI* GetAI(GameObject* go) const
GameObjectAI* GetAI(GameObject* go) const override
{
return new go_tadpole_cageAI(go);
}
@@ -342,7 +342,7 @@ public:
timer { 0 }
{ }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer > 3000)
@@ -367,7 +367,7 @@ public:
uint32 timer;
};
GameObjectAI* GetAI(GameObject* go) const
GameObjectAI* GetAI(GameObject* go) const override
{
return new go_flamesAI(go);
}
@@ -389,7 +389,7 @@ public:
timer { 0 }
{ }
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
timer += diff;
if (timer > 3000)
@@ -414,7 +414,7 @@ public:
uint32 timer;
};
GameObjectAI* GetAI(GameObject* go) const
GameObjectAI* GetAI(GameObject* go) const override
{
return new go_heatAI(go);
}
@@ -1395,7 +1395,7 @@ public:
/// _and_ CMSG_GAMEOBJECT_REPORT_USE, this GossipHello hook is called
/// twice. The script's handling is fine as it won't remove two charges
/// on the well. We have to find how to segregate REPORT_USE and USE.
bool GossipHello(Player* player, bool reportUse)
bool GossipHello(Player* player, bool reportUse) override
{
if (reportUse)
return false;
@@ -1437,7 +1437,7 @@ public:
uint32 _stoneId;
};
GameObjectAI* GetAI(GameObject* go) const
GameObjectAI* GetAI(GameObject* go) const override
{
return new go_soulwellAI(go);
}

12
src/server/scripts/World/guards.cpp
View File

@@ -40,7 +40,7 @@ public:
{
guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature) { }
void Reset()
void Reset() override
{
banishTimer = 5000;
exileTimer = 8500;
@@ -48,7 +48,7 @@ public:
canTeleport = false;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -92,7 +92,7 @@ public:
bool canTeleport;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new guard_shattrath_scryerAI(creature);
}
@@ -107,7 +107,7 @@ public:
{
guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature) { }
void Reset()
void Reset() override
{
banishTimer = 5000;
exileTimer = 8500;
@@ -115,7 +115,7 @@ public:
canTeleport = false;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -158,7 +158,7 @@ public:
bool canTeleport;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new guard_shattrath_aldorAI(creature);
}

16
src/server/scripts/World/item_scripts.cpp
View File

@@ -37,7 +37,7 @@ class item_only_for_flight : public ItemScript
public:
item_only_for_flight() : ItemScript("item_only_for_flight") { }
bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/)
bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) override
{
uint32 itemId = item->GetEntry();
bool disabled = false;
@@ -78,7 +78,7 @@ class item_nether_wraith_beacon : public ItemScript
public:
item_nether_wraith_beacon() : ItemScript("item_nether_wraith_beacon") { }
bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/)
bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/) override
{
if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE)
{
@@ -101,7 +101,7 @@ class item_gor_dreks_ointment : public ItemScript
public:
item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") { }
bool OnUse(Player* player, Item* item, SpellCastTargets const& targets)
bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) override
{
if (targets.GetUnitTarget() && targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT &&
targets.GetUnitTarget()->GetEntry() == 20748 && !targets.GetUnitTarget()->HasAura(32578))
@@ -121,7 +121,7 @@ class item_incendiary_explosives : public ItemScript
public:
item_incendiary_explosives() : ItemScript("item_incendiary_explosives") { }
bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/)
bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) override
{
if (player->FindNearestCreature(26248, 15) || player->FindNearestCreature(26249, 15))
return false;
@@ -142,7 +142,7 @@ class item_mysterious_egg : public ItemScript
public:
item_mysterious_egg() : ItemScript("item_mysterious_egg") { }
bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/)
bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) override
{
ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
@@ -162,7 +162,7 @@ class item_disgusting_jar : public ItemScript
public:
item_disgusting_jar() : ItemScript("item_disgusting_jar") { }
bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/)
bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) override
{
ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
@@ -189,7 +189,7 @@ class item_petrov_cluster_bombs : public ItemScript
public:
item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") { }
bool OnUse(Player* player, Item* item, const SpellCastTargets& /*targets*/)
bool OnUse(Player* player, Item* item, const SpellCastTargets& /*targets*/) override
{
if (player->GetZoneId() != ZONE_ID_HOWLING)
return false;
@@ -219,7 +219,7 @@ class item_captured_frog : public ItemScript
public:
item_captured_frog() : ItemScript("item_captured_frog") { }
bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/)
bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) override
{
if (player->GetQuestStatus(QUEST_THE_PERFECT_SPIES) == QUEST_STATUS_INCOMPLETE)
{

16
src/server/scripts/World/mob_generic_creature.cpp
View File

@@ -30,20 +30,20 @@ public:
uint32 BuffTimer; //This variable keeps track of buffs
bool IsSelfRooted;
void Reset()
void Reset() override
{
GlobalCooldown = 0;
BuffTimer = 0; //Rebuff as soon as we can
IsSelfRooted = false;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) override
{
if (!me->IsWithinMeleeRange(who))
IsSelfRooted = true;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
//Always decrease our global cooldown first
if (GlobalCooldown > diff)
@@ -152,7 +152,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new generic_creatureAI(creature);
}
@@ -175,7 +175,7 @@ public:
uint32 timer, interval;
const SpellInfo* spell;
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (timer <= diff)
{
@@ -188,7 +188,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new trigger_periodicAI(creature);
}
@@ -202,14 +202,14 @@ public:
struct trigger_deathAI : public NullCreatureAI
{
trigger_deathAI(Creature* creature) : NullCreatureAI(creature) { }
void JustDied(Unit* killer)
void JustDied(Unit* killer) override
{
if (me->m_spells[0])
me->CastSpell(killer, me->m_spells[0], true);
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new trigger_deathAI(creature);
}

106
src/server/scripts/World/npcs_special.cpp
View File

@@ -326,13 +326,13 @@ public:
uint32 resetTimer;
void Reset()
void Reset() override
{
me->CastSpell(me, SPELL_STUN_PERMANENT, true);
resetTimer = 5000;
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if (!_EnterEvadeMode())
return;
@@ -340,13 +340,13 @@ public:
Reset();
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask)
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
resetTimer = 5000;
damage = 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
@@ -360,10 +360,10 @@ public:
resetTimer -= diff;
}
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_training_dummyAI(creature);
}
@@ -385,14 +385,14 @@ public:
uint32 deathTimer;
void Reset()
void Reset() override
{
me->SetControlled(true, UNIT_STATE_STUNNED); //disable rotate
me->SetLootRecipient(me->GetOwner());
me->SelectLevel();
}
void EnterEvadeMode()
void EnterEvadeMode() override
{
if (!_EnterEvadeMode())
return;
@@ -400,7 +400,7 @@ public:
Reset();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!me->HasUnitState(UNIT_STATE_STUNNED))
me->SetControlled(true, UNIT_STATE_STUNNED);//disable rotate
@@ -416,10 +416,10 @@ public:
deathTimer -= diff;
}
void MoveInLineOfSight(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) override { }
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_target_dummyAI(creature);
}
@@ -526,7 +526,7 @@ public:
SpawnAssociation* SpawnAssoc;
uint64 SpawnedGUID;
void Reset() {}
void Reset() override {}
Creature* SummonGuard()
{
@@ -553,7 +553,7 @@ public:
return nullptr;
}
void MoveInLineOfSight(Unit* who)
void MoveInLineOfSight(Unit* who) override
{
if (!SpawnAssoc)
@@ -630,7 +630,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_air_force_botsAI(creature);
}
@@ -799,7 +799,7 @@ public:
bool Active;
uint32 CanIteract;
void Reset()
void Reset() override
{
Active = true;
CanIteract = 3500;
@@ -811,7 +811,7 @@ public:
me->SendMovementFlagUpdate();
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!Active)
{
@@ -826,9 +826,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void ReceiveEmote(Player* player, uint32 emote)
void ReceiveEmote(Player* player, uint32 emote) override
{
if (me->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()) && me->IsWithinDistInMap(player, 30.0f))
{
@@ -858,7 +858,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_dancing_flamesAI(creature);
}
@@ -952,7 +952,7 @@ public:
std::list<uint64> Patients;
std::vector<Location*> Coordinates;
void Reset()
void Reset() override
{
PlayerGUID = 0;
@@ -1053,12 +1053,12 @@ public:
}
}
void UpdateAI(uint32 diff);
void UpdateAI(uint32 diff) override;
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
};
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override
{
if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622))
CAST_AI(npc_doctor::npc_doctorAI, creature->AI())->BeginEvent(player);
@@ -1066,7 +1066,7 @@ public:
return true;
}
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_doctorAI(creature);
}
@@ -1088,7 +1088,7 @@ public:
uint64 DoctorGUID;
Location* Coord;
void Reset()
void Reset() override
{
DoctorGUID = 0;
Coord = nullptr;
@@ -1122,9 +1122,9 @@ public:
}
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void SpellHit(Unit* caster, SpellInfo const* spell)
void SpellHit(Unit* caster, SpellInfo const* spell) override
{
Player* player = caster->ToPlayer();
if (!player || !me->IsAlive() || spell->Id != 20804)
@@ -1164,7 +1164,7 @@ public:
}
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
//lower HP on every world tick makes it a useful counter, not officlone though
if (me->IsAlive() && me->GetHealth() > 6)
@@ -1184,7 +1184,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_injured_patientAI(creature);
}
@@ -1291,7 +1291,7 @@ public:
uint32 RunAwayTimer;
void Reset()
void Reset() override
{
CasterGUID = 0;
@@ -1306,9 +1306,9 @@ public:
me->SetHealth(me->CountPctFromMaxHealth(70));
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void SpellHit(Unit* caster, SpellInfo const* spell)
void SpellHit(Unit* caster, SpellInfo const* spell) override
{
if (spell->Id == SPELL_LESSER_HEAL_R2 || spell->Id == SPELL_FORTITUDE_R1)
{
@@ -1418,12 +1418,12 @@ public:
}
}
void WaypointReached(uint32 /*waypointId*/)
void WaypointReached(uint32 /*waypointId*/) override
{
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (CanRun && !me->IsInCombat())
{
@@ -1457,7 +1457,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_garments_of_questsAI(creature);
}
@@ -1481,16 +1481,16 @@ public:
{
npc_guardianAI(Creature* creature) : ScriptedAI(creature) { }
void Reset()
void Reset() override
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
void EnterCombat(Unit* /*who*/)
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/) override
{
if (!UpdateVictim())
return;
@@ -1503,7 +1503,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_guardianAI(creature);
}
@@ -1681,8 +1681,8 @@ public:
{
npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() { }
void EnterCombat(Unit* /*who*/) { }
void Reset() override { }
void EnterCombat(Unit* /*who*/) override { }
void OnPossess(bool apply)
{
@@ -1699,7 +1699,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_steam_tonkAI(creature);
}
@@ -1739,12 +1739,12 @@ public:
{
npc_wormholeAI(Creature* creature) : PassiveAI(creature) { }
void InitializeAI()
void InitializeAI() override
{
_showUnderground = urand(0, 100) == 0; // Guessed value, it is really rare though
}
uint32 GetData(uint32 type) const
uint32 GetData(uint32 type) const override
{
return (type == DATA_SHOW_UNDERGROUND && _showUnderground) ? 1 : 0;
}
@@ -2286,7 +2286,7 @@ public:
return 0;
}
void Reset()
void Reset() override
{
if (GameObject* launcher = FindNearestLauncher())
{
@@ -2331,7 +2331,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_fireworkAI(creature);
}
@@ -2356,7 +2356,7 @@ class npc_spring_rabbit : public CreatureScript
public:
npc_spring_rabbit() : CreatureScript("npc_spring_rabbit") { }
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_spring_rabbitAI(creature);
}
@@ -2371,7 +2371,7 @@ public:
uint32 searchTimer;
uint64 rabbitGUID;
void Reset()
void Reset() override
{
inLove = false;
rabbitGUID = 0;
@@ -2382,16 +2382,16 @@ public:
me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
}
void EnterCombat(Unit* /*who*/) { }
void EnterCombat(Unit* /*who*/) override { }
void DoAction(int32 /*param*/)
void DoAction(int32 /*param*/) override
{
inLove = true;
if (Unit* owner = me->GetOwner())
owner->CastSpell(owner, SPELL_SPRING_FLING, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (inLove)
{
@@ -2456,7 +2456,7 @@ public:
{
npc_stable_masterAI(Creature* creature) : SmartAI(creature) { }
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId)
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
SmartAI::sGossipSelect(player, menuId, gossipListId);
if (menuId != STABLE_MASTER_GOSSIP_SUB_MENU)
@@ -2493,7 +2493,7 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_stable_masterAI(creature);
}