From 9f24d8babce31b5b60d430cf1b5072749275ea1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Sun, 16 Jul 2023 19:03:30 -0300 Subject: [PATCH] Move StartGameDirect from PlayerMenu to Menu --- src/menu/doommenu.cpp | 2 +- wadsrc/static/zscript/ui/menu/playermenu.zs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/menu/doommenu.cpp b/src/menu/doommenu.cpp index c9f54e581..f2a80ddc6 100644 --- a/src/menu/doommenu.cpp +++ b/src/menu/doommenu.cpp @@ -135,7 +135,7 @@ void StartGameDirect(bool hasPlayerClass, bool randomPlayerClass, PClassActor * } } -DEFINE_ACTION_FUNCTION_NATIVE(DPlayerMenu, StartGameDirect, StartGameDirect) +DEFINE_ACTION_FUNCTION_NATIVE(DMenu, StartGameDirect, StartGameDirect) { PARAM_PROLOGUE; PARAM_BOOL(hasPlayerClass); diff --git a/wadsrc/static/zscript/ui/menu/playermenu.zs b/wadsrc/static/zscript/ui/menu/playermenu.zs index 38a577a6d..85a4b944b 100644 --- a/wadsrc/static/zscript/ui/menu/playermenu.zs +++ b/wadsrc/static/zscript/ui/menu/playermenu.zs @@ -33,6 +33,11 @@ ** */ +extend class Menu +{ + static native void StartGameDirect(bool hasPlayerClass, bool randomPlayerClass, Class playerClass, int Episode, int Skill); +} + class PlayerMenu : ListMenu { int mRotation; @@ -40,8 +45,6 @@ class PlayerMenu : ListMenu PlayerClass mPlayerClass; Array PlayerColorSets; Array mPlayerSkins; - - static native void StartGameDirect(bool hasPlayerClass, bool randomPlayerClass, Class playerClass, int Episode, int Skill); // All write function for the player config are native to prevent abuse. static native void AutoaimChanged(float val);