diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-02-24 15:52:09 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-08-08 21:21:34 +0200 |
| commit | a1a00f823e7e47e8cb652b71a839c1d0875a8f84 (patch) | |
| tree | ddffcb6efbfed6d4d27d8dd9320e552365a34545 /src/server/scripts | |
| parent | 30f8adda86f0c4376595866607a2e03cc88406eb (diff) | |
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 <creatureID, SpellClickInfo>
(cherry picked from commit 98d6258efdc07b53808ba6177e5427c65163bc0d)
Diffstat (limited to 'src/server/scripts')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index f3aff8909f7..694b7e2f5e5 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -50,9 +50,9 @@ public: lasherClicked = false; } - void OnSpellClick(Unit* clicker, bool& result) override + void OnSpellClick(Unit* clicker, bool spellClickHandled) override { - if (!result) + if (!spellClickHandled) return; if (roll_chance_i(CHANCE_HOSTILE)) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index ce1a9d077cc..bbd04e7890b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1034,9 +1034,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 6bf16caf512..e4aec26c651 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -764,9 +764,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 f6883912491..6928195ae4a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1436,9 +1436,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); |