From 3d39bf33bb1f94af8dc88bee5d4dbcc712687d0b Mon Sep 17 00:00:00 2001 From: Boondorl Date: Fri, 29 Aug 2025 15:14:39 -0400 Subject: [PATCH] Re-add handler param to MessageBox Init virtual This is just to prevent breaking any existing overrides. The value is fully unused. --- src/common/menu/messagebox.cpp | 2 +- wadsrc/static/zscript/engine/ui/menu/messagebox.zs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/menu/messagebox.cpp b/src/common/menu/messagebox.cpp index 7c5938243..6f6d8214e 100644 --- a/src/common/menu/messagebox.cpp +++ b/src/common/menu/messagebox.cpp @@ -70,7 +70,7 @@ DMenu *CreateMessageBoxMenu(DMenu *parent, const char *message, int messagemode, IFVIRTUALPTRNAME(p, NAME_MessageBoxMenu, Init) { p->PointerVar(NAME_Handler) = reinterpret_cast(handler); - VMValue params[] = { p, parent, &namestr, messagemode, playsound, action.GetIndex() }; + VMValue params[] = { p, parent, &namestr, messagemode, playsound, action.GetIndex(), (void*)nullptr }; VMCall(func, params, countof(params), nullptr, 0); return (DMenu*)p; } diff --git a/wadsrc/static/zscript/engine/ui/menu/messagebox.zs b/wadsrc/static/zscript/engine/ui/menu/messagebox.zs index 32dce5038..36f99cc8f 100644 --- a/wadsrc/static/zscript/engine/ui/menu/messagebox.zs +++ b/wadsrc/static/zscript/engine/ui/menu/messagebox.zs @@ -54,7 +54,7 @@ class MessageBoxMenu : Menu // //============================================================================= - virtual void Init(Menu parent, String message, int messagemode, bool playsound = false, Name cmd = 'None') + virtual void Init(Menu parent, String message, int messagemode, bool playsound = false, Name cmd = 'None', voidptr native_handler = null) { Super.Init(parent); mAction = cmd;