OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "- add argument for EventHandler.Find() which allows searching by parent class (default false)"

Browse source 
This reverts commit abdacad8d3.

Revert "- missed one"

This reverts commit 03123b96de.
This commit is contained in:
Rachael Alexanderson 2025-08-30 06:02:41 -04:00
commit 53ffd97822
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/events.cpp
View file

@ -1699,14 +1699,9 @@ DEFINE_ACTION_FUNCTION(DEventHandler, Find)
{
PARAM_PROLOGUE;
PARAM_CLASS(t, DStaticEventHandler);
PARAM_BOOL(subclass);
for (DStaticEventHandler* handler = currentVMLevel->localEventManager->FirstEventHandler; handler; handler = handler->next)
{
if (handler->GetClass() == t) // check precise class
ACTION_RETURN_OBJECT(handler);
else if (subclass && handler->IsKindOf(t));
ACTION_RETURN_OBJECT(handler);
}
ACTION_RETURN_OBJECT(nullptr);
}
@ -1715,14 +1710,9 @@ DEFINE_ACTION_FUNCTION(DStaticEventHandler, Find)
{
PARAM_PROLOGUE;
PARAM_CLASS(t, DStaticEventHandler);
PARAM_BOOL(subclass);
for (DStaticEventHandler* handler = staticEventManager.FirstEventHandler; handler; handler = handler->next)
{
if (handler->GetClass() == t) // check precise class
ACTION_RETURN_OBJECT(handler);
else if (subclass && handler->IsKindOf(t));
ACTION_RETURN_OBJECT(handler);
}
ACTION_RETURN_OBJECT(nullptr);
}

4
wadsrc/static/zscript/events.zs
View file

@ -148,7 +148,7 @@ class StaticEventHandler : Object native play version("2.4")
{
// static event handlers CAN register other static event handlers.
// unlike EventHandler.Create that will not create them.
clearscope static native StaticEventHandler Find(Class<StaticEventHandler> type, bool subclass = false); // just for convenience. who knows.
clearscope static native StaticEventHandler Find(Class<StaticEventHandler> type); // just for convenience. who knows.
// these are called when the handler gets registered or unregistered
// you can set Order/IsUiProcessor here.
@ -221,7 +221,7 @@ class StaticEventHandler : Object native play version("2.4")
class EventHandler : StaticEventHandler native version("2.4")
{
clearscope static native StaticEventHandler Find(class<StaticEventHandler> type, bool subclass = false);
clearscope static native StaticEventHandler Find(class<StaticEventHandler> type);
clearscope static native void SendNetworkEvent(String name, int arg1 = 0, int arg2 = 0, int arg3 = 0);
version("4.12") clearscope static native vararg bool SendNetworkCommand(Name cmd, ...);
version("4.12") clearscope static native bool SendNetworkBuffer(Name cmd, NetworkBuffer buffer);