Small cleanups

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_welcome.qc

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc
index 4c3166649d88304810918dc02e02eabe47f17723..691e7cbf9f4af184daed175275fa4912d1fb97bc 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_welcome.qc
+++ b/qcsrc/menu/xonotic/dialog_welcome.qc
@@ -9,14 +9,10 @@
 
 void welcomeDialog_resetStrings(entity me)
 {
-       if(me.serverinfo_name)
-               strunzone(me.serverinfo_name);
-       me.serverinfo_name = strzone(_("<NO NAME>"));
-
-       if(me.serverinfo_MOTD)
-               strunzone(me.serverinfo_MOTD);
-       me.serverinfo_MOTD = strzone(_("<NO MOTD>"));
+       strcpy(me.serverinfo_name, "<NO HOSTNAME>");
+       strcpy(me.serverinfo_MOTD, "<NO WELCOME MESSAGE>");
 }
+
 float XonoticWelcomeDialog_keyDown(entity me, float key, float ascii, float shift)
 {
        switch(key)
@@ -24,22 +20,27 @@ float XonoticWelcomeDialog_keyDown(entity me, float key, float ascii, float shif
                case K_KP_ENTER:
                case K_ENTER:
                case K_SPACE:
-                       XonoticWelcomeDialog_close(me);
+                       me.close(me);
                        return true;
                default:
                        return SUPER(XonoticWelcomeDialog).keyDown(me, key, ascii, shift);
        }
 }
-void XonoticWelcomeDialog_close(entity me)
-{
-       SUPER(XonoticWelcomeDialog).close(me);
-}
+
 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_readInputArgs(entity me, float argsbuf)
+
+void XonoticWelcomeDialog_destroy(entity me)
+{
+       cvar_set("_menu_welcome_dialog_available", "0");
+}
+
+void XonoticWelcomeDialog_readInputArgs(entity me, int argsbuf)
 {
        int i = 0;
        string s;
@@ -47,23 +48,12 @@ void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf)
        if(argsbuf >= 0)
        while((s = bufstr_get(argsbuf, i)) != "")
        {
-               if(s == "name")
-               {
-                       if(me.serverinfo_name)
-                               strunzone(me.serverinfo_name);
-                       me.serverinfo_name = strzone(bufstr_get(argsbuf, i + 1));
-                       ++i;
-               }
-               else if(s == "motd")
-               {
-                       if(me.serverinfo_MOTD)
-                               strunzone(me.serverinfo_MOTD);
-                       me.serverinfo_MOTD = strzone(bufstr_get(argsbuf, i + 1));
-                       ++i;
-               }
+               if(s == "HOSTNAME")
+                       strcpy(me.serverinfo_name, bufstr_get(argsbuf, ++i));
+               else if(s == "WELCOME")
+                       strcpy(me.serverinfo_MOTD, bufstr_get(argsbuf, ++i));
                ++i;
        }
-       localcmd("\nwait; wait; +show_info; wait; wait; -show_info\n");
        //me.serverinfo_name_ent.setText(me.serverinfo_name_ent, me.serverinfo_name);
        me.serverinfo_MOTD_ent.setText(me.serverinfo_MOTD_ent, me.serverinfo_MOTD);
        me.frame.setText(me.frame, me.serverinfo_name);