Small cleanups

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 468878f83e10c6a6e562e633f9f2ea7f582fd309..8d35ecc7de0d37c94758a5c55fa28771e805613f 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1293,9 +1293,9 @@ NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew)
        if (!isdemo() && cvar("_menu_welcome_dialog_available") && autocvar_cl_welcome_in_menu_dialog)
        {
                string welcomedialog_args;
-               welcomedialog_args = strcat("name \"", hostname, "\"");
+               welcomedialog_args = strcat("HOSTNAME \"", hostname, "\"");
                msg = MakeConsoleSafe(strreplace("\n", "\\n", msg));
-               welcomedialog_args = strcat(welcomedialog_args, " motd \"", msg, "\"");
+               welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\"");
                localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n");
        }
        else

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 2587602fc02e812e8213db42afcf7c976f4ea6aa..c8ddf726a64b46d2926a2ce6506c0c2d83b4062d 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -7,7 +7,7 @@
 
 #include <common/command/_mod.qh>
 
-.void(entity me, float argsbuf) readInputArgs;
+.void(entity me, int argsbuf) readInputArgs;
 .entity firstChild, nextSibling;
 
 string _dumptree_space;

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc
index 252ff93226b0a68a6de49dea90ed20afaef68241..691e7cbf9f4af184daed175275fa4912d1fb97bc 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_welcome.qc
+++ b/qcsrc/menu/xonotic/dialog_welcome.qc
@@ -9,13 +9,8 @@
 
 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)
@@ -45,7 +40,7 @@ void XonoticWelcomeDialog_destroy(entity me)
        cvar_set("_menu_welcome_dialog_available", "0");
 }
 
-void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf)
+void XonoticWelcomeDialog_readInputArgs(entity me, int argsbuf)
 {
        int i = 0;
        string s;
@@ -53,20 +48,10 @@ 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;
        }
        //me.serverinfo_name_ent.setText(me.serverinfo_name_ent, me.serverinfo_name);

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qh b/qcsrc/menu/xonotic/dialog_welcome.qh
index 05652cfaa0739eefeabfe59555b06165b08a7fb4..63f18cafaa7ae64fa8cf03944214e16313f3a705 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_welcome.qh
+++ b/qcsrc/menu/xonotic/dialog_welcome.qh
@@ -13,7 +13,7 @@ CLASS(XonoticWelcomeDialog, XonoticRootDialog)
        METHOD(XonoticWelcomeDialog, keyDown, float(entity, float, float, float));
        METHOD(XonoticWelcomeDialog, configureDialog, void(entity));
        METHOD(XonoticWelcomeDialog, destroy, void(entity));
-       METHOD(XonoticWelcomeDialog, readInputArgs, void(entity, float));
+       METHOD(XonoticWelcomeDialog, readInputArgs, void(entity, int));
        ATTRIB(XonoticWelcomeDialog, serverinfo_name, string, string_null);
        //ATTRIB(XonoticWelcomeDialog, serverinfo_name_ent, entity, world);
        ATTRIB(XonoticWelcomeDialog, serverinfo_MOTD, string, string_null);