Whoops forgot the file itself :P

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

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 65a5d3e71a60fad721cddb189660e0489891c6ab..77fedc3729f2713edbddeb27f42da6b57c159d6c 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -325,6 +325,12 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
                }
 
                _Nex_ExtResponseSystem_UpdateTo = strzone(_Nex_ExtResponseSystem_UpdateTo);
+
+               if(n >= 4)
+               {
+                       _Nex_ExtResponseSystem_BannedServers = strzone(argv(3));
+                       _Nex_ExtResponseSystem_BannedServersNeedsRefresh = 1;
+               }
        }
 }
 
@@ -537,47 +543,56 @@ float updateCompression()
 
 // note: include only those that should be in the menu!
 #define GAMETYPES \
-       GAMETYPE(MAPINFO_TYPE_ARENA, _("Arena")) \
-       GAMETYPE(MAPINFO_TYPE_ASSAULT, _("Assault")) \
-       GAMETYPE(MAPINFO_TYPE_CTF, _("Capture The Flag")) \
-       GAMETYPE(MAPINFO_TYPE_CA, _("Clan Arena")) \
-       GAMETYPE(MAPINFO_TYPE_DEATHMATCH, _("Deathmatch")) \
-       GAMETYPE(MAPINFO_TYPE_DOMINATION, _("Domination")) \
-       GAMETYPE(MAPINFO_TYPE_FREEZETAG, _("Freeze Tag")) \
-       GAMETYPE(MAPINFO_TYPE_KEEPAWAY, _("Keepaway")) \
-       GAMETYPE(MAPINFO_TYPE_KEYHUNT, _("Key Hunt")) \
-       GAMETYPE(MAPINFO_TYPE_LMS, _("Last Man Standing")) \
-       GAMETYPE(MAPINFO_TYPE_NEXBALL, _("Nexball")) \
-       GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, _("Onslaught")) \
-       GAMETYPE(MAPINFO_TYPE_RACE, _("Race")) \
-       GAMETYPE(MAPINFO_TYPE_CTS, _("Race CTS")) \
-       GAMETYPE(MAPINFO_TYPE_RUNEMATCH, _("Runematch")) \
-       GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, _("Team Deathmatch")) \
+       GAMETYPE(MAPINFO_TYPE_ARENA, "ar", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_ASSAULT, "as", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_CTF, "ctf", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_CA, "ca", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_DEATHMATCH, "dm", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_DOMINATION, "dom", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_FREEZETAG, "ft", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_KEEPAWAY, "ka", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_KEYHUNT, "kh", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_LMS, "lms", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_NEXBALL, "nb", _("free/teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, "ons", _("teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_RACE, "race", _("free/teamplay")) \
+       GAMETYPE(MAPINFO_TYPE_CTS, "cts", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_RUNEMATCH, "rune", _("free for all")) \
+       GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, "tdm", _("teamplay")) \
        /* nothing */
 
 float GameType_GetID(float cnt)
 {
        float i;
        i = 0;
-#define GAMETYPE(id,name) if(i++ == cnt) return id;
+#define GAMETYPE(id,icon,teams) if(i++ == cnt) return id;
        GAMETYPES
 #undef GAMETYPE
        return 0;
 }
-string GameType_GetName(float cnt)
+string GameType_GetIcon(float cnt)
+{
+       float i;
+       i = 0;
+#define GAMETYPE(id,icon,teams) if(i++ == cnt) return icon;
+       GAMETYPES
+#undef GAMETYPE
+       return "";
+}
+string GameType_GetTeams(float cnt)
 {
        float i;
        i = 0;
-#define GAMETYPE(id,name) if(i++ == cnt) return name;
+#define GAMETYPE(id,icon,teams) if(i++ == cnt) return teams;
        GAMETYPES
 #undef GAMETYPE
-       return _("@!#%'n Tuba Throwing");
+       return _("tuba for all");
 }
 float GameType_GetCount()
 {
        float i;
        i = 0;
-#define GAMETYPE(id,name) ++i;
+#define GAMETYPE(id,icon,teams) ++i;
        GAMETYPES
 #undef GAMETYPE
        return i;