Merge remote branch 'origin/master' into samual/menu_updates

[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 74fe810fe74759d9d015e69f1248c4207e4cb8a4..77fedc3729f2713edbddeb27f42da6b57c159d6c 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -543,38 +543,56 @@ float updateCompression()
 
 // note: include only those that should be in the menu!
 #define GAMETYPES \
-       GAMETYPE(MAPINFO_TYPE_ARENA) \
-       GAMETYPE(MAPINFO_TYPE_ASSAULT) \
-       GAMETYPE(MAPINFO_TYPE_CTF) \
-       GAMETYPE(MAPINFO_TYPE_CA) \
-       GAMETYPE(MAPINFO_TYPE_DEATHMATCH) \
-       GAMETYPE(MAPINFO_TYPE_DOMINATION) \
-       GAMETYPE(MAPINFO_TYPE_FREEZETAG) \
-       GAMETYPE(MAPINFO_TYPE_KEEPAWAY) \
-       GAMETYPE(MAPINFO_TYPE_KEYHUNT) \
-       GAMETYPE(MAPINFO_TYPE_LMS) \
-       GAMETYPE(MAPINFO_TYPE_NEXBALL) \
-       GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
-       GAMETYPE(MAPINFO_TYPE_RACE) \
-       GAMETYPE(MAPINFO_TYPE_CTS) \
-       GAMETYPE(MAPINFO_TYPE_RUNEMATCH) \
-       GAMETYPE(MAPINFO_TYPE_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) if(i++ == cnt) return id;
+#define GAMETYPE(id,icon,teams) if(i++ == cnt) return id;
        GAMETYPES
 #undef GAMETYPE
        return 0;
 }
+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,icon,teams) if(i++ == cnt) return teams;
+       GAMETYPES
+#undef GAMETYPE
+       return _("tuba for all");
+}
 float GameType_GetCount()
 {
        float i;
        i = 0;
-#define GAMETYPE(id) ++i;
+#define GAMETYPE(id,icon,teams) ++i;
        GAMETYPES
 #undef GAMETYPE
        return i;