diff options
Diffstat (limited to 'src')
36 files changed, 148 insertions, 148 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index ed3d3d7e11b..e20464f1f7e 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -2208,7 +2208,7 @@ bool Aura::CallScriptCheckEffectProcHandlers(AuraEffect const* aurEff, AuraAppli return result; } -bool Aura::CallScriptEffectProcHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo) +bool Aura::CallScriptEffectProcHandlers(AuraEffect* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo) { bool preventDefault = false; for (auto scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end(); ++scritr) @@ -2227,7 +2227,7 @@ bool Aura::CallScriptEffectProcHandlers(AuraEffect const* aurEff, AuraApplicatio return preventDefault; } -void Aura::CallScriptAfterEffectProcHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo) +void Aura::CallScriptAfterEffectProcHandlers(AuraEffect* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo) { for (auto scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end(); ++scritr) { diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 9df9fdd5ccf..fc71e6c4eed 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -278,8 +278,8 @@ class TC_GAME_API Aura bool CallScriptPrepareProcHandlers(AuraApplication const* aurApp, ProcEventInfo& eventInfo); bool CallScriptProcHandlers(AuraApplication const* aurApp, ProcEventInfo& eventInfo); void CallScriptAfterProcHandlers(AuraApplication const* aurApp, ProcEventInfo& eventInfo); - bool CallScriptEffectProcHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo); - void CallScriptAfterEffectProcHandlers(AuraEffect const* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo); + bool CallScriptEffectProcHandlers(AuraEffect* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo); + void CallScriptAfterEffectProcHandlers(AuraEffect* aurEff, AuraApplication const* aurApp, ProcEventInfo& eventInfo); template <class Script> Script* GetScript(std::string const& scriptName) const diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index 638f69d8721..de737b0d5d0 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -973,7 +973,7 @@ AuraScript::EffectProcHandler::EffectProcHandler(AuraEffectProcFnType effectHand _EffectHandlerScript = effectHandlerScript; } -void AuraScript::EffectProcHandler::Call(AuraScript* auraScript, AuraEffect const* aurEff, ProcEventInfo& eventInfo) +void AuraScript::EffectProcHandler::Call(AuraScript* auraScript, AuraEffect* aurEff, ProcEventInfo& eventInfo) { (auraScript->*_EffectHandlerScript)(aurEff, eventInfo); } diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index e5a9fb5b491..8637994d86c 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -545,7 +545,7 @@ class TC_GAME_API AuraScript : public _SpellScript typedef bool(CLASSNAME::*AuraCheckProcFnType)(ProcEventInfo&); \ typedef bool(CLASSNAME::*AuraCheckEffectProcFnType)(AuraEffect const*, ProcEventInfo&); \ typedef void(CLASSNAME::*AuraProcFnType)(ProcEventInfo&); \ - typedef void(CLASSNAME::*AuraEffectProcFnType)(AuraEffect const*, ProcEventInfo&); \ + typedef void(CLASSNAME::*AuraEffectProcFnType)(AuraEffect*, ProcEventInfo&); \ AURASCRIPT_FUNCTION_TYPE_DEFINES(AuraScript) @@ -673,7 +673,7 @@ class TC_GAME_API AuraScript : public _SpellScript { public: EffectProcHandler(AuraEffectProcFnType effectHandlerScript, uint8 effIndex, uint16 effName); - void Call(AuraScript* auraScript, AuraEffect const* aurEff, ProcEventInfo& eventInfo); + void Call(AuraScript* auraScript, AuraEffect* aurEff, ProcEventInfo& eventInfo); private: AuraEffectProcFnType _EffectHandlerScript; }; diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp index 510a110df47..4e411bab59f 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp @@ -737,7 +737,7 @@ class spell_garothi_carnage : public AuraScript { PrepareAuraScript(spell_garothi_carnage); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo`*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo`*/) { // Usually we could just handle this via spell_proc but since we want // to silence the console message because it's not a spell trigger proc, we need a script here. diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index fe9e8751aab..92866ee6db0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -277,7 +277,7 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader return ValidateSpellInfo({ SPELL_VAMPIRIC_AURA_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 468f1f07863..fd2ff426303 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -701,7 +701,7 @@ class spell_baleroc_torment_AuraScript : public AuraScript return ValidateSpellInfo({ SPELL_VITAL_FLAME, SPELL_VITAL_SPARK, SPELL_TORMENTED }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* healer = eventInfo.GetProcTarget(); @@ -779,7 +779,7 @@ class spell_baleroc_vital_spark : public AuraScript return ValidateSpellInfo({ SPELL_BLAZE_OF_GLORY, SPELL_VITAL_FLAME }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); if (Unit* target = eventInfo.GetProcTarget()) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index fbd4a69b490..6479b1aa9e1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -402,7 +402,7 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader return GetCaster() && GetCaster()->IsAlive(); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 33234f60826..16e606cc8ec 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -719,7 +719,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL }); } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void OnProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 6bdfd7296b8..332f0ba7ae4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -1161,7 +1161,7 @@ class spell_deathbringer_blood_beast_blood_link : public SpellScriptLoader return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetProcTarget()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, 3, nullptr, true, nullptr, aurEff); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index c89db35b38b..95da8d82abb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1113,7 +1113,7 @@ class spell_putricide_ooze_tank_protection : public SpellScriptLoader return effect0 && effect1 && ValidateSpellInfo({ effect0->TriggerSpell, effect1->TriggerSpell }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 2648d8f55ae..d9ed312aae8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -3007,7 +3007,7 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DARK_HUNGER_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index d0004bf0c9e..68f5ecc9ab2 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -483,7 +483,7 @@ class spell_oculus_evasive_maneuvers : public SpellScriptLoader return ValidateSpellInfo({ SPELL_RUBY_EVASIVE_CHARGES }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->RemoveAuraFromStack(SPELL_RUBY_EVASIVE_CHARGES); @@ -596,7 +596,7 @@ class spell_oculus_temporal_rift : public SpellScriptLoader return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index ad0105717de..758b9cf2b6f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -1071,7 +1071,7 @@ class spell_xt002_321_boombot_aura : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { InstanceScript* instance = eventInfo.GetActor()->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 7855902bd8d..244683d8994 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -2458,7 +2458,7 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader // 64148 { PrepareAuraScript(spell_yogg_saron_diminsh_power_AuraScript); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); if (Spell* spell = GetTarget()->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) @@ -2728,7 +2728,7 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 return ValidateSpellInfo({ SPELL_GRIM_REPRISAL_DAMAGE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index d39c822dddb..3252ca42baf 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -467,7 +467,7 @@ class spell_ingvar_woe_strike : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetActor(), SPELL_WOE_STRIKE_EFFECT, true, nullptr, aurEff); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index cb69a578b21..cbd69caf365 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -219,7 +219,7 @@ class spell_uk_second_wind : public SpellScriptLoader return (spellInfo->GetAllEffectsMechanicMask() & ((1 << MECHANIC_ROOT) | (1 << MECHANIC_STUN))) != 0; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActionTarget(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index c3582f2232b..ec904c0cf11 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -198,7 +198,7 @@ class spell_koralon_meteor_fists : public SpellScriptLoader return ValidateSpellInfo({ SPELL_METEOR_FISTS_DAMAGE }); } - void TriggerFists(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void TriggerFists(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_METEOR_FISTS_DAMAGE, true, nullptr, aurEff); @@ -273,7 +273,7 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader return ValidateSpellInfo({ SPELL_FW_METEOR_FISTS_DAMAGE }); } - void TriggerFists(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void TriggerFists(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_FW_METEOR_FISTS_DAMAGE, true, nullptr, aurEff); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp index 6cae1f749aa..127d97bd007 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp @@ -38,7 +38,7 @@ class spell_mark_of_malice : public SpellScriptLoader return ValidateSpellInfo({ SPELL_MARK_OF_MALICE_TRIGGERED }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); // just drop charges diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 5dbb7775d32..21d240728d9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -674,7 +674,7 @@ class spell_reliquary_of_souls_aura_of_desire : public AuraScript return ValidateSpellInfo({ SPELL_AURA_OF_DESIRE_DAMAGE }); } - void OnProcSpell(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void OnProcSpell(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index ce777aa67c7..46bf1018822 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -953,7 +953,7 @@ public: return ValidateSpellInfo({ SPELL_COLD_SLAP }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_COLD_SLAP, true); diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 38e62341b7c..188b7544753 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -233,7 +233,7 @@ class spell_twisted_reflection : public SpellScriptLoader return ValidateSpellInfo({ SPELL_TWISTED_REFLECTION_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index 53d37de8cff..41e0ba17a56 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -46,7 +46,7 @@ class spell_dh_chaos_strike : public SpellScriptLoader return ValidateSpellInfo({ SPELL_CHAOS_STRIKE_ENERGIZE }); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastCustomSpell(SPELL_CHAOS_STRIKE_ENERGIZE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index fa4afb32583..ad34ee32759 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -301,7 +301,7 @@ class spell_dk_dancing_rune_weapon : public SpellScriptLoader } // This is a port of the old switch hack in Unit.cpp, it's not correct - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = GetCaster(); @@ -703,7 +703,7 @@ class spell_dk_mark_of_blood : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DK_MARK_OF_BLOOD_HEAL }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); if (Unit* caster = GetCaster()) @@ -737,7 +737,7 @@ class spell_dk_necrosis : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DK_NECROSIS_EFFECT }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_DK_NECROSIS_EFFECT, true); @@ -859,7 +859,7 @@ class spell_dk_pvp_4p_bonus : public SpellScriptLoader return (spellInfo->GetAllEffectsMechanicMask() & ((1 << MECHANIC_ROOT) | (1 << MECHANIC_SNARE))) != 0; } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActionTarget()->CastSpell(nullptr, SPELL_DK_RUNIC_RETURN, true); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 8740ab9ef0b..9455ba2b6bc 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -173,7 +173,7 @@ public: return false; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* target = eventInfo.GetActor(); @@ -386,7 +386,7 @@ public: return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_PROC }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); int32 amount = CalculatePct(eventInfo.GetHealInfo()->GetHeal(), aurEff->GetAmount()); @@ -420,7 +420,7 @@ public: return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff); @@ -557,7 +557,7 @@ class spell_dru_omen_of_clarity : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DRUID_BALANCE_T10_BONUS, SPELL_DRUID_BALANCE_T10_BONUS_PROC }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { Unit* target = GetTarget(); if (target->HasAura(SPELL_DRUID_BALANCE_T10_BONUS)) @@ -661,7 +661,7 @@ public: }); } - void HandleEffectCatProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectCatProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); if (GetTarget()->GetShapeshiftForm() != FORM_CAT_FORM || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_CAT) @@ -671,7 +671,7 @@ public: GetTarget()->CastSpell(GetTarget(), SPELL_DRUID_STAMPEDE_CAT_STATE, true, nullptr, aurEff); } - void HandleEffectBearProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectBearProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); if (GetTarget()->GetShapeshiftForm() != FORM_BEAR_FORM || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR) @@ -880,7 +880,7 @@ class spell_dru_t3_6p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DRUID_BLESSING_OF_THE_CLAW }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActor()->CastSpell(eventInfo.GetProcTarget(), SPELL_DRUID_BLESSING_OF_THE_CLAW, true, nullptr, aurEff); @@ -913,7 +913,7 @@ class spell_dru_t3_8p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DRUID_EXHILARATE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Spell const* spell = eventInfo.GetProcSpell(); @@ -958,7 +958,7 @@ class spell_dru_t4_2p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DRUID_INFUSION }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActor()->CastSpell(nullptr, SPELL_DRUID_INFUSION, true, nullptr, aurEff); @@ -1175,7 +1175,7 @@ class spell_dru_item_t6_trinket : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); @@ -1237,7 +1237,7 @@ class spell_dru_t10_balance_4p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_DRUID_LANGUISH }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1356,7 +1356,7 @@ class spell_dru_t10_restoration_4p_bonus_dummy : public SpellScriptLoader return caster->GetGroup() || caster != eventInfo.GetProcTarget(); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 1b7aca2f76f..0d39c1181ad 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -113,7 +113,7 @@ class spell_gen_adaptive_warding : public AuraScript return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -360,7 +360,7 @@ class spell_gen_blood_reserve : public AuraScript return false; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1400,7 +1400,7 @@ class spell_gen_interrupt : public AuraScript return ValidateSpellInfo({ SPELL_GEN_THROW_INTERRUPT }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_GEN_THROW_INTERRUPT, true, nullptr, aurEff); @@ -1667,7 +1667,7 @@ class spell_gen_moss_covered_feet : public AuraScript return ValidateSpellInfo({ SPELL_FALL_DOWN }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActionTarget()->CastSpell(nullptr, SPELL_FALL_DOWN, true, nullptr, aurEff); @@ -1799,7 +1799,7 @@ class spell_gen_obsidian_armor : public AuraScript return true; } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void OnProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -2793,7 +2793,7 @@ class spell_gen_vampiric_touch : public AuraScript return ValidateSpellInfo({ SPELL_VAMPIRIC_TOUCH_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 9e6134064be..564214943a8 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -321,7 +321,7 @@ class spell_hun_hunting_party : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->GetSpellHistory()->ModifyCooldown(SPELL_HUNTER_EXHILARATION, -Seconds(aurEff->GetAmount())); @@ -360,7 +360,7 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_IMPROVED_MEND_PET, true, nullptr, aurEff); @@ -520,7 +520,7 @@ class spell_hun_misdirection : public SpellScriptLoader return GetTarget()->GetRedirectThreatTarget() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, nullptr, aurEff); @@ -761,7 +761,7 @@ class spell_hun_roar_of_sacrifice : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1018,7 +1018,7 @@ public: return false; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); @@ -1059,7 +1059,7 @@ class spell_hun_tnt : public SpellScriptLoader return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_LOCK_AND_LOAD, true, nullptr, aurEff); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 1ad97453c49..c19cd6e1657 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -97,7 +97,7 @@ class spell_item_aegis_of_preservation : public AuraScript return ValidateSpellInfo({ SPELL_AEGIS_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_AEGIS_HEAL, true, nullptr, aurEff); @@ -143,7 +143,7 @@ class spell_item_alchemist_stone : public AuraScript return eventInfo.GetDamageInfo()->GetSpellInfo()->SpellFamilyName == SPELLFAMILY_POTION; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -201,7 +201,7 @@ class spell_item_anger_capacitor : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); @@ -291,7 +291,7 @@ class spell_item_aura_of_madness : public AuraScript }) && sBroadcastTextStore.LookupEntry(SAY_MADNESS); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { static std::vector<uint32> const triggeredSpells[MAX_CLASSES] = { @@ -382,7 +382,7 @@ class spell_item_blessing_of_ancient_kings : public AuraScript return eventInfo.GetProcTarget() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -420,7 +420,7 @@ class spell_item_deadly_precision : public AuraScript { PrepareAuraScript(spell_item_deadly_precision); - void HandleStackDrop(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleStackDrop(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->RemoveAuraFromStack(GetId(), GetTarget()->GetGUID()); @@ -497,7 +497,7 @@ class spell_item_deathbringers_will : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { static std::vector<uint32> const triggeredSpells[MAX_CLASSES] = { @@ -658,7 +658,7 @@ class spell_item_desperate_defense : public AuraScript return ValidateSpellInfo({ SPELL_DESPERATE_RAGE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_DESPERATE_RAGE, true, nullptr, aurEff); @@ -723,7 +723,7 @@ class spell_item_discerning_eye_beast_dummy : public AuraScript return ValidateSpellInfo({ SPELL_DISCERNING_EYE_BEAST }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActor()->CastSpell(nullptr, SPELL_DISCERNING_EYE_BEAST, true, nullptr, aurEff); @@ -773,7 +773,7 @@ class spell_item_fate_rune_of_unsurpassed_vigor : public AuraScript return ValidateSpellInfo({ SPELL_UNSURPASSED_VIGOR }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_UNSURPASSED_VIGOR, true); @@ -864,7 +864,7 @@ class spell_item_frozen_shadoweave : public AuraScript return ValidateSpellInfo({ SPELL_SHADOWMEND }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -984,7 +984,7 @@ class spell_item_heartpierce : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); @@ -1120,7 +1120,7 @@ class spell_item_mark_of_conquest : public AuraScript return ValidateSpellInfo({ SPELL_MARK_OF_CONQUEST_ENERGIZE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { if (eventInfo.GetTypeMask() & (PROC_FLAG_DONE_RANGED_AUTO_ATTACK | PROC_FLAG_DONE_SPELL_RANGED_DMG_CLASS)) { @@ -1202,7 +1202,7 @@ class spell_item_necrotic_touch : public AuraScript return eventInfo.GetProcTarget() && eventInfo.GetProcTarget()->IsAlive(); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -1355,7 +1355,7 @@ class spell_item_persistent_shield : public AuraScript return eventInfo.GetHealInfo() && eventInfo.GetHealInfo()->GetHeal(); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { Unit* caster = eventInfo.GetActor(); Unit* target = eventInfo.GetProcTarget(); @@ -1393,7 +1393,7 @@ class spell_item_pet_healing : public AuraScript return ValidateSpellInfo({ SPELL_HEALTH_LINK }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -1624,7 +1624,7 @@ class spell_item_shadowmourne : public AuraScript return eventInfo.GetProcTarget() && eventInfo.GetProcTarget()->IsAlive(); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_SHADOWMOURNE_SOUL_FRAGMENT, true, nullptr, aurEff); @@ -1778,7 +1778,7 @@ class spell_item_swift_hand_justice_dummy : public AuraScript return ValidateSpellInfo({ SPELL_SWIFT_HAND_OF_JUSTICE_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -2990,7 +2990,7 @@ class spell_item_shard_of_the_scale : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); @@ -3038,7 +3038,7 @@ class spell_item_soul_preserver : public AuraScript }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -3123,7 +3123,7 @@ class spell_item_sunwell_neck : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Player* player = eventInfo.GetActor()->ToPlayer(); @@ -3201,7 +3201,7 @@ class spell_item_death_choice : public AuraScript }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -3277,7 +3277,7 @@ public: return ValidateSpellInfo({ _stackSpell, _triggerSpell }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -3340,7 +3340,7 @@ class spell_item_darkmoon_card_greatness : public AuraScript }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -3406,7 +3406,7 @@ class spell_item_mana_drain : public AuraScript }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -3600,7 +3600,7 @@ class spell_item_zandalarian_charm : public SpellScriptLoader return false; } - void HandleStackDrop(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleStackDrop(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->RemoveAuraFromStack(_spellId); diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 3b7c8332385..61d443a1a44 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -91,7 +91,7 @@ class spell_mage_blazing_barrier : public AuraScript amount = int32(caster->SpellBaseHealingBonusDone(GetSpellInfo()->GetSchoolMask()) * 7.0f); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetDamageInfo()->GetVictim(); @@ -281,7 +281,7 @@ class spell_mage_fingers_of_frost : public AuraScript { PrepareAuraScript(spell_mage_fingers_of_frost); - void SuppressWarning(AuraEffect const* /*aurEff*/, ProcEventInfo& /*procInfo*/) + void SuppressWarning(AuraEffect* /*aurEff*/, ProcEventInfo& /*procInfo*/) { PreventDefaultAction(); } @@ -318,7 +318,7 @@ class spell_mage_ice_barrier : public AuraScript amount += int32(caster->SpellBaseHealingBonusDone(GetSpellInfo()->GetSchoolMask()) * 10.0f); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { Unit* caster = eventInfo.GetDamageInfo()->GetVictim(); Unit* target = eventInfo.GetDamageInfo()->GetAttacker(); @@ -429,7 +429,7 @@ class spell_mage_ignite : public AuraScript return eventInfo.GetProcTarget() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -459,7 +459,7 @@ class spell_mage_imp_mana_gems : public AuraScript return ValidateSpellInfo({ SPELL_MAGE_MANA_SURGE }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActor()->CastSpell(nullptr, SPELL_MAGE_MANA_SURGE, true); diff --git a/src/server/scripts/Spells/spell_monk.cpp b/src/server/scripts/Spells/spell_monk.cpp index e501e20e7e3..772244cf753 100644 --- a/src/server/scripts/Spells/spell_monk.cpp +++ b/src/server/scripts/Spells/spell_monk.cpp @@ -97,7 +97,7 @@ class spell_monk_crackling_jade_lightning_knockback_proc_aura : public AuraScrip return true; } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { GetTarget()->CastSpell(eventInfo.GetActor(), SPELL_MONK_CRACKLING_JADE_LIGHTNING_KNOCKBACK, TRIGGERED_FULL_MASK); GetTarget()->CastSpell(GetTarget(), SPELL_MONK_CRACKLING_JADE_LIGHTNING_KNOCKBACK_CD, TRIGGERED_FULL_MASK); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 43ae326ade2..5363c00587a 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -601,7 +601,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE }); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -644,7 +644,7 @@ class spell_pal_grand_crusader : public SpellScriptLoader return GetTarget()->GetTypeId() == TYPEID_PLAYER; } - void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { GetTarget()->GetSpellHistory()->ResetCooldown(SPELL_PALADIN_AVENGERS_SHIELD, true); } @@ -833,7 +833,7 @@ class spell_pal_item_healing_discount : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PALADIN_ITEM_HEALING_TRANCE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_ITEM_HEALING_TRANCE, true, nullptr, aurEff); @@ -870,7 +870,7 @@ class spell_pal_item_t6_trinket : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); @@ -1025,7 +1025,7 @@ class spell_pal_light_s_beacon : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1292,7 +1292,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader return eventInfo.GetProcTarget() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1337,7 +1337,7 @@ class spell_pal_t3_6p_bonus : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1398,7 +1398,7 @@ class spell_pal_t8_2p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PALADIN_HOLY_MENDING }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index f4c9d83f36e..12311b51d8d 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -142,7 +142,7 @@ class spell_pri_aq_3p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PRIEST_ORACULAR_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); @@ -191,7 +191,7 @@ public: return eventInfo.GetDamageInfo() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { DamageInfo* damageInfo = eventInfo.GetDamageInfo(); int32 heal = CalculatePct(damageInfo->GetDamage(), aurEff->GetAmount()); @@ -299,7 +299,7 @@ class spell_pri_body_and_soul : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PRIEST_CURE_DISEASE, SPELL_PRIEST_BODY_AND_SOUL_DISPEL }); } - void HandleEffectSpeedProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectSpeedProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); // Proc only with Power Word: Shield or Leap of Faith @@ -309,7 +309,7 @@ class spell_pri_body_and_soul : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_BODY_AND_SOUL_SPEED, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), eventInfo.GetProcTarget(), true, nullptr, aurEff); } - void HandleEffectDispelProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectDispelProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); // Proc only with Cure Disease @@ -451,7 +451,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader return eventInfo.GetProcTarget() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -533,7 +533,7 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -700,7 +700,7 @@ class spell_pri_item_t6_trinket : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PRIEST_DIVINE_BLESSING, SPELL_PRIEST_DIVINE_WRATH }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); @@ -873,7 +873,7 @@ class spell_pri_mana_leech : public SpellScriptLoader return _procTarget != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, nullptr, aurEff); @@ -1037,7 +1037,7 @@ class spell_pri_phantasm : public SpellScriptLoader return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); } - void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->RemoveMovementImpairingAuras(true); @@ -1239,7 +1239,7 @@ class spell_pri_t3_4p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PRIEST_ARMOR_OF_FAITH }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetActor()->CastSpell(eventInfo.GetProcTarget(), SPELL_PRIEST_ARMOR_OF_FAITH, true, nullptr, aurEff); @@ -1283,7 +1283,7 @@ class spell_pri_t5_heal_2p_bonus : public SpellScriptLoader return false; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_PRIEST_ITEM_EFFICIENCY, true, nullptr, aurEff); @@ -1317,7 +1317,7 @@ class spell_pri_t10_heal_2p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_PRIEST_BLESSED_HEALING }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1370,7 +1370,7 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader return !(eventInfo.GetDamageInfo()->GetSpellInfo()->SpellFamilyFlags[1] & 0x80000); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -1459,7 +1459,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader return eventInfo.GetProcTarget() == GetCaster(); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); eventInfo.GetProcTarget()->CastSpell(nullptr, SPELL_GEN_REPLENISHMENT, true, nullptr, aurEff); diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 23b05309a3d..5c4c0c82f4a 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -85,7 +85,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader return _procTarget && eventInfo.GetDamageInfo(); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -191,7 +191,7 @@ class spell_rog_crippling_poison : public SpellScriptLoader return ValidateSpellInfo({ SPELL_ROGUE_CRIPPLING_POISON }); } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void OnProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_ROGUE_CRIPPLING_POISON, true, nullptr, aurEff); @@ -764,7 +764,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader return _redirectTarget != nullptr; } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -867,7 +867,7 @@ public: return ValidateSpellInfo({ SPELL_ROGUE_HONOR_AMONG_THIEVES_ENERGIZE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 5a3f44d8688..d88b6a12216 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -104,7 +104,7 @@ public: return true; } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); int32 bp0 = CalculatePct(int32(eventInfo.GetDamageInfo()->GetDamage()), aurEff->GetAmount()); @@ -270,7 +270,7 @@ class spell_sha_earth_shield : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -307,7 +307,7 @@ public: return ValidateSpellInfo({ SPELL_SHAMAN_EARTHEN_RAGE_PERIODIC, SPELL_SHAMAN_EARTHEN_RAGE_DAMAGE }); } - void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); _procTargetGuid = eventInfo.GetProcTarget()->GetGUID(); @@ -462,7 +462,7 @@ public: return ValidateSpellInfo({ SPELL_SHAMAN_FLAMETONGUE_ATTACK }); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -581,7 +581,7 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD, true, nullptr, aurEff); @@ -614,7 +614,7 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE, true, nullptr, aurEff); @@ -652,7 +652,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader return eventInfo.GetProcSpell() != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -698,7 +698,7 @@ class spell_sha_item_t6_trinket : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); SpellInfo const* spellInfo = eventInfo.GetSpellInfo(); @@ -760,7 +760,7 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY }); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); if (Player* target = GetTarget()->ToPlayer()) @@ -858,7 +858,7 @@ class spell_sha_lava_surge : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_SURGE }); } - void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_LAVA_SURGE, true); @@ -980,7 +980,7 @@ class spell_sha_tidal_waves : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_TIDAL_WAVES }); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); int32 basePoints0 = -aurEff->GetAmount(); @@ -1022,7 +1022,7 @@ class spell_sha_t3_6p_bonus : public SpellScriptLoader }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1083,7 +1083,7 @@ class spell_sha_t8_elemental_4p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_ELECTRIFIED }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1130,7 +1130,7 @@ class spell_sha_t9_elemental_4p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_BURST_BONUS_DAMAGE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1172,7 +1172,7 @@ class spell_sha_t10_elemental_4p_bonus : public SpellScriptLoader { PrepareAuraScript(spell_sha_t10_elemental_4p_bonus_AuraScript); - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1222,7 +1222,7 @@ class spell_sha_t10_restoration_4p_bonus : public SpellScriptLoader return ValidateSpellInfo({ SPELL_SHAMAN_CHAINED_HEAL }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1269,7 +1269,7 @@ public: return ValidateSpellInfo({ SPELL_SHAMAN_WINDFURY_ATTACK }); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 950898134d6..16315308aed 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -604,7 +604,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader return GetTarget()->GetGuardianPet() != nullptr; } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void OnProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -640,7 +640,7 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME }); } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void OnProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME, true, nullptr, aurEff); @@ -823,7 +823,7 @@ class spell_warl_improved_soul_fire : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARLOCK_IMPROVED_SOUL_FIRE_PCT, SPELL_WARLOCK_IMPROVED_SOUL_FIRE_STATE }); } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void OnProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); GetTarget()->CastCustomSpell(SPELL_WARLOCK_IMPROVED_SOUL_FIRE_PCT, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, nullptr, aurEff); @@ -968,7 +968,7 @@ class spell_warl_seed_of_corruption_dummy : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARLOCK_SEED_OF_CORRUPTION_DAMAGE }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -1025,7 +1025,7 @@ class spell_warl_seed_of_corruption_generic : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARLOCK_SEED_OF_CORRUPTION_GENERIC }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -1111,7 +1111,7 @@ class spell_warl_soul_leech : public SpellScriptLoader return ValidateSpellInfo({ SPELL_GEN_REPLENISHMENT }); } - void OnProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void OnProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { GetTarget()->CastSpell(nullptr, SPELL_GEN_REPLENISHMENT, true, nullptr, aurEff); } @@ -1381,7 +1381,7 @@ class spell_warl_t4_2p_bonus : public SpellScriptLoader return ValidateSpellInfo({ Trigger }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); Unit* caster = eventInfo.GetActor(); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 5f30a1399c0..43a6ed4ea83 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -573,7 +573,7 @@ class spell_warr_lambs_to_the_slaughter : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARRIOR_MORTAL_STRIKE, SPELL_WARRIOR_REND }); } - void OnProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) + void OnProc(AuraEffect* /*aurEff*/, ProcEventInfo& eventInfo) { if (Aura* aur = eventInfo.GetProcTarget()->GetAura(SPELL_WARRIOR_REND, GetTarget()->GetGUID())) aur->SetDuration(aur->GetSpellInfo()->GetMaxDuration(), true); @@ -797,7 +797,7 @@ class spell_warr_retaliation : public SpellScriptLoader return GetTarget()->isInFront(eventInfo.GetActor(), float(M_PI)) && !GetTarget()->HasUnitState(UNIT_STATE_STUNNED); } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARRIOR_RETALIATION_DAMAGE, true, nullptr, aurEff); @@ -909,7 +909,7 @@ class spell_warr_second_wind_proc : public SpellScriptLoader return true; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); uint32 spellId = 0; @@ -1106,7 +1106,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader return _procTarget != nullptr; } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); if (DamageInfo* damageInfo = eventInfo.GetDamageInfo()) @@ -1155,7 +1155,7 @@ class spell_warr_sword_and_board : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARRIOR_SHIELD_SLAM }); } - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { // Remove cooldown on Shield Slam if (Player* player = GetTarget()->ToPlayer()) @@ -1189,7 +1189,7 @@ public: return ValidateSpellInfo({ SPELL_WARRIOR_TRAUMA_EFFECT }); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { Unit* target = eventInfo.GetActionTarget(); //Get the Remaining Damage from the aura (if exist) @@ -1261,7 +1261,7 @@ class spell_warr_victorious_state : public SpellScriptLoader return ValidateSpellInfo({ SPELL_WARRIOR_IMPENDING_VICTORY }); } - void HandleOnProc(AuraEffect const* /*aurEff*/, ProcEventInfo& procInfo) + void HandleOnProc(AuraEffect* /*aurEff*/, ProcEventInfo& procInfo) { if (procInfo.GetActor()->GetTypeId() == TYPEID_PLAYER && procInfo.GetActor()->ToPlayer()->GetPrimarySpecialization() == TALENT_SPEC_WARRIOR_FURY) PreventDefaultAction(); @@ -1347,7 +1347,7 @@ class spell_warr_vigilance : public SpellScriptLoader return _procTarget && eventInfo.GetDamageInfo(); } - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); int32 damage = int32(CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue())); |