mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove *WithReturn duplication

Browse Source 
This has been introduced in 1ed64439ea.
This commit is contained in:
phosit
2025-11-04 09:25:41 +01:00
parent 75feace618
commit 7ccea4ace9
3 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/ObjectBases/IGUIObject.cpp
+3 -13
View File
@@ -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<CStr, JS::Heap<JSObject*> >::iterator it = m_ScriptHandlers.find(eventName);
if (it == m_ScriptHandlers.end())
source/gui/ObjectBases/IGUIObject.h
+2 -20
View File
@@ -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.
source/gui/ObjectTypes/CMiniMap.cpp
+1 -1
View File
@@ -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