From: terencehill Date: Sat, 24 Aug 2013 18:03:13 +0000 (+0200) Subject: Shorten token names X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4710d78e490f9915471c33dda95816d53ede45a0;p=xonotic%2Fxonotic-data.pk3dir.git Shorten token names --- diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index c44e1acf2..c159a01d5 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -1189,9 +1189,9 @@ void Net_WeaponComplain() void Net_ReadServerInfo() { - localcmd("\nmenu_cmd directmenu Welcome serverinfo_name \"", ReadString(), - "\" serverinfo_ip \"", ReadString(), - "\" serverinfo_MOTD \"", MakeConsoleSafe(strreplace("\n", "\\n", ReadString())), + localcmd("\nmenu_cmd directmenu Welcome name \"", ReadString(), + "\" ip \"", ReadString(), + "\" motd \"", MakeConsoleSafe(strreplace("\n", "\\n", ReadString())), "\"\n"); } diff --git a/qcsrc/menu/xonotic/dialog_welcome.c b/qcsrc/menu/xonotic/dialog_welcome.c index 97982c6d3..111ed63a4 100644 --- a/qcsrc/menu/xonotic/dialog_welcome.c +++ b/qcsrc/menu/xonotic/dialog_welcome.c @@ -46,21 +46,21 @@ void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf) welcomeDialog_resetStrings(me); while((s = bufstr_get(argsbuf, i)) != "") { - if(s == "serverinfo_name") + if(s == "name") { if(me.serverinfo_name) strunzone(me.serverinfo_name); me.serverinfo_name = strzone(bufstr_get(argsbuf, i + 1)); ++i; } - else if(s == "serverinfo_ip") + else if(s == "ip") { if(me.serverinfo_ip) strunzone(me.serverinfo_ip); me.serverinfo_ip = strzone(bufstr_get(argsbuf, i + 1)); ++i; } - else if(s == "serverinfo_MOTD") + else if(s == "motd") { if(me.serverinfo_MOTD) strunzone(me.serverinfo_MOTD);