From 9f000a362078b9f77715ffdac2c729ad8dd8c417 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 30 Mar 2022 14:54:34 +0200 Subject: [PATCH] Move _menu_welcome_dialog_available initialization to XonoticWelcomeDialog_fill (no functional change) --- qcsrc/menu/xonotic/dialog_welcome.qc | 11 +++-------- qcsrc/menu/xonotic/dialog_welcome.qh | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc index 691e7cbf9..fc7abd168 100644 --- a/qcsrc/menu/xonotic/dialog_welcome.qc +++ b/qcsrc/menu/xonotic/dialog_welcome.qc @@ -27,14 +27,6 @@ float XonoticWelcomeDialog_keyDown(entity me, float key, float ascii, float shif } } -void XonoticWelcomeDialog_configureDialog(entity me) -{ - welcomeDialog_resetStrings(me); - SUPER(XonoticWelcomeDialog).configureDialog(me); - registercvar("_menu_welcome_dialog_available", "0", 0); - cvar_set("_menu_welcome_dialog_available", "1"); -} - void XonoticWelcomeDialog_destroy(entity me) { cvar_set("_menu_welcome_dialog_available", "0"); @@ -61,6 +53,9 @@ void XonoticWelcomeDialog_readInputArgs(entity me, int argsbuf) void XonoticWelcomeDialog_fill(entity me) { + registercvar("_menu_welcome_dialog_available", "0", 0); + cvar_set("_menu_welcome_dialog_available", "1"); + entity e; me.TR(me); diff --git a/qcsrc/menu/xonotic/dialog_welcome.qh b/qcsrc/menu/xonotic/dialog_welcome.qh index 63f18cafa..9417f55ac 100644 --- a/qcsrc/menu/xonotic/dialog_welcome.qh +++ b/qcsrc/menu/xonotic/dialog_welcome.qh @@ -11,7 +11,6 @@ CLASS(XonoticWelcomeDialog, XonoticRootDialog) ATTRIB(XonoticWelcomeDialog, name, string, "Welcome"); METHOD(XonoticWelcomeDialog, keyDown, float(entity, float, float, float)); - METHOD(XonoticWelcomeDialog, configureDialog, void(entity)); METHOD(XonoticWelcomeDialog, destroy, void(entity)); METHOD(XonoticWelcomeDialog, readInputArgs, void(entity, int)); ATTRIB(XonoticWelcomeDialog, serverinfo_name, string, string_null); -- 2.39.2