X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=580f22a93c7c7e5caab333763150067fa5a0173f;hb=616650bb18362024afeed71fed91d33dc1708d09;hp=74fe810fe74759d9d015e69f1248c4207e4cb8a4;hpb=684f569c626ee8a81b3269df66d5e36f123f450e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 74fe810fe..580f22a93 100644
--- 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));
@@ -565,21 +570,62 @@ float GameType_GetID(float cnt)
 {
 	float i;
 	i = 0;
-#define GAMETYPE(id) if(i++ == cnt) return id;
+	
+	#define GAMETYPE(id) if(i++ == cnt) return id;
 	GAMETYPES
-#undef GAMETYPE
+	#undef GAMETYPE
+	
 	return 0;
 }
+
 float GameType_GetCount()
 {
 	float i;
 	i = 0;
-#define GAMETYPE(id) ++i;
+	
+	#define GAMETYPE(id) ++i;
 	GAMETYPES
-#undef GAMETYPE
+	#undef GAMETYPE
+	
 	return i;
 }
 
+string GameType_GetName(float cnt)
+{
+	float i = GameType_GetID(cnt);
+	
+	if(i)
+		return MapInfo_Type_ToText(i);
+	
+	return "";
+}
+
+string GameType_GetIcon(float cnt)
+{
+	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;