From 98d6258efdc07b53808ba6177e5427c65163bc0d Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 24 Feb 2018 15:52:09 -0300 Subject: Core/Entities: kill unused return value from Unit::HandleSpellClick - AI hook will now receive the result by copy, as modifying it had no effect - Some renaming: result->spellClickHandled, clickPair is actually clickBounds, the clickPair is the pair --- .../scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp | 4 ++-- src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp | 4 ++-- src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 82142a55511..d5e5dfcb5d7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1035,9 +1035,9 @@ class npc_dream_portal : public CreatureScript { } - void OnSpellClick(Unit* /*clicker*/, bool& result) override + void OnSpellClick(Unit* /*clicker*/, bool spellClickHandled) override { - if (!result) + if (!spellClickHandled) return; _used = true; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 6aee2b0f3e2..1d58d2bf336 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -762,9 +762,9 @@ class boss_flame_leviathan_overload_device : public CreatureScript { } - void OnSpellClick(Unit* /*clicker*/, bool& result) override + void OnSpellClick(Unit* /*clicker*/, bool spellClickHandled) override { - if (!result) + if (!spellClickHandled) return; if (me->GetVehicle()) 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 d4c65a7b87e..a9d28dd6561 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1437,9 +1437,9 @@ class npc_descend_into_madness : public CreatureScript { npc_descend_into_madnessAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void OnSpellClick(Unit* clicker, bool& result) override + void OnSpellClick(Unit* clicker, bool spellClickHandled) override { - if (!result) + if (!spellClickHandled) return; clicker->RemoveAurasDueToSpell(SPELL_BRAIN_LINK); -- cgit v1.2.3