Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Misc: fixed warnings and building connection patcher with boost versions below 1.61

Browse Source
This commit is contained in:
Ovahlord committed 2019-11-06 00:51:04 +01:00
1 parent abd3d58d57
commit 15f09fb82b
104 files changed
+297 -471
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Commands/cs_battlenet_account.cpp
+28 -24
View File
@@ -111,7 +111,7 @@ public:
handler->SetSentErrorMessage(true);
return false;
default:
break;
return false;
}
return true;
@@ -322,7 +322,7 @@ public:
handler->SetSentErrorMessage(true);
return false;
default:
break;
return false;
}
return true;
}
@@ -342,17 +342,19 @@ public:
switch (Battlenet::AccountMgr::LinkWithGameAccount(bnetAccountName, gameAccountName))
{
case AccountOpResult::AOR_OK:
handler->PSendSysMessage(LANG_ACCOUNT_BNET_LINKED, bnetAccountName.c_str(), gameAccountName.c_str());
break;
case AccountOpResult::AOR_NAME_NOT_EXIST:
handler->PSendSysMessage(LANG_ACCOUNT_OR_BNET_DOES_NOT_EXIST, bnetAccountName.c_str(), gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
case AccountOpResult::AOR_ACCOUNT_BAD_LINK:
handler->PSendSysMessage(LANG_ACCOUNT_ALREADY_LINKED, gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
case AccountOpResult::AOR_OK:
handler->PSendSysMessage(LANG_ACCOUNT_BNET_LINKED, bnetAccountName.c_str(), gameAccountName.c_str());
break;
case AccountOpResult::AOR_NAME_NOT_EXIST:
handler->PSendSysMessage(LANG_ACCOUNT_OR_BNET_DOES_NOT_EXIST, bnetAccountName.c_str(), gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
case AccountOpResult::AOR_ACCOUNT_BAD_LINK:
handler->PSendSysMessage(LANG_ACCOUNT_ALREADY_LINKED, gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
default:
break;
}
return true;
@@ -371,17 +373,19 @@ public:
switch (Battlenet::AccountMgr::UnlinkGameAccount(gameAccountName))
{
case AccountOpResult::AOR_OK:
handler->PSendSysMessage(LANG_ACCOUNT_BNET_UNLINKED, gameAccountName.c_str());
break;
case AccountOpResult::AOR_NAME_NOT_EXIST:
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
case AccountOpResult::AOR_ACCOUNT_BAD_LINK:
handler->PSendSysMessage(LANG_ACCOUNT_BNET_NOT_LINKED, gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
case AccountOpResult::AOR_OK:
handler->PSendSysMessage(LANG_ACCOUNT_BNET_UNLINKED, gameAccountName.c_str());
break;
case AccountOpResult::AOR_NAME_NOT_EXIST:
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
case AccountOpResult::AOR_ACCOUNT_BAD_LINK:
handler->PSendSysMessage(LANG_ACCOUNT_BNET_NOT_LINKED, gameAccountName.c_str());
handler->SetSentErrorMessage(true);
break;
default:
break;
}
return true;
src/server/scripts/Commands/cs_gobject.cpp
+2 -2
View File
@@ -158,12 +158,12 @@ public:
if (objectInfo->type == GAMEOBJECT_TYPE_TRANSPORT)
{
object = new Transport();
ObjectGuid::LowType guidLow = map->GenerateLowGuid<HighGuid::Transport>();
guidLow = map->GenerateLowGuid<HighGuid::Transport>();
}
else
{
object = new GameObject();
ObjectGuid::LowType guidLow = map->GenerateLowGuid<HighGuid::GameObject>();
guidLow = map->GenerateLowGuid<HighGuid::GameObject>();
}
if (!object->Create(guidLow, objectInfo->entry, map, 0, *player, QuaternionData(), 255, GO_STATE_READY))
src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
+1 -1
View File
@@ -272,7 +272,7 @@ class spell_argaloth_consuming_darkness_AuraScript : public AuraScript
PrepareAuraScript(spell_argaloth_consuming_darkness_AuraScript);
void HandlePeriodic(AuraEffect const* aurEff)
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (AuraEffect* aurEff = GetEffect(EFFECT_0))
{
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp
+12 -12
View File
@@ -541,7 +541,7 @@ class npc_feludius : public CreatureScript
me->MakeInterruptable(false);
}
void JustEngagedWith(Unit* who) override
void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* controller = _instance->GetCreature(DATA_ASCENDANT_COUNCIL_CONTROLLER))
controller->AI()->DoAction(ACTION_START_ENCOUNTER);
@@ -723,7 +723,7 @@ class npc_ignacious : public CreatureScript
me->MakeInterruptable(false);
}
void JustEngagedWith(Unit* who) override
void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* controller = _instance->GetCreature(DATA_ASCENDANT_COUNCIL_CONTROLLER))
controller->AI()->DoAction(ACTION_START_ENCOUNTER);
@@ -1003,7 +1003,7 @@ class npc_arion : public CreatureScript
_summons.Summon(summon);
}
void DamageTaken(Unit* attacker, uint32& damage) override
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
if (me->HealthBelowPctDamaged(25, damage))
if (Creature* controller = _instance->GetCreature(DATA_ASCENDANT_COUNCIL_CONTROLLER))
@@ -1198,7 +1198,7 @@ class npc_terrastra : public CreatureScript
_summons.Summon(summon);
}
void DamageTaken(Unit* attacker, uint32& damage) override
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
if (me->HealthBelowPctDamaged(25, damage))
if (Creature* controller = _instance->GetCreature(DATA_ASCENDANT_COUNCIL_CONTROLLER))
@@ -1863,7 +1863,7 @@ class npc_ascendant_council_flame_strike : public CreatureScript
summoner->CastSpell(me, SPELL_FLAME_STRIKE);
}
void SpellHit(Unit* /*caste*/r, SpellInfo const* spell) override
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{
if (spell->Id == SPELL_FLAME_STRIKE)
{
@@ -1872,7 +1872,7 @@ class npc_ascendant_council_flame_strike : public CreatureScript
}
}
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
void SpellHitTarget(Unit* target, SpellInfo const* /*spell*/) override
{
if (target->GetEntry() == NPC_FROZEN_ORB)
{
@@ -1995,7 +1995,7 @@ class spell_feludius_heart_of_ice : public AuraScript
});
}
void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* target = GetTarget())
target->RemoveAurasDueToSpell(SPELL_BURNING_BLOOD);
@@ -2041,7 +2041,7 @@ class spell_feludius_frost_imbued_AuraScript : public AuraScript
{
PrepareAuraScript(spell_feludius_frost_imbued_AuraScript);
bool CheckProc(ProcEventInfo& eventInfo)
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
if (Unit* caster = GetCaster())
return (GetTarget()->GetDistance(caster) > 10.0f);
@@ -2124,7 +2124,7 @@ class spell_ignacious_burning_blood : public AuraScript
});
}
void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* target = GetTarget())
target->RemoveAurasDueToSpell(SPELL_HEART_OF_ICE);
@@ -2170,7 +2170,7 @@ class spell_ignacious_flame_imbued_AuraScript : public AuraScript
{
PrepareAuraScript(spell_ignacious_flame_imbued_AuraScript);
bool CheckProc(ProcEventInfo& eventInfo)
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
if (Unit* caster = GetCaster())
return (GetTarget()->GetDistance(caster) > 10.0f);
@@ -2273,7 +2273,7 @@ class spell_arion_lashing_winds : public SpellScript
});
}
void HandleHit(SpellEffIndex effIndex)
void HandleHit(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
{
@@ -2537,7 +2537,7 @@ class spell_terrastra_harden_skin : public AuraScript
return ValidateSpellInfo({ SPELL_SHATTER });
}
void OnAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount)
void OnAbsorb(AuraEffect* /*aurEff*/, DamageInfo& dmgInfo, uint32& absorbAmount)
{
absorbAmount = CalculatePct(dmgInfo.GetDamage(), GetSpellInfo()->Effects[EFFECT_2].BasePoints);
_absorbedDamage += absorbAmount;
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp
+2 -2
View File
@@ -317,7 +317,7 @@ struct boss_chogall : public BossAI
_allowDeath = false;
}
void Reset()
void Reset() override
{
_Reset();
Initialize();
@@ -1215,7 +1215,7 @@ class spell_chogall_conversion : public SpellScript
Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 4 : 2);
}
void HandleScriptEffect(SpellEffIndex effIndex)
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* target = GetHitUnit())
{
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
+2 -2
View File
@@ -274,7 +274,7 @@ class boss_halfus_wyrmbreaker : public CreatureScript
}
}
void DoAction(int32 action)
void DoAction(int32 action) override
{
switch (action)
{
@@ -676,7 +676,7 @@ class spell_halfus_fireball : public SpellScriptLoader
Trinity::Containers::RandomResize(targets, 1);
}
void HandleHit(SpellEffIndex effIndex)
void HandleHit(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
{
src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp
+14 -14
View File
@@ -305,7 +305,7 @@ class boss_theralion : public CreatureScript
}
}
void DoAction(int32 action)
void DoAction(int32 action) override
{
switch (action)
{
@@ -331,7 +331,7 @@ class boss_theralion : public CreatureScript
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
@@ -570,7 +570,7 @@ class boss_valiona : public CreatureScript
}
}
void DoAction(int32 action)
void DoAction(int32 action) override
{
switch (action)
{
@@ -596,7 +596,7 @@ class boss_valiona : public CreatureScript
}
}
void JustSummoned(Creature* summon)
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
@@ -848,7 +848,7 @@ class npc_theralion_and_valiona_unstable_twilight : public CreatureScript
{
float x, y, z, o;
me->GetHomePosition(x, y, z, o);
o =+ frand(0.0f, float(M_PI * 2));
o += frand(0.0f, float(M_PI * 2));
x += cos(o) * 5.0f;
y += sin(o) * 5.0f;
me->GetMotionMaster()->MovePoint(0, x, y, z, true);
@@ -1008,7 +1008,7 @@ class spell_theralion_dazzling_destruction : public SpellScriptLoader
targets.remove_if(IsInTwilightPhaseCheck());
}
void HandleActionEffect(SpellEffIndex effIndex)
void HandleActionEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_TRIGGER_ACTION_VALIONA, true);
}
@@ -1166,9 +1166,9 @@ class spell_theralion_engulfing_magic_targeting : public SpellScriptLoader
if (Unit* caster = GetCaster())
{
if (GetCaster()->GetMap()->Is25ManRaid() && targets.size() > 3)
if (caster->GetMap()->Is25ManRaid() && targets.size() > 3)
Trinity::Containers::RandomResize(targets, 3);
else if (!GetCaster()->GetMap()->Is25ManRaid())
else if (!caster->GetMap()->Is25ManRaid())
Trinity::Containers::RandomResize(targets, 1);
}
}
@@ -1272,7 +1272,7 @@ class spell_valiona_blackout: public SpellScriptLoader
return ValidateSpellInfo({ SPELL_BLACKOUT_DAMAGE });
}
void OnAuraRemoveHandler(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL
|| GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
@@ -1638,7 +1638,7 @@ class spell_valiona_summon_twilight_portal : public SpellScriptLoader
return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_PORTAL });
}
void HandlePeriodic(AuraEffect const* aurEff)
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* caster = GetCaster())
if (InstanceScript* instance = caster->GetInstanceScript())
@@ -1673,7 +1673,7 @@ class spell_valiona_summon_twilight_sentry : public SpellScriptLoader
return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_SENTRY });
}
void HandlePeriodic(AuraEffect const* aurEff)
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* caster = GetCaster())
if (InstanceScript* instance = caster->GetInstanceScript())
@@ -1715,7 +1715,7 @@ class spell_valiona_twilight_flames : public SpellScriptLoader
targets.remove_if(IsInTwilightPhaseCheck());
}
void HandleActionEffect(SpellEffIndex effIndex)
void HandleActionEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
caster->CastSpell(caster, SPELL_TRIGGER_ACTION_THERALION, true);
@@ -1941,7 +1941,7 @@ class spell_theralion_and_valiona_shifting_reality : public SpellScriptLoader
});
}
void HandleEffect(SpellEffIndex effIndex)
void HandleEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* target = GetHitUnit())
{
@@ -1971,7 +1971,7 @@ class spell_theralion_and_valiona_collapsing_twilight_portal : public SpellScrip
{
PrepareAuraScript(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript);
void HandlePeriodic(AuraEffect const* aurEff)
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* target = GetTarget())
if (target->GetObjectScale() >= 1.03f)
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
+2 -2
View File
@@ -156,7 +156,7 @@ struct boss_ascendant_lord_obsidius : public BossAI
}
}
void SetData(uint32 type, uint32 data) override
void SetData(uint32 type, uint32 /*data*/) override
{
switch (type)
{
@@ -357,7 +357,7 @@ class spell_obsidius_shadow_of_obsidius : public AuraScript
{
PrepareAuraScript(spell_obsidius_shadow_of_obsidius);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
amount = -1;
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ struct boss_corla_herald_of_twilight : public BossAI
Talk(SAY_SLAY);
}
void EnterEvadeMode(EvadeReason why) override
void EnterEvadeMode(EvadeReason /*why*/) override
{
_EnterEvadeMode();
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ struct boss_karsh_steelbender : public BossAI
{
boss_karsh_steelbender(Creature* creature) : BossAI(creature, DATA_KARSH_STEELBENDER) { }
void Reset()
void Reset() override
{
DoCastSelf(SPELL_QUICKSILVER_ARMOR);
DoCastSelf(SPELL_QUICKSILVER_ARMOR_DAMAGE_REDUCTION);
@@ -279,7 +279,7 @@ class spell_karsh_superheated_quicksilver_armor_proc : public AuraScript
return ValidateSpellInfo({ SPELL_SUPERHEATED_QUICKSILVER_ARMOR });
}
bool CheckProc(ProcEventInfo& eventInfo)
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
return (GetTarget()->HasAura(sSpellMgr->GetSpellIdForDifficulty(SPELL_SUPERHEATED_QUICKSILVER_ARMOR, GetTarget())));
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
+5 -14
View File
@@ -18,6 +18,7 @@
#include "ScriptMgr.h"
#include "blackrock_caverns.h"
#include "InstanceScript.h"
#include "PassiveAI.h"
#include "ScriptedCreature.h"
#include "Spell.h"
#include "SpellScript.h"
@@ -125,7 +126,7 @@ struct boss_romogg_bonecrusher : public BossAI
events.ScheduleEvent(EVENT_QUAKE, 24s);
}
void EnterEvadeMode(EvadeReason why) override
void EnterEvadeMode(EvadeReason /*why*/) override
{
_EnterEvadeMode();
summons.DespawnAll();
@@ -199,17 +200,9 @@ private:
uint8 _killedElementals;
};
struct npc_romogg_chains_of_woe : public ScriptedAI
struct npc_romogg_chains_of_woe : public NullCreatureAI
{
npc_romogg_chains_of_woe(Creature* creature) : ScriptedAI(creature)
{
Initialize();
}
void Initialize()
{
me->SetReactState(REACT_PASSIVE);
}
npc_romogg_chains_of_woe(Creature* creature) : NullCreatureAI(creature) { }
void IsSummonedBy(Unit* /*summoner*/) override
{
@@ -218,8 +211,6 @@ struct npc_romogg_chains_of_woe : public ScriptedAI
DoCastSelf(SPELL_CHAINS_OF_WOE_CHANNELED);
}
void EnterEvadeMode(EvadeReason why) override { }
private:
EventMap _events;
};
@@ -314,7 +305,7 @@ class spell_romogg_call_for_help : public SpellScript
{
PrepareSpellScript(spell_romogg_call_for_help);
void HandleScriptEffect(SpellEffIndex effIndex)
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
if (Creature* creature = GetHitCreature())
if (creature->IsAIEnabled)
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
-5
View File
@@ -39,14 +39,9 @@ class instance_blackrock_caverns : public InstanceMapScript
{
instance_blackrock_caverns_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
Initialize();
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadObjectData(creatureData, nullptr);
}
void Initialize()
{
_lastRazAreaIndex = RAZ_AREA_INDEX_ROMOGG;
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_decent.cpp
+7 -10
View File
@@ -35,17 +35,14 @@ struct go_bwd_ancient_bell : public GameObjectAI
if (_instance->GetData(DATA_ATRAMEDES_INTRO) == DONE)
return true;
if (GameObject* bell = me->ToGameObject())
{
_instance->SetData(DATA_ATRAMEDES_INTRO, DONE);
me->SendCustomAnim(0);
me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
_instance->SetData(DATA_ATRAMEDES_INTRO, DONE);
me->SendCustomAnim(0);
me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
if (Creature* column = _instance->GetCreature(DATA_COLUMN_OF_LIGHT))
column->DespawnOrUnsummon();
if (Creature* column = _instance->GetCreature(DATA_COLUMN_OF_LIGHT))
column->DespawnOrUnsummon();
me->DespawnOrUnsummon(7s + 400ms);
me->DespawnOrUnsummon(7s + 400ms);
}
return true;
}
private:
@@ -80,7 +77,7 @@ class spell_bwd_dragon_orb : public SpellScript
dest.Relocate(DragonOrb2Offset);
}
void Register()
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_bwd_dragon_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM);
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
+3 -3
View File
@@ -352,7 +352,7 @@ struct boss_chimaeron : public BossAI
switch (eventId)
{
case EVENT_CAUSTIC_SLIME:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
if (SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
DoCastAOE(SPELL_CAUSTIC_SLIME_TARGETING, true);
events.Repeat(5s);
break;
@@ -404,7 +404,7 @@ struct npc_chimaeron_finkle_einhorn : public ScriptedAI
{
npc_chimaeron_finkle_einhorn(Creature* creature) : ScriptedAI(creature), _instance(me->GetInstanceScript()), _bileOTronActivated(false) { }
bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
bool GossipSelect(Player* /*player*/, uint32 menuId, uint32 /*gossipListId*/) override
{
if (menuId == GOSSIP_MENU_ID_RESTRICTIONS && !_bileOTronActivated)
{
@@ -717,7 +717,7 @@ class spell_chimaeron_finkles_mixture : public AuraScript
Remove();
}
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
amount = -1;
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp
+6 -4
View File
@@ -280,7 +280,7 @@ struct boss_magmaw : public BossAI
}
}
void SpellHit(Unit* caster, SpellInfo const* spell) override
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{
switch (spell->Id)
{
@@ -503,13 +503,15 @@ struct boss_magmaw : public BossAI
private:
void SetupBody()
{
if (_pincer1 = DoSummon(NPC_MAGMAWS_PINCER_1, me->GetPosition()))
_pincer1 = DoSummon(NPC_MAGMAWS_PINCER_1, me->GetPosition());
if (_pincer1)
{
_pincer1->EnterVehicle(me, SEAT_MAGMAWS_PINCER_1);
_pincer1->SetDisplayId(_pincer1->GetCreatureTemplate()->Modelid3);
}
if (_pincer2 = DoSummon(NPC_MAGMAWS_PINCER_2, me->GetPosition()))
_pincer2 = DoSummon(NPC_MAGMAWS_PINCER_2, me->GetPosition());
if (_pincer2)
{
_pincer2->EnterVehicle(me, SEAT_MAGMAWS_PINCER_2);
_pincer2->SetDisplayId(_pincer2->GetCreatureTemplate()->Modelid3);
@@ -1205,7 +1207,7 @@ class achievement_parasite_evening : public AchievementCriteriaScript
public:
achievement_parasite_evening() : AchievementCriteriaScript("achievement_parasite_evening") { }
bool OnCheck(Player* source, Unit* target) override
bool OnCheck(Player* /*source*/, Unit* target) override
{
if (!target)
return false;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp
+3 -4
View File
@@ -1074,7 +1074,6 @@ class spell_maloriak_release_experiments : public SpellScript
if (targets.empty())
return;
Unit* caster = GetCaster();
targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_DROWNED_STATE));
if (!targets.empty() && GetSpellInfo()->Id == SPELL_RELEASE_ABERRATIONS)
@@ -1125,7 +1124,7 @@ class spell_maloriak_magma_jets_periodic : public AuraScript
Remove();
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_maloriak_magma_jets_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
@@ -1167,7 +1166,7 @@ class spell_maloriak_vile_swill: public AuraScript
return ValidateSpellInfo({ SPELL_VILE_SWILL_SUMMON });
}
void HandlePeriodic(AuraEffect const* aurEff)
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
PreventDefaultAction();
Unit* target = GetTarget();
@@ -1175,7 +1174,7 @@ class spell_maloriak_vile_swill: public AuraScript
target->CastSpell(destination.GetPositionX(), destination.GetPositionY(), destination.GetPositionZ(), SPELL_VILE_SWILL_SUMMON, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_maloriak_vile_swill::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp
+1 -1
View File
@@ -944,9 +944,9 @@ struct npc_nefarians_end_lord_victor_nefarius : public PassiveAI
}
private:
bool _started;
EventMap _events;
InstanceScript* _instance;
bool _started;
};
struct npc_nefarians_end_animated_bone_warrior : public ScriptedAI
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp
+2 -2
View File
@@ -1129,7 +1129,7 @@ private:
{
if (Creature* golem = _instance->GetCreature(i))
if (!golem->HasAura(SPELL_INACTIVE))
if (!preferedGolem || golem->GetPower(POWER_ENERGY) && golem->GetPower(POWER_ENERGY) <= preferedGolem->GetPower(POWER_ENERGY))
if (!preferedGolem || (golem->GetPower(POWER_ENERGY) && golem->GetPower(POWER_ENERGY) <= preferedGolem->GetPower(POWER_ENERGY)))
preferedGolem = golem;
}
@@ -1495,7 +1495,7 @@ class spell_omnotron_barrier : public AuraScript
return ValidateSpellInfo({ SPELL_BACKDRAFT });
}
void HandleAbsorbRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
void HandleAbsorbRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL)
if (Unit* caster = GetCaster())
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
-5
View File
@@ -111,11 +111,6 @@ class instance_blackwing_descent : public InstanceMapScript
SetBossNumber(EncounterCount);
LoadObjectData(creatureData, gameobjectData);
LoadDoorData(doorData);
Initialize();
}
void Initialize()
{
_deadDwarfSpirits = 0;
_atramedesIntroState = NOT_STARTED;
_entranceSequenceDone = false;
src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ Position const FirewallPlatterCyclicPath[FirewallPlatterCyclicPathSize] =
struct boss_glubtok : public BossAI
{
boss_glubtok(Creature* creature) : BossAI(creature, DATA_GLUBTOK),
_defeated(false), _nextBlossomBunny(NPC_FIRE_BLOSSOM_BUNNY), _lastFists(FISTS_OF_FLAME) { }
_defeated(false), _lastFists(FISTS_OF_FLAME), _nextBlossomBunny(NPC_FIRE_BLOSSOM_BUNNY) { }
void Reset() override
{
src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
+2 -3
View File
@@ -720,8 +720,7 @@ class spell_helix_ride_face_targeting : public SpellScript
if (targets.empty())
return;
Unit* caster = GetCaster();
targets.remove_if([caster](WorldObject const* obj)->bool
targets.remove_if([](WorldObject const* obj)->bool
{
Unit const* target = obj->ToUnit();
return !target || !target->HasAura(SPELL_HELIX_RIDE);
@@ -730,7 +729,7 @@ class spell_helix_ride_face_targeting : public SpellScript
// Make sure that we will always leap to a different player if available
if (targets.size() > 1)
{
targets.remove_if([caster](WorldObject const* obj)->bool
targets.remove_if([](WorldObject const* obj)->bool
{
Unit const* target = obj->ToUnit();
return target->GetVehicleBase();
src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
+1 -1
View File
@@ -582,7 +582,7 @@ class npc_vanessa_note_from_vanessa : public CreatureScript
_events.ScheduleEvent(EVENT_TALK_NOTE_FALLS_TO_THE_GROUND, Seconds(5));
}
bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
bool GossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
if (_instance->GetData(DATA_VANESSA_VAN_CLEEF_ENCOUNTER) != IN_PROGRESS)
{
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+3 -3
View File
@@ -51,7 +51,7 @@ struct npc_deadmines_defias_watcher : public ScriptedAI
me->SetFullHealth();
}
void DamageTaken(Unit* attacker, uint32& damage) override
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
if (!_isOnFire && me->HealthBelowPctDamaged(30, damage))
{
@@ -563,7 +563,7 @@ class spell_deadmines_on_fire : public AuraScript
return ValidateSpellInfo({ SPELL_EXPLOSIVE_SUICIDE });
}
void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->CastSpell(GetTarget(), SPELL_EXPLOSIVE_SUICIDE, true);
}
@@ -613,7 +613,7 @@ class spell_deadmines_magma_trap_throw_to_location : public SpellScriptLoader
void HandleScript(SpellEffIndex /*effIndex*/)
{
if (Position const* pos = GetHitDest())
if (GetHitDest())
GetHitDest()->Relocate(-225.1973f, -563.7677f, 51.23737f);
}
src/server/scripts/EasternKingdoms/Gilneas/chapter2.cpp
+7 -7
View File
@@ -361,7 +361,7 @@ struct npc_gilneas_forsaken_catapult : public VehicleAI
_preparedDespawn = false;
}
void Reset()
void Reset() override
{
Initialize();
_events.ScheduleEvent(EVENT_FIERY_BOULDER, Milliseconds(1), Seconds(7));
@@ -394,15 +394,15 @@ struct npc_gilneas_forsaken_catapult : public VehicleAI
_events.ScheduleEvent(EVENT_CHECK_AREA, Milliseconds(1));
}
void SpellHit(Unit* caster, SpellInfo const* spell) override
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{
switch (spell->Id)
{
case SPELL_LAUNCH_INTERNAL:
DoCastSelf(SPELL_LAUNCH_INTERNAL_2, true);
break;
default:
break;
case SPELL_LAUNCH_INTERNAL:
DoCastSelf(SPELL_LAUNCH_INTERNAL_2, true);
break;
default:
break;
}
}
src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
+4 -12
View File
@@ -279,15 +279,7 @@ class npc_drahga_valiona : public CreatureScript
struct npc_drahga_valionaAI : public ScriptedAI
{
npc_drahga_valionaAI(Creature* creature) : ScriptedAI(creature), _summons(me), _instance(me->GetInstanceScript())
{
Initialize();
}
void Initialize()
{
_finished = false;
}
npc_drahga_valionaAI(Creature* creature) : ScriptedAI(creature), _instance(me->GetInstanceScript()), _summons(me), _finished(false) { }
void IsSummonedBy(Unit* /*summon*/) override
{
@@ -475,13 +467,13 @@ class npc_drahga_invoked_flaming_spirit : public CreatureScript
me->SetWalk(true);
}
void IsSummonedBy(Unit* /*summoner*/)
void IsSummonedBy(Unit* /*summoner*/) override
{
DoZoneInCombat();
_events.ScheduleEvent(EVENT_CHASE_PLAYER, Seconds(2));
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
me->DespawnOrUnsummon(Seconds(3));
}
@@ -492,7 +484,7 @@ class npc_drahga_invoked_flaming_spirit : public CreatureScript
DoCastSelf(SPELL_QUIETE_SUICIDE, true);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;
src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
+1 -15
View File
@@ -124,15 +124,7 @@ class boss_erudax : public CreatureScript
struct boss_erudaxAI : public BossAI
{
boss_erudaxAI(Creature* creature) : BossAI(creature, DATA_ERUDAX)
{
Initialize();
}
void Initialize()
{
_achievementEnligible = true;
}
boss_erudaxAI(Creature* creature) : BossAI(creature, DATA_ERUDAX), _achievementEnligible(true) { }
void JustEngagedWith(Unit* /*who*/) override
{
@@ -144,12 +136,6 @@ class boss_erudax : public CreatureScript
events.ScheduleEvent(EVENT_SUMMON_SHADOW_GALE_STALKER, Seconds(21) + Milliseconds(500));
}
void Reset()
{
_Reset();
Initialize();
}
void KilledUnit(Unit* killed) override
{
if (killed->GetTypeId() == TYPEID_PLAYER)
src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp
+3 -6
View File
@@ -20,6 +20,7 @@
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "PassiveAI.h"
#include "Player.h"
#include "grim_batol.h"
@@ -314,18 +315,14 @@ class npc_throngus_cave_in : public CreatureScript
public:
npc_throngus_cave_in() : CreatureScript("npc_throngus_cave_in") { }
struct npc_throngus_cave_inAI : public ScriptedAI
struct npc_throngus_cave_inAI : public NullCreatureAI
{
npc_throngus_cave_inAI(Creature* creature) : ScriptedAI(creature) { }
npc_throngus_cave_inAI(Creature* creature) : NullCreatureAI(creature) { }
void IsSummonedBy(Unit* /*summoner*/) override
{
DoCastAOE(SPELL_CAVE_IN_VISUAL);
}
void UpdateAI(uint32 diff) override
{
}
};
CreatureAI* GetAI(Creature* creature) const override
src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ struct npc_grim_batol_twilight_beguiler : public ScriptedAI
{
npc_grim_batol_twilight_beguiler(Creature* creature) : ScriptedAI(creature) { }
void Reset()
void Reset() override
{
_events.Reset();
_events.SetPhase(PHASE_COSMETIC);
@@ -64,7 +64,7 @@ struct npc_grim_batol_twilight_beguiler : public ScriptedAI
me->InterruptNonMeleeSpells(true);
}
void SpellHit(Unit* caster, SpellInfo const* spell) override
void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
{
if (spell->Id == SPELL_GRONN_KNOCKBACK_COSMETIC)
{
src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
+3 -8
View File
@@ -58,17 +58,12 @@ class instance_grim_batol : public InstanceMapScript
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadObjectData(creatureData, nullptr);
Initialize();
}
void Initialize()
{
_initialized = false;
_destroyedNets = 0;
_batteredRedDrakeState = STATE_EMPRISONED;
}
void OnPlayerEnter(Player* /*player*/)
void OnPlayerEnter(Player* /*player*/) override
{
if (_initialized)
return;
@@ -230,12 +225,12 @@ class instance_grim_batol : public InstanceMapScript
}
}
void WriteSaveDataMore(std::ostringstream& data)
void WriteSaveDataMore(std::ostringstream& data) override
{
data << _batteredRedDrakeState;
}
void ReadSaveDataMore(std::istringstream& data)
void ReadSaveDataMore(std::istringstream& data) override
{
data >> _batteredRedDrakeState;
}
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+1 -1
View File
@@ -172,7 +172,7 @@ class instance_magisters_terrace : public InstanceMapScript
}
}
void ProcessEvent(WorldObject* obj, uint32 eventId) override
void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override
{
if (eventId == EVENT_SPAWN_KALECGOS)
if (!GetCreature(DATA_KALECGOS) && _events.Empty())
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
+27 -32
View File
@@ -173,42 +173,37 @@ public:
}
}
void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
switch (IsHeroic())
if (IsHeroic())
{
case true:
if (me->HealthBelowPctDamaged(90, damage) && _worgenCounter == 0)
{
if (me->HealthBelowPct(90) && _worgenCounter == 0)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
else if (me->HealthBelowPct(60) && _worgenCounter == 1)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
else if (me->HealthBelowPct(30) && _worgenCounter == 2)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
break;
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
case false:
else if (me->HealthBelowPctDamaged(60, damage) && _worgenCounter == 1)
{
if (me->HealthBelowPct(75) && _worgenCounter == 0)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
else if (me->HealthBelowPct(35) && _worgenCounter == 1)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
break;
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
else if (me->HealthBelowPctDamaged(30, damage) && _worgenCounter == 2)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
}
else
{
if (me->HealthBelowPctDamaged(75, damage) && _worgenCounter == 0)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
else if (me->HealthBelowPctDamaged(35, damage) && _worgenCounter == 1)
{
events.ScheduleEvent(EVENT_SUMMON_WORGEN_SPIRIT, (Milliseconds(1)));
_worgenCounter++;
}
}
}
@@ -266,7 +261,7 @@ public:
_instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
DoZoneInCombat();
events.ScheduleEvent(EVENT_CLAW, Seconds(1) + Milliseconds(600));
for (uint8 i = 0; i < 3; i++);
for (uint8 i = 0; i < 3; i++)
DoCast(me, SPELL_SUMMON_LUPINE_SPECTRE, true);
}
src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
+1 -1
View File
@@ -355,7 +355,7 @@ public:
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
if (me->HealthBelowPct(20) && !_shielded)
if (me->HealthBelowPctDamaged(20, damage) && !_shielded)
{
DoCast(me, SPELL_SHIELD_WALL);
_shielded = true;
src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+9 -20
View File
@@ -485,13 +485,6 @@ public:
}
}
void MovementInform(uint32 type, uint32 pointId) override
{
if (type != POINT_MOTION_TYPE)
return;
}
bool WasWhisperedBefore(ObjectGuid guid) const
{
return _whisperedPlayers.count(guid) != 0;
@@ -1104,12 +1097,7 @@ public:
struct npc_sfk_veteran_forsaken_trooperAI : public ScriptedAI
{
npc_sfk_veteran_forsaken_trooperAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript())
{
}
InstanceScript* instance;
EventMap events;
npc_sfk_veteran_forsaken_trooperAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { }
void DoAction(int32 action) override
{
@@ -1131,16 +1119,17 @@ public:
{
switch (eventId)
{
case EVENT_CHEER:
me->HandleEmoteCommand(EMOTE_ONESHOT_CHEER_NO_SHEATHE);
break;
default:
break;
case EVENT_CHEER:
me->HandleEmoteCommand(EMOTE_ONESHOT_CHEER_NO_SHEATHE);
break;
default:
break;
}
}
}
private:
uint8 undeadNumber;
InstanceScript* instance;
EventMap events;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -1258,7 +1247,7 @@ class spell_sfk_shield_of_bones: public SpellScriptLoader
return ValidateSpellInfo({ SPELL_SHIELD_OF_BONES_TRIGGERED });
}
void OnAuraRemoveHandler(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL)
if (Unit* caster = GetCaster())
src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ struct boss_commander_ulthok : public BossAI
events.ScheduleEvent(EVENT_DARK_FISSURE, 7s);
}
void Reset()
void Reset() override
{
_Reset();
events.SetPhase(PHASE_INTRO);
src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ struct boss_lady_nazjar : public BossAI
events.ScheduleEvent(EVENT_SHOCK_BLAST, 13s, 16s);
}
void Reset()
void Reset() override
{
_Reset();
Initialize();
src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ struct boss_ozumat : public BossAI
break;
case EVENT_CHANGE_SEAT:
DoCastAOE(SPELL_SUMMON_CHEST_VISUAL);
if (Creature* vehicle = instance->GetCreature(DATA_OZUMAT_VEHICLE))
if (instance->GetCreature(DATA_OZUMAT_VEHICLE))
me->ChangeSeat(SEAT_1);
events.ScheduleEvent(EVENT_SWIM_AWAY, 1s);
src/server/scripts/EasternKingdoms/ThroneOfTheTides/instance_throne_of_the_todes.cpp
-6
View File
@@ -176,17 +176,11 @@ class instance_throne_of_the_tides : public InstanceMapScript
{
instance_throne_of_the_tides_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
Initialize();
SetHeaders(DataHeader);
SetBossNumber(EncounterCount);
LoadObjectData(creatureData, gameobjectData);
LoadDoorData(doorData);
}
void Initialize()
{
_eventIndex = EVENT_INDEX_NONE;
_fallingRocksDummyGUID = ObjectGuid::Empty;
}
bool SetBossState(uint32 type, EncounterState state) override
src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
-6
View File
@@ -55,12 +55,6 @@ struct npc_tott_ozumat_vehicle_big : public ScriptedAI
_events.ScheduleEvent(EVENT_CHANGE_TO_SHOCK_SEAT, 2s);
}
void PassengerBoarded(Unit* who, int8 seatId, bool apply) override
{
if (!who)
return;
}
void UpdateAI(uint32 diff) override
{
_events.Update(diff);
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
-13
View File
@@ -64,10 +64,6 @@ struct boss_akilzon : public BossAI
_JustDied();
}
void KilledUnit(Unit* who) override
{
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
@@ -75,15 +71,6 @@ struct boss_akilzon : public BossAI
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
/*
switch (eventId)
{
}
*/
}
DoMeleeAttackIfReady();
}
};
src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
-4
View File
@@ -50,10 +50,6 @@ struct boss_daakara : public BossAI
_JustDied();
}
void KilledUnit(Unit* victim) override
{
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+2
View File
@@ -66,6 +66,8 @@ struct boss_halazzi : public BossAI
if (!UpdateVictim())
return;
events.Update(diff);
DoMeleeAttackIfReady();
}
};
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+2
View File
@@ -71,6 +71,8 @@ struct boss_hexlord_malacrass : public BossAI
{
if (!UpdateVictim())
return;
events.Update(diff);
}
};
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+2 -1
View File
@@ -64,8 +64,9 @@ struct boss_janalai : public BossAI
{
}
void UpdateAI(uint32 diff) override
void UpdateAI(uint32 /*diff*/) override
{
}
};
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+2
View File
@@ -70,6 +70,8 @@ struct boss_nalorakk : public BossAI
if (!UpdateVictim())
return;
events.Update(diff);
DoMeleeAttackIfReady();
}
};
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
-9
View File
@@ -102,15 +102,6 @@ public:
}
}
void OnGameObjectRemove(GameObject* go) override
{
}
ObjectGuid GetGuidData(uint32 type) const override
{
return ObjectGuid::Empty;
}
void SetData(uint32 type, uint32 data) override
{
switch (type)
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+1 -1
View File
@@ -354,7 +354,7 @@ struct npc_zulaman_amanishi_guardian : public ScriptedAI
instance->SetData(DATA_TRIGGER_AMANISHI_SAVAGES, IN_PROGRESS);
}
void EnterEvadeMode(EvadeReason why) override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->GetMotionMaster()->MoveTargetedHome();
_EnterEvadeMode();
src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp
-1
View File
@@ -582,7 +582,6 @@ class spell_venom_withdrawal : public SpellScript
// Let's do our own knockback to make sure that we hit our sniffed position
PreventHitDefaultEffect(effIndex);
float moveTimeHalf = 15.0f / Movement::gravity;
float dist = 2 * moveTimeHalf * 15.0f;
float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -15.0f);
Movement::MoveSplineInit init(GetHitUnit());
src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp
+1 -1
View File
@@ -411,7 +411,7 @@ class spell_kilnara_wave_of_agony_dummy : public AuraScript
{
PrepareAuraScript(spell_kilnara_wave_of_agony_dummy);
void HandlePeriodic(AuraEffect const* aurEff)
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* caster = GetCaster())
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
+2 -2
View File
@@ -622,7 +622,7 @@ struct spell_jindo_call_spirit : public SpellScript
return ValidateSpellInfo({ SPELL_SUMMON_SPIRIT });
}
void HandleDummyEffect(SpellEffIndex effIndex)
void HandleDummyEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_SUMMON_SPIRIT, false);
}
@@ -653,7 +653,7 @@ struct spell_jindo_body_slam : public SpellScript
{
PrepareSpellScript(spell_jindo_body_slam);
void HandleShieldBreakEffect(SpellEffIndex effIndex)
void HandleShieldBreakEffect(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitCreature();
if (!target)
src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
+2 -2
View File
@@ -433,7 +433,7 @@ struct npc_zanzil_zanzili_berserker : public ScriptedAI
}
}
void SpellHitTarget(Unit* victim, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* victim, const SpellInfo* spellInfo) override
{
if (!victim)
return;
@@ -528,7 +528,7 @@ class spell_zanzil_zanzils_resurrection_elixir : public AuraScript
GetTarget()->CastSpell(object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), GetSpellInfo()->Effects[EFFECT_1].TriggerSpell, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_zanzil_zanzils_resurrection_elixir::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
-5
View File
@@ -66,11 +66,6 @@ class instance_zulgurub : public InstanceMapScript
LoadObjectData(creatureData, nullptr);
LoadDoorData(doorData);
LoadBossBoundaries(boundaries);
Initialize();
}
void Initialize()
{
_defeatedBossesCount = 0;
_killedGurubashiSpiritWarriorMask = 0;
}
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp
+1 -1
View File
@@ -591,7 +591,7 @@ struct npc_zulgurub_gurubashi_berserker: public ScriptedAI
me->GetMotionMaster()->MoveTargetedHome();
}
void SpellHitTarget(Unit* victim, const SpellInfo* spellInfo)
void SpellHitTarget(Unit* victim, const SpellInfo* spellInfo) override
{
if (!victim)
return;
src/server/scripts/EasternKingdoms/zone_goldshire.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ struct npc_cameron : public ScriptedAI
me->SetHomePosition(MovePosPositions.back());
}
void WaypointReached(uint32 waypointId, uint32 pathId)
void WaypointReached(uint32 waypointId, uint32 pathId) override
{
switch (pathId)
{
src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
+4 -4
View File
@@ -813,7 +813,7 @@ struct npc_brazie_spot : public ScriptedAI
_currentEntry = me->GetEntry();
}
void DamageTaken(Unit* attacker, uint32& damage) override
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
if (damage >= me->GetHealth())
{
@@ -1005,7 +1005,7 @@ struct npc_brazie_zombie : public ScriptedAI
}
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
if (TempSummon* summon = me->ToTempSummon())
if (Unit* summoner = summon->GetSummoner())
@@ -1224,7 +1224,7 @@ class spell_brazie_highlight : public SpellScript
dest.Relocate(EmptySpotPositions[0]);
}
void Register()
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_brazie_highlight::SetDest, EFFECT_1, TARGET_DEST_NEARBY_ENTRY);
}
@@ -1245,7 +1245,7 @@ class spell_brazie_create_random_seed_sack : public SpellScript
dest.Relocate(FreezyaSeedSummonPos);
}
void Register()
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_brazie_create_random_seed_sack::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
+1 -4
View File
@@ -85,16 +85,13 @@ class instance_halls_of_origination : public InstanceMapScript
SetBossNumber(EncounterCount);
LoadDoorData(doorData);
LoadObjectData(creatureData, gameObjectData);
}
void Initialize()
{
_brannIntroStarted = 0;
_deadElementals = 0;
_anraphetInitialized = false;
_vaultOfLightState = NOT_STARTED;
}
void OnPlayerEnter(Player* /*player*/) override
{
if (!_anraphetInitialized)
src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ class boss_siamat : public CreatureScript
events.ScheduleEvent(EVENT_CALL_OF_SKY, Seconds(13));
}
void JustDied(Unit* /*killer*/)
void JustDied(Unit* /*killer*/) override
{
Talk(SAY_DEATH);
DespawnServants();
src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
-5
View File
@@ -96,11 +96,6 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
SetBossNumber(EncounterCount);
LoadObjectData(creatureData, gameObjectData);
LoadBossBoundaries(boundaries);
Initialize();
}
void Initialize()
{
heroicAughSpawned = false;
}
src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
+3 -3
View File
@@ -323,7 +323,7 @@ struct boss_alakir : public BossAI
summons.DespawnEntry(NPC_SLIPSTREAM);
}
void Reset()
void Reset() override
{
_Reset();
if (instance->GetBossState(DATA_CONCLAVE_OF_WIND) == DONE)
@@ -989,7 +989,7 @@ class spell_alakir_wind_burst : public AuraScript
GetTarget()->SetCanFly(true, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_wind_burst::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
@@ -1013,7 +1013,7 @@ class spell_alakir_lightning_clouds_periodic : public AuraScript
target->CastSpell(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), SPELL_LIGHTNING_CLOUDS_VISUAL_DEST);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_lightning_clouds_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp
+5 -5
View File
@@ -248,7 +248,7 @@ struct boss_anshal : public BossAI
events.ScheduleEvent(EVENT_PRE_WIND_EFFECT_WARNING, 1s);
}
void Reset()
void Reset() override
{
_Reset();
Initialize();
@@ -488,7 +488,7 @@ struct boss_nezir : public BossAI
events.ScheduleEvent(EVENT_PRE_WIND_EFFECT_WARNING, 1s);
}
void Reset()
void Reset() override
{
_Reset();
Initialize();
@@ -720,7 +720,7 @@ struct boss_rohash : public BossAI
events.ScheduleEvent(EVENT_PRE_WIND_EFFECT_WARNING, 1s);
}
void Reset()
void Reset() override
{
_Reset();
Initialize();
@@ -1079,7 +1079,7 @@ class spell_conclave_of_wind_teleport_to_center : public SpellScript
dest.Relocate(creature->GetHomePosition());
}
void Register()
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_conclave_of_wind_teleport_to_center::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
@@ -1124,7 +1124,7 @@ class spell_conclave_of_wind_winds : public AuraScript
owner->CastCustomSpell(spellId, SPELLVALUE_BASE_POINT0, damage, owner, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_conclave_of_wind_winds::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ struct npc_slipstream : public NullCreatureAI
me->SetExtraUnitMovementFlags(MOVEMENTFLAG2_NO_STRAFE | MOVEMENTFLAG2_NO_JUMPING);
}
void OnSpellClick(Unit* clicker, bool& result)
void OnSpellClick(Unit* clicker, bool& result) override
{
if (!clicker)
return;
src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ class npc_rock_borer : public CreatureScript
me->SetReactState(REACT_PASSIVE);
}
void IsSummonedBy(Unit* summoner) override
void IsSummonedBy(Unit* /*summoner*/) override
{
if (Creature* corborus = _instance->GetCreature(DATA_CORBORUS))
corborus->AI()->JustSummoned(me);
src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+2 -2
View File
@@ -207,7 +207,7 @@ class spell_ozruk_rupture : public AuraScript
}
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_ozruk_rupture::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
@@ -233,7 +233,7 @@ class spell_ozuruk_rupture_summon : public SpellScript
dest.Relocate({ x, y, z, pos.GetOrientation() });
}
void Register()
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozuruk_rupture_summon::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT);
}
src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
-5
View File
@@ -56,11 +56,6 @@ class instance_stonecore : public InstanceMapScript
SetHeaders(DataHeader);
SetBossNumber(MAX_ENCOUNTER);
LoadObjectData(creatureData, nullptr);
Initialize();
}
void Initialize()
{
_initialSetupDone = false;
_eventIndex = EVENT_INDEX_NONE;
}
src/server/scripts/Spells/spell_dk.cpp
-2
View File
@@ -1443,8 +1443,6 @@ class spell_dk_army_of_the_dead : public AuraScript
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_army_of_the_dead::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
}
private:
uint32 absorbPct;
};
// -49588 Unholy Command
src/server/scripts/Spells/spell_druid.cpp
+4 -4
View File
@@ -1158,7 +1158,7 @@ class spell_dru_solar_beam : public AuraScript
GetTarget()->CastSpell(dyn->GetPositionX(), dyn->GetPositionY(), dyn->GetPositionZ(), SPELL_DRUID_SOLAR_BEAM_SILENCE, true);
}
void Register()
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_solar_beam::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
}
@@ -1287,7 +1287,7 @@ class spell_dru_rejuvenation : public AuraScript
}
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_rejuvenation::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_rejuvenation::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
@@ -1330,7 +1330,7 @@ class spell_dru_tree_of_life : public AuraScript
}
}
void Register()
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_tree_of_life::AfterApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_tree_of_life::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
@@ -1446,7 +1446,7 @@ class spell_dru_wild_mushroom : public SpellScript
}
}
void Register()
void Register() override
{
AfterCast += SpellCastFn(spell_dru_wild_mushroom::HandleSummon);
}
src/server/scripts/Spells/spell_generic.cpp
+7 -7
View File
@@ -4536,7 +4536,7 @@ class spell_gen_armor_specialization : public SpellScriptLoader
player->CastSpell(player, spellId, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_armor_specialization_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
@@ -4576,7 +4576,7 @@ class spell_gen_pvp_trinket : public SpellScriptLoader
}
}
void Register()
void Register() override
{
AfterHit += SpellHitFn(spell_gen_pvp_trinket_SpellScript::HandlePvPTrinketVisual);
}
@@ -4634,7 +4634,7 @@ class spell_gen_blink : public SpellScriptLoader
}
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_gen_blink_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
@@ -4664,7 +4664,7 @@ public:
Trinity::Containers::RandomResize(targets, 1);
}
void Register()
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_toxic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
}
@@ -4725,7 +4725,7 @@ class spell_gen_projectile_goods : public SpellScriptLoader
GetCaster()->CastSpell(GetHitUnit(), spellId, true);
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_projectile_goods_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
@@ -4919,7 +4919,7 @@ class spell_gen_gilneas_prison_periodic_dummy : public SpellScriptLoader
}
}
void Register()
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_gilneas_prison_periodic_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
@@ -4958,7 +4958,7 @@ class spell_gen_throw_torch : public SpellScriptLoader
player->KilledMonsterCredit(CREDIT_ROUND_UP_WORGEN);
}
void Register()
void Register() override
{
BeforeHit += SpellHitFn(spell_gen_throw_torch_SpellScript::HandleEffect);
}
src/server/scripts/Spells/spell_pet.cpp
+4 -4
View File
@@ -375,7 +375,7 @@ class spell_warl_pet_scaling_06 : public AuraScript
amount += int32(meleeHaste);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
@@ -594,7 +594,7 @@ class spell_hun_pet_scaling_03 : public AuraScript
amount = uint32(owner->GetResistance(SpellSchoolMask(GetSpellInfo()->Effects[aurEff->GetEffIndex()].MiscValue)) * 0.4);
}
void CalculateArmorAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
void CalculateArmorAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
if (Pet* pet = GetUnitOwner()->ToPet())
@@ -700,7 +700,7 @@ class spell_hun_pet_scaling_05 : public AuraScript
amount += int32(meleeHaste);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
@@ -972,7 +972,7 @@ class spell_dk_pet_scaling_05 : public AuraScript
amount += owner->GetInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE);
}
void Register()
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountCritPct, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountResistance, EFFECT_2, SPELL_AURA_MOD_TARGET_RESISTANCE);
src/server/scripts/Spells/spell_priest.cpp
+3 -9
View File
@@ -1257,12 +1257,6 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript
{
PrepareSpellScript(spell_pri_holy_word_sanctuary_triggered);
bool Load()
{
_targets = 0;
return true;
}
void HandleHeal(SpellEffIndex /*effIndex*/)
{
if (GetHitHeal() && _targets > 6)
@@ -1281,7 +1275,7 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript
}
private:
uint32 _targets;
uint32 _targets = 0;
};
// -81659 - Evangelism
@@ -1430,7 +1424,7 @@ class spell_power_word_barrier : public AuraScript
{
PrepareAuraScript(spell_power_word_barrier);
bool Load()
bool Load() override
{
TempSummon* summon = GetCaster()->ToTempSummon();
if (!summon)
@@ -1457,7 +1451,7 @@ class spell_power_word_barrier : public AuraScript
}
private:
bool _glyphEnabled;
bool _glyphEnabled = false;
};
// -89488 - Strength of Soul
src/server/scripts/Spells/spell_shaman.cpp
-6
View File
@@ -1633,12 +1633,6 @@ class spell_sha_healing_rain_triggered : public SpellScript
{
PrepareSpellScript(spell_sha_healing_rain_triggered);
bool Load()
{
_targets = 0;
return true;
}
void FilterTargets(std::list<WorldObject*>& unitList)
{
_targets = unitList.size();