From 7ccea4ace95b6d01b70e40c4d0af339599e0f7ce Mon Sep 17 00:00:00 2001 From: phosit Date: Tue, 4 Nov 2025 09:25:41 +0100 Subject: [PATCH] Remove *WithReturn duplication This has been introduced in 1ed64439ea3. --- source/gui/ObjectBases/IGUIObject.cpp | 16 +++------------- source/gui/ObjectBases/IGUIObject.h | 22 ++-------------------- source/gui/ObjectTypes/CMiniMap.cpp | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/source/gui/ObjectBases/IGUIObject.cpp b/source/gui/ObjectBases/IGUIObject.cpp index ea20d2262d..fba0c731d6 100644 --- a/source/gui/ObjectBases/IGUIObject.cpp +++ b/source/gui/ObjectBases/IGUIObject.cpp @@ -447,27 +447,17 @@ InReaction IGUIObject::SendMouseEvent(EGUIMessageType type, const CStr& eventNam return msg.skipped ? IN_PASS : IN_HANDLED; } -void IGUIObject::ScriptEvent(const CStr& eventName) -{ - ScriptEventWithReturn(eventName); -} - -bool IGUIObject::ScriptEventWithReturn(const CStr& eventName) +bool IGUIObject::ScriptEvent(const CStr& eventName) { if (m_ScriptHandlers.find(eventName) == m_ScriptHandlers.end()) return false; ScriptRequest rq(m_pGUI.GetScriptInterface()); JS::RootedValueVector paramData(rq.cx); - return ScriptEventWithReturn(eventName, paramData); + return ScriptEvent(eventName, paramData); } -void IGUIObject::ScriptEvent(const CStr& eventName, const JS::HandleValueArray& paramData) -{ - ScriptEventWithReturn(eventName, paramData); -} - -bool IGUIObject::ScriptEventWithReturn(const CStr& eventName, const JS::HandleValueArray& paramData) +bool IGUIObject::ScriptEvent(const CStr& eventName, const JS::HandleValueArray& paramData) { std::map >::iterator it = m_ScriptHandlers.find(eventName); if (it == m_ScriptHandlers.end()) diff --git a/source/gui/ObjectBases/IGUIObject.h b/source/gui/ObjectBases/IGUIObject.h index fbd8d9b198..ec52e4722e 100644 --- a/source/gui/ObjectBases/IGUIObject.h +++ b/source/gui/ObjectBases/IGUIObject.h @@ -396,15 +396,6 @@ protected: */ CRect m_CachedActualSize; - /** - * Execute the script for a particular action. - * Does nothing if no script has been registered for that action. - * The mouse coordinates will be passed as the first argument. - * - * @param eventName Name of action - */ - void ScriptEvent(const CStr& eventName); - /** * Execute the script for a particular action. * Does nothing if no script has been registered for that action. @@ -414,16 +405,7 @@ protected: * * @return True if the script returned something truthy. */ - bool ScriptEventWithReturn(const CStr& eventName); - - /** - * Execute the script for a particular action. - * Does nothing if no script has been registered for that action. - * - * @param eventName Name of action - * @param paramData JS::HandleValueArray arguments to pass to the event. - */ - void ScriptEvent(const CStr& eventName, const JS::HandleValueArray& paramData); + bool ScriptEvent(const CStr& eventName); /** * Execute the script for a particular action. @@ -434,7 +416,7 @@ protected: * * @return True if the script returned something truthy. */ - bool ScriptEventWithReturn(const CStr& eventName, const JS::HandleValueArray& paramData); + bool ScriptEvent(const CStr& eventName, const JS::HandleValueArray& paramData); /** * Assigns a JS function to the event name. diff --git a/source/gui/ObjectTypes/CMiniMap.cpp b/source/gui/ObjectTypes/CMiniMap.cpp index 4afc3f9bdc..f45981f98a 100644 --- a/source/gui/ObjectTypes/CMiniMap.cpp +++ b/source/gui/ObjectTypes/CMiniMap.cpp @@ -272,7 +272,7 @@ bool CMiniMap::FireWorldClickEvent(int button, int /*clicks*/) std::ignore = paramData.append(coords); std::ignore = paramData.append(buttonJs); - return ScriptEventWithReturn(EventNameWorldClick, paramData); + return ScriptEvent(EventNameWorldClick, paramData); } // This sets up and draws the rectangle on the minimap