Move _menu_welcome_dialog_available initialization to XonoticWelcomeDialog_fill ...

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc
index 691e7cbf9f4af184daed175275fa4912d1fb97bc..fc7abd168a150d5d5dafb488409d572efbc3f3f6 100644 (file)
--- 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 63f18cafaa7ae64fa8cf03944214e16313f3a705..9417f55ac3f56a04686d7fa474167d87617f1599 100644 (file)
--- 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);