From a1a00f823e7e47e8cb652b71a839c1d0875a8f84 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 (cherry picked from commit 98d6258efdc07b53808ba6177e5427c65163bc0d) --- src/server/game/AI/SmartScripts/SmartAI.cpp | 4 ++-- src/server/game/AI/SmartScripts/SmartAI.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/AI/SmartScripts') diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 2536d364845..943748e6be2 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -840,9 +840,9 @@ void SmartAI::OnGameEvent(bool start, uint16 eventId) GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, nullptr, eventId); } -void SmartAI::OnSpellClick(Unit* clicker, bool& result) +void SmartAI::OnSpellClick(Unit* clicker, bool spellClickHandled) { - if (!result) + if (!spellClickHandled) return; GetScript()->ProcessEventsFor(SMART_EVENT_ON_SPELLCLICK, clicker); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 614c727e724..591b10ba70f 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -186,7 +186,7 @@ class TC_GAME_API SmartAI : public CreatureAI } void StartDespawn() { mDespawnState = 2; } - void OnSpellClick(Unit* clicker, bool& result) override; + void OnSpellClick(Unit* clicker, bool spellClickHandled) override; void SetWPPauseTimer(uint32 time) { _waypointPauseTimer = time; } -- cgit v1.2.3