Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Refactor spell script internals to fix -Wcast-function-type-mismatch warning

Browse Source
This commit is contained in:
Shauren
2025-08-16 15:31:10 +02:00
parent 7fe0d4a81c
commit de80c713d0
18 changed files with 472 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -369,12 +369,12 @@ class spell_dk_crimson_scourge : public AuraScript
return ValidateSpellInfo({ SPELL_DK_BLOOD_PLAGUE, SPELL_DK_CRIMSON_SCOURGE_BUFF, SPELL_DK_DEATH_AND_DECAY });
}
static bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& procInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& procInfo)
{
return procInfo.GetProcTarget()->HasAura(SPELL_DK_BLOOD_PLAGUE, procInfo.GetActor()->GetGUID());
}
static void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
Unit* actor = eventInfo.GetActor();
actor->GetSpellHistory()->RestoreCharge(sSpellMgr->AssertSpellInfo(SPELL_DK_DEATH_AND_DECAY, DIFFICULTY_NONE)->ChargeCategoryId);

6
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -1327,7 +1327,7 @@ class spell_dru_luxuriant_soil : public AuraScript
return ValidateSpellInfo({ SPELL_DRUID_REJUVENATION });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& /*eventInfo*/)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& /*eventInfo*/)
{
return roll_chance_i(aurEff->GetAmount());
}
@@ -1537,12 +1537,12 @@ class spell_dru_power_of_the_archdruid : public AuraScript
return ValidateSpellEffect({ { SPELL_DRUID_POWER_OF_THE_ARCHDRUID, EFFECT_0 } });
}
static bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
return eventInfo.GetActor()->HasAuraEffect(SPELL_DRUID_POWER_OF_THE_ARCHDRUID, EFFECT_0);
}
static void HandleProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* druid = eventInfo.GetActor();
Unit const* procTarget = eventInfo.GetActionTarget();

6
src/server/scripts/Spells/spell_evoker.cpp
View File

@@ -166,12 +166,12 @@ class spell_evo_burnout : public AuraScript
return ValidateSpellInfo({ SPELL_EVOKER_BURNOUT });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& /*eventInfo*/)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& /*eventInfo*/)
{
return roll_chance_i(aurEff->GetAmount());
}
static void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), SPELL_EVOKER_BURNOUT, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
}
@@ -634,7 +634,7 @@ class spell_evo_ruby_embers : public SpellScript
return !GetCaster()->HasAura(SPELL_EVOKER_RUBY_EMBERS);
}
static void PreventPeriodic(WorldObject*& target)
static void PreventPeriodic(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}

2
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -5578,7 +5578,7 @@ class spell_gen_no_npc_damage_below_override : public AuraScript
public:
spell_gen_no_npc_damage_below_override(float healthPct) : _healthPct(healthPct) {}
static void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
static void CalculateAmount(AuraScript const&, AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
amount = -1;
}

10
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -175,7 +175,7 @@ class spell_hun_aspect_of_the_fox : public SpellScript
return !GetCaster()->HasAura(SPELL_HUNTER_ASPECT_OF_THE_FOX);
}
static void HandleCastWhileWalking(WorldObject*& target)
static void HandleCastWhileWalking(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}
@@ -214,7 +214,7 @@ class spell_hun_aspect_of_the_turtle : public AuraScript
// 204089 - Bullseye
class spell_hun_bullseye : public AuraScript
{
static bool CheckEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
return eventInfo.GetActionTarget()->HealthBelowPct(aurEff->GetAmount());
}
@@ -537,12 +537,12 @@ class spell_hun_manhunter : public AuraScript
return ValidateSpellInfo({ SPELL_HUNTER_GREVIOUS_INJURY });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return eventInfo.GetProcTarget()->IsPlayer();
}
static void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetActionTarget(), SPELL_HUNTER_GREVIOUS_INJURY, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
@@ -917,7 +917,7 @@ class spell_hun_scouts_instincts : public SpellScript
return !GetCaster()->HasAura(SPELL_HUNTER_SCOUTS_INSTINCTS);
}
static void HandleMinSpeed(WorldObject*& target)
static void HandleMinSpeed(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}

6
src/server/scripts/Spells/spell_mage.cpp
View File

@@ -769,7 +769,7 @@ class spell_mage_firestarter_dots : public AuraScript
// 108853 - Fire Blast
class spell_mage_fire_blast : public SpellScript
{
void CalcCritChance(Unit const* /*victim*/, float& critChance) const
void CalcCritChance(Unit const* /*victim*/, float& critChance)
{
critChance = 100.0f;
}
@@ -1196,7 +1196,7 @@ class spell_mage_improved_scorch : public AuraScript
return ValidateSpellInfo({ SPELL_MAGE_IMPROVED_SCORCH });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
return eventInfo.GetProcTarget()->HealthBelowPct(aurEff->GetAmount());
}
@@ -1387,7 +1387,7 @@ class spell_mage_molten_fury : public AuraScript
return ValidateSpellInfo({ SPELL_MAGE_MOLTEN_FURY });
}
static void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
if (!eventInfo.GetActionTarget()->HealthAbovePct(aurEff->GetAmount()))
eventInfo.GetActor()->CastSpell(eventInfo.GetActionTarget(), SPELL_MAGE_MOLTEN_FURY, CastSpellExtraArgsInit{

2
src/server/scripts/Spells/spell_monk.cpp
View File

@@ -347,7 +347,7 @@ class spell_monk_pressure_points : public SpellScript
return !GetCaster()->HasAura(SPELL_MONK_PRESSURE_POINTS);
}
static void PreventDispel(WorldObject*& target)
static void PreventDispel(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}

4
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -154,7 +154,7 @@ class spell_pal_a_just_reward : public AuraScript
return ValidateSpellInfo({ SPELL_PALADIN_A_JUST_REWARD_HEAL });
}
static void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetActionTarget(), SPELL_PALADIN_A_JUST_REWARD_HEAL, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
@@ -342,7 +342,7 @@ class spell_pal_blade_of_vengeance : public SpellScript
return !GetCaster()->HasAura(SPELL_PALADIN_BLADE_OF_VENGEANCE);
}
static void PreventProc(WorldObject*& target)
static void PreventProc(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}

52
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -395,7 +395,7 @@ class spell_pri_atonement : public AuraScript
&& ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 }, { SPELL_PRIEST_SINS_OF_THE_MANY, EFFECT_2 } });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return eventInfo.GetDamageInfo() != nullptr;
}
@@ -848,7 +848,7 @@ Optional<uint32> GetSpellToCast(uint32 spellId)
return {};
}
void Trigger(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
void Trigger(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* target = eventInfo.GetActor();
if (!target)
@@ -879,7 +879,7 @@ class spell_pri_divine_image : public AuraScript
});
}
static void HandleProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const& script, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* target = eventInfo.GetActor();
if (!target)
@@ -905,7 +905,7 @@ class spell_pri_divine_image : public AuraScript
.SetTriggerFlags(TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DISALLOW_PROC_EVENTS | TRIGGERED_DONT_REPORT_CAST_ERROR));
// Note: Divine Image triggers a cast immediately based on the Holy Word cast.
DivineImageHelpers::Trigger(aurEff, eventInfo);
DivineImageHelpers::Trigger(script, aurEff, eventInfo);
}
target->CastSpell(target, SPELL_PRIEST_DIVINE_IMAGE_EMPOWER_STACK, CastSpellExtraArgs()
@@ -959,7 +959,7 @@ class spell_pri_divine_image_spell_triggered : public AuraScript
});
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return DivineImageHelpers::GetSummon(eventInfo.GetActor()) != nullptr;
}
@@ -1184,7 +1184,7 @@ class spell_pri_epiphany : public AuraScript
return ValidateSpellInfo({ SPELL_PRIEST_PRAYER_OF_MENDING, SPELL_PRIEST_EPIPHANY_HIGHLIGHT });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
{
return roll_chance_i(aurEff->GetAmount());
}
@@ -1209,7 +1209,7 @@ class spell_pri_epiphany : public AuraScript
// 415676 - Essence Devourer (Heal)
class spell_pri_essence_devourer_heal : public SpellScript
{
static void FilterTargets(std::list<WorldObject*>& targets)
static void FilterTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 1, true);
}
@@ -1311,7 +1311,7 @@ class spell_pri_guardian_spirit : public AuraScript
return true;
}
static void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
static void CalculateAmount(AuraScript const&, AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -1347,12 +1347,12 @@ class spell_pri_heavens_wrath : public AuraScript
return ValidateSpellInfo({ SPELL_PRIEST_ULTIMATE_PENITENCE });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return !(eventInfo.GetSpellInfo()->Id == SPELL_PRIEST_ULTIMATE_PENITENCE_DAMAGE || eventInfo.GetSpellInfo()->Id == SPELL_PRIEST_ULTIMATE_PENITENCE_HEAL);
}
static void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* caster = eventInfo.GetActor();
if (!caster)
@@ -1413,12 +1413,12 @@ class spell_pri_holy_mending : public AuraScript
return ValidateSpellInfo({ SPELL_PRIEST_RENEW, SPELL_PRIEST_HOLY_MENDING_HEAL });
}
static bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& procInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& procInfo)
{
return procInfo.GetProcTarget()->HasAura(SPELL_PRIEST_RENEW, procInfo.GetActor()->GetGUID());
}
static void HandleProc(AuraEffect* aurEff, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect* aurEff, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetProcTarget(), SPELL_PRIEST_HOLY_MENDING_HEAL, CastSpellExtraArgs(aurEff));
}
@@ -1810,7 +1810,7 @@ class spell_pri_painful_punishment : public AuraScript
});
}
static void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* caster = eventInfo.GetActor();
Unit* target = eventInfo.GetActionTarget();
@@ -1986,7 +1986,7 @@ class spell_pri_power_leech_passive : public AuraScript
});
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return eventInfo.GetDamageInfo() != nullptr;
}
@@ -2296,12 +2296,12 @@ class spell_pri_divine_aegis : public AuraScript
return ValidateSpellEffect({ { SPELL_PRIEST_DIVINE_AEGIS_ABSORB, EFFECT_0 } });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return eventInfo.GetHealInfo() != nullptr;
}
static void HandleProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* caster = eventInfo.GetActor();
if (!caster)
@@ -2497,7 +2497,7 @@ class spell_pri_prayer_of_mending : public SpellScript
// 155793 - Prayer of Mending (Jump)
class spell_pri_prayer_of_mending_jump : public spell_pri_prayer_of_mending_SpellScriptBase
{
static void FilterTargets(std::list<WorldObject*>& targets)
static void FilterTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 1, true);
}
@@ -2544,7 +2544,7 @@ class spell_pri_holy_10_1_class_set_2pc : public AuraScript
&& ValidateSpellEffect({ { SPELL_PRIEST_PRAYER_OF_MENDING, EFFECT_0 } });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
{
return roll_chance_i(aurEff->GetAmount());
}
@@ -2573,7 +2573,7 @@ class spell_pri_holy_10_1_class_set_2pc_chooser : public spell_pri_prayer_of_men
return ValidateSpellInfo({ SPELL_PRIEST_PRAYER_OF_MENDING_AURA });
}
static void FilterTargets(std::list<WorldObject*>& targets)
static void FilterTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 1, true);
}
@@ -3080,7 +3080,7 @@ class spell_pri_shadow_mend_periodic_damage : public AuraScript
GetTarget()->CastSpell(GetTarget(), SPELL_PRIEST_SHADOW_MEND_DAMAGE, args);
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return eventInfo.GetDamageInfo() != nullptr;
}
@@ -3161,7 +3161,7 @@ class spell_pri_surge_of_light : public AuraScript
});
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
if (eventInfo.GetSpellInfo()->Id == SPELL_PRIEST_SMITE)
return true;
@@ -3213,7 +3213,7 @@ class spell_pri_t5_heal_2p_bonus : public AuraScript
return ValidateSpellInfo({ SPELL_PRIEST_ITEM_EFFICIENCY });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
if (HealInfo* healInfo = eventInfo.GetHealInfo())
if (Unit* healTarget = healInfo->GetTarget())
@@ -3342,13 +3342,13 @@ class spell_pri_train_of_thought : public AuraScript
});
}
static bool CheckEffect0(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static bool CheckEffect0(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
// Renew & Flash Heal
return eventInfo.GetSpellInfo()->IsAffected(SPELLFAMILY_PRIEST, { 0x840 });
}
static bool CheckEffect1(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static bool CheckEffect1(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
// Smite
return eventInfo.GetSpellInfo()->IsAffected(SPELLFAMILY_PRIEST, { 0x80 });
@@ -3377,7 +3377,7 @@ class spell_pri_train_of_thought : public AuraScript
// 265259 - Twist of Fate (Discipline)
class spell_pri_twist_of_fate : public AuraScript
{
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
return eventInfo.GetProcTarget()->GetHealthPct() < aurEff->GetAmount();
}
@@ -3449,7 +3449,7 @@ class spell_pri_vampiric_embrace : public AuraScript
return ValidateSpellInfo({ SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
// Not proc from Mind Sear
return !(eventInfo.GetDamageInfo()->GetSpellInfo()->SpellFamilyFlags[1] & 0x80000);

2
src/server/scripts/Spells/spell_rogue.cpp
View File

@@ -396,7 +396,7 @@ class spell_rog_deepening_shadows : public AuraScript
return ValidateSpellInfo({ SPELL_ROGUE_SHADOW_DANCE });
}
static bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& procEvent)
static bool CheckProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& procEvent)
{
if (Spell const* procSpell = procEvent.GetProcSpell())
return procSpell->GetPowerTypeCostAmount(POWER_COMBO_POINTS) > 0;

46
src/server/scripts/Spells/spell_shaman.cpp
View File

@@ -224,7 +224,7 @@ class spell_sha_aftershock : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_AFTERSHOCK_ENERGIZE });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
if (Spell const* procSpell = eventInfo.GetProcSpell())
if (Optional<int32> cost = procSpell->GetPowerTypeCostAmount(POWER_MAELSTROM))
@@ -233,7 +233,7 @@ class spell_sha_aftershock : public AuraScript
return false;
}
static void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Spell const* procSpell = eventInfo.GetProcSpell();
eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), SPELL_SHAMAN_AFTERSHOCK_ENERGIZE, CastSpellExtraArgsInit{
@@ -259,7 +259,7 @@ class spell_sha_ancestral_guidance : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_GUIDANCE_HEAL });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
if (eventInfo.GetSpellInfo() && eventInfo.GetSpellInfo()->Id == SPELL_SHAMAN_ANCESTRAL_GUIDANCE_HEAL)
return false;
@@ -299,7 +299,7 @@ class spell_sha_ancestral_guidance_heal : public SpellScript
return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_GUIDANCE });
}
static void ResizeTargets(std::list<WorldObject*>& targets)
static void ResizeTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 3, true);
}
@@ -318,7 +318,7 @@ class spell_sha_arctic_snowstorm : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_ARCTIC_SNOWSTORM_AREATRIGGER });
}
static void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static void HandleEffectProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetActionTarget(), SPELL_SHAMAN_ARCTIC_SNOWSTORM_AREATRIGGER,
CastSpellExtraArgsInit{ .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR });
@@ -369,7 +369,7 @@ class spell_sha_ascendance_restoration : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_RESTORATIVE_MISTS });
}
static bool CheckProc(ProcEventInfo const& procInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& procInfo)
{
return procInfo.GetHealInfo() && procInfo.GetHealInfo()->GetOriginalHeal() && procInfo.GetSpellInfo()->Id != SPELL_SHAMAN_RESTORATIVE_MISTS_INITIAL;
}
@@ -723,7 +723,7 @@ class spell_sha_downpour : public SpellScript
return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } });
}
static void FilterTargets(std::list<WorldObject*>& targets)
static void FilterTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 6, true);
}
@@ -815,7 +815,7 @@ class spell_sha_earthen_rage_passive : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_EARTHEN_RAGE_PERIODIC, SPELL_SHAMAN_EARTHEN_RAGE_DAMAGE });
}
static bool CheckProc(ProcEventInfo const& procInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& procInfo)
{
return procInfo.GetSpellInfo() && procInfo.GetSpellInfo()->Id != SPELL_SHAMAN_EARTHEN_RAGE_DAMAGE;
}
@@ -1314,7 +1314,7 @@ class spell_sha_healing_rain : public SpellScript
// 73921 - Healing Rain
class spell_sha_healing_rain_target_limit : public SpellScript
{
static void SelectTargets(std::list<WorldObject*>& targets)
static void SelectTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 6, true);
}
@@ -1328,7 +1328,7 @@ class spell_sha_healing_rain_target_limit : public SpellScript
// 52042 - Healing Stream Totem
class spell_sha_healing_stream_totem_heal : public SpellScript
{
static void SelectTargets(std::list<WorldObject*>& targets)
static void SelectTargets(SpellScript const&, std::list<WorldObject*>& targets)
{
Trinity::SelectRandomInjuredTargets(targets, 1, true);
}
@@ -1342,7 +1342,7 @@ class spell_sha_healing_stream_totem_heal : public SpellScript
// 201900 - Hot Hand
class spell_sha_hot_hand : public AuraScript
{
static bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
return eventInfo.GetActor()->HasAura(SPELL_SHAMAN_FLAMETONGUE_WEAPON_AURA);
}
@@ -1473,7 +1473,7 @@ class spell_sha_item_mana_surge : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_MANA_SURGE });
}
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
return eventInfo.GetProcSpell() != nullptr;
}
@@ -1808,7 +1808,7 @@ class spell_sha_liquid_magma_totem : public SpellScript
GetCaster()->CastSpell(hitUnit, SPELL_SHAMAN_LIQUID_MAGMA_HIT, CastSpellExtraArgsInit{ .TriggerFlags = TRIGGERED_FULL_MASK });
}
static void HandleTargetSelect(std::list<WorldObject*>& targets)
static void HandleTargetSelect(SpellScript const&, std::list<WorldObject*>& targets)
{
// choose one random target from targets
if (targets.size() > 1)
@@ -2017,7 +2017,7 @@ class spell_sha_mastery_elemental_overload : public AuraScript
});
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (!spellInfo || !eventInfo.GetProcSpell())
@@ -2176,7 +2176,7 @@ class spell_sha_molten_thunder_sundering : public SpellScript
return GetCaster()->HasAura(SPELL_SHAMAN_MOLTEN_THUNDER_TALENT);
}
static void RemoveIncapacitateEffect(std::list<WorldObject*>& targets)
static void RemoveIncapacitateEffect(SpellScript const&, std::list<WorldObject*>& targets)
{
targets.clear();
}
@@ -2229,13 +2229,13 @@ class spell_sha_natures_guardian : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_NATURES_GUARDIAN_COOLDOWN });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
return eventInfo.GetActionTarget()->HealthBelowPct(aurEff->GetAmount())
&& !eventInfo.GetActionTarget()->HasAura(SPELL_SHAMAN_NATURES_GUARDIAN_COOLDOWN);
}
static void StartCooldown(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void StartCooldown(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
Unit* shaman = eventInfo.GetActionTarget();
shaman->CastSpell(shaman, SPELL_SHAMAN_NATURES_GUARDIAN_COOLDOWN, CastSpellExtraArgsInit{
@@ -2591,7 +2591,7 @@ class spell_sha_stormsurge : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_STORMSURGE_PROC });
}
static void HandleProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), SPELL_SHAMAN_STORMSURGE_PROC, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
@@ -2618,7 +2618,7 @@ class spell_sha_stormweaver : public SpellScript
return GetCaster()->HasAura(SPELL_SHAMAN_STORMWEAVER_PVP_TALENT);
}
static void PreventAffectingHealingSpells(WorldObject*& target)
static void PreventAffectingHealingSpells(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}
@@ -3013,7 +3013,7 @@ class spell_sha_unlimited_power : public AuraScript
return ValidateSpellInfo({ SPELL_SHAMAN_UNLIMITED_POWER_BUFF });
}
static void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& procInfo)
static void HandleProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& procInfo)
{
Unit* caster = procInfo.GetActor();
if (Aura* aura = caster->GetAura(SPELL_SHAMAN_UNLIMITED_POWER_BUFF))
@@ -3142,7 +3142,7 @@ class spell_sha_voltaic_blaze : public SpellScript
// 470058 - Voltaic Blaze
class spell_sha_voltaic_blaze_aura : public AuraScript
{
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
// 470057 - Voltaic Blaze does not have any unique SpellFamilyFlags, check by id
return eventInfo.GetSpellInfo()->Id == SPELL_SHAMAN_VOLTAIC_BLAZE_DAMAGE;
@@ -3157,12 +3157,12 @@ class spell_sha_voltaic_blaze_aura : public AuraScript
// 470053 - Voltaic Blaze
class spell_sha_voltaic_blaze_talent : public AuraScript
{
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& /*eventInfo*/)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& /*eventInfo*/)
{
return roll_chance_i(aurEff->GetAmount());
}
static void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static void HandleProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), SPELL_SHAMAN_VOLTAIC_BLAZE_OVERRIDE);
}

18
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -118,7 +118,7 @@ static void ApplyWhirlwindCleaveAura(Player* caster, Difficulty difficulty, Spel
// 392536 - Ashen Juggernaut
class spell_warr_ashen_juggernaut : public AuraScript
{
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
// should only proc on primary target
return eventInfo.GetActionTarget() == eventInfo.GetProcSpell()->m_targets.GetUnitTarget();
@@ -423,7 +423,7 @@ class spell_warr_devastator : public AuraScript
// 184361 - Enrage
class spell_warr_enrage_proc : public AuraScript
{
static bool CheckRampageProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
static bool CheckRampageProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (!spellInfo || !spellInfo->IsAffected(SPELLFAMILY_WARRIOR, { 0x0, 0x0, 0x0, 0x8000000 })) // Rampage
@@ -432,7 +432,7 @@ class spell_warr_enrage_proc : public AuraScript
return true;
}
static bool CheckBloodthirstProc(AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
static bool CheckBloodthirstProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& eventInfo)
{
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (!spellInfo || !spellInfo->IsAffected(SPELLFAMILY_WARRIOR, { 0x0, 0x400 })) // Bloodthirst/Bloodbath
@@ -462,7 +462,7 @@ class spell_warr_enrage_proc : public AuraScript
// 260798 - Execute (Arms, Protection)
class spell_warr_execute_damage : public SpellScript
{
static void CalculateExecuteDamage(SpellEffectInfo const& /*spellEffectInfo*/, Unit const* /*victim*/, int32 const& /*damageOrHealing*/, int32 const& /*flatMod*/, float& pctMod)
static void CalculateExecuteDamage(SpellScript const&, SpellEffectInfo const& /*spellEffectInfo*/, Unit const* /*victim*/, int32 const& /*damageOrHealing*/, int32 const& /*flatMod*/, float& pctMod)
{
// tooltip has 2 multiplier hardcoded in it $damage=${2.0*$260798s1}
pctMod *= 2.0f;
@@ -490,7 +490,7 @@ class spell_warr_frenzied_enrage : public SpellScript
return !GetCaster()->HasAura(SPELL_WARRIOR_FRENZIED_ENRAGE);
}
static void HandleFrenziedEnrage(WorldObject*& target)
static void HandleFrenziedEnrage(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}
@@ -575,7 +575,7 @@ class spell_warr_powerful_enrage : public SpellScript
return !GetCaster()->HasAura(SPELL_WARRIOR_POWERFUL_ENRAGE);
}
static void HandlePowerfulEnrage(WorldObject*& target)
static void HandlePowerfulEnrage(SpellScript const&, WorldObject*& target)
{
target = nullptr;
}
@@ -776,7 +776,7 @@ class spell_warr_intimidating_shout : public SpellScript
unitList.remove(GetExplTargetWorldObject());
}
static void ClearTargets(std::list<WorldObject*>& unitList)
static void ClearTargets(SpellScript const&, std::list<WorldObject*>& unitList)
{
// This is used in effect 3, which is an AOE Root effect.
// This doesn't seem to be a thing anymore, so we clear the targets list here.
@@ -1113,7 +1113,7 @@ class spell_warr_strategist : public AuraScript
&& ValidateSpellEffect({ { SPELL_WARRIOR_STRATEGIST, EFFECT_0 } });
}
static bool CheckProc(AuraEffect const* aurEff, ProcEventInfo const& /*procEvent*/)
static bool CheckProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& /*procEvent*/)
{
return roll_chance_i(aurEff->GetAmount());
}
@@ -1135,7 +1135,7 @@ class spell_warr_strategist : public AuraScript
// 280776 - Sudden Death
class spell_warr_sudden_death : public AuraScript
{
static bool CheckProc(ProcEventInfo const& eventInfo)
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
// should only proc on primary target
return eventInfo.GetActionTarget() == eventInfo.GetProcSpell()->m_targets.GetUnitTarget();