do not use gamedir name for icon

[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 77fedc3729f2713edbddeb27f42da6b57c159d6c..580f22a93c7c7e5caab333763150067fa5a0173f 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -31,7 +31,7 @@ string getZonedTooltipForIdentifier(string s)
                if(t != "")
                        return strzone(t);
        }
-       if(prvm_language == "en" || prvm_language == "")
+       if(prvm_language == "en")
        {
                t = cvar_description(s);
                if(t != "" && t != "custom cvar")
@@ -259,18 +259,23 @@ string _Nex_ExtResponseSystem_UpdateToURL;
 
 void URI_Get_Callback(float id, float status, string data)
 {
-       if (id == URI_GET_DISCARD)
+       if(url_URI_Get_Callback(id, status, data))
        {
-               // discard
+               // handled
        }
-       else if(id == URI_GET_UPDATENOTIFICATION)
+       else if (id == URI_GET_DISCARD)
        {
-               UpdateNotification_URI_Get_Callback(id, status, data);
+               // discard
        }
-       else if(id >= URI_GET_CURL && id <= URI_GET_CURL_END)
+       else if (id >= URI_GET_CURL && id <= URI_GET_CURL_END)
        {
+               // sv_cmd curl
                Curl_URI_Get_Callback(id, status, data);
        }
+       else if (id == URI_GET_UPDATENOTIFICATION)
+       {
+               UpdateNotification_URI_Get_Callback(id, status, data);
+       }
        else
        {
                print(sprintf(_("Received HTTP request data for an invalid id %d.\n"), id));
@@ -543,61 +548,84 @@ float updateCompression()
 
 // note: include only those that should be in the menu!
 #define GAMETYPES \
-       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")) \
+       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) \
        /* nothing */
 
 float GameType_GetID(float cnt)
 {
        float i;
        i = 0;
-#define GAMETYPE(id,icon,teams) if(i++ == cnt) return id;
+       
+       #define GAMETYPE(id) if(i++ == cnt) return id;
        GAMETYPES
-#undef GAMETYPE
+       #undef GAMETYPE
+       
        return 0;
 }
-string GameType_GetIcon(float cnt)
+
+float GameType_GetCount()
 {
        float i;
        i = 0;
-#define GAMETYPE(id,icon,teams) if(i++ == cnt) return icon;
+       
+       #define GAMETYPE(id) ++i;
        GAMETYPES
-#undef GAMETYPE
-       return "";
+       #undef GAMETYPE
+       
+       return i;
 }
-string GameType_GetTeams(float cnt)
+
+string GameType_GetName(float cnt)
 {
-       float i;
-       i = 0;
-#define GAMETYPE(id,icon,teams) if(i++ == cnt) return teams;
-       GAMETYPES
-#undef GAMETYPE
-       return _("tuba for all");
+       float i = GameType_GetID(cnt);
+       
+       if(i)
+               return MapInfo_Type_ToText(i);
+       
+       return "";
 }
-float GameType_GetCount()
+
+string GameType_GetIcon(float cnt)
 {
-       float i;
-       i = 0;
-#define GAMETYPE(id,icon,teams) ++i;
-       GAMETYPES
-#undef GAMETYPE
-       return i;
+       float i = GameType_GetID(cnt);
+       
+       if(i)
+               return strcat("gametype_", MapInfo_Type_ToString(i));
+       
+       return "";
 }
 
+/*string GameType_GetTeams(float cnt) // poor implementation, later something else could be done that's better?
+{
+       float i = GameType_GetID(cnt);
+       string s = _MapInfo_GetDefaultEx(i);
+       
+       if(i)
+       {
+               if(strstrofs(s, "teams", 0) >= 0)
+                       return _("teamplay");
+               else
+                       return _("free for all");
+       }
+       
+       return _("tuba for all");
+}*/
+
 void dialog_hudpanel_common_notoggle(entity me, string panelname)
 {
        float i;