X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=3f651727cff1e7121e8e41380232428c611b075e;hp=4c03eaa5f9caa9edb5255ee3f4a217a904799463;hb=70e0d865a18b0a9fee8650db3184b97fa48b06e8;hpb=fcbf9538330960b989dbe84e7188349d7e8b109f

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 4c03eaa5f9..3f651727cf 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -280,7 +280,7 @@ void URI_Get_Callback(float id, float status, string data)
 	}
 	else
 	{
-		print(sprintf(_("Received HTTP request data for an invalid id %d.\n"), id));
+		print(sprintf("Received HTTP request data for an invalid id %d.\n", id));
 	}
 }
 
@@ -313,41 +313,94 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 		n = 0;
 	else
 		n = tokenizebyseparator(data, "\n");
+
+	float i;
+	string s; 
+	
+	string un_version = "";
+	string un_download = "";
+	string un_url = "";
+	string un_bannedservers = "";
+	string un_emergency_pk3s = "";
+	string un_promoted = "";
+	string un_recommended = "";
 	
-	if(n >= 1)
+	for(i = 0; i < n; ++i)
 	{
-		_Nex_ExtResponseSystem_UpdateTo = argv(0);
-
-		if(vercmp(cvar_string("g_xonoticversion"), _Nex_ExtResponseSystem_UpdateTo) >= 0)
+		s = substring(argv(i), 2, -1);
+		if(s == "") { continue; } // ignore empty lines
+		
+		switch(substring(argv(i), 0, 1))
 		{
-			_Nex_ExtResponseSystem_UpdateTo = ""; // no update needed
+			#define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))
+			case "V":
+			{
+				un_version = s;
+				break;
+			}
+			case "D":
+			{
+				un_download = s;
+				break;
+			}
+			case "U":
+			{
+				un_url = s;
+				break;
+			}
+			case "B":
+			{
+				APPEND_TO_STRING(un_bannedservers, " ", s);
+				break;
+			}
+			case "E":
+			{
+				if(cvar("menu_updatecheck_getpacks"))
+					APPEND_TO_STRING(un_emergency_pk3s, " ", s);
+				break;
+			}
+			case "P":
+			{
+				APPEND_TO_STRING(un_promoted, " ", s);
+				break;
+			}
+			case "R":
+			{
+				APPEND_TO_STRING(un_recommended, " ", s);
+				break;
+			}
 		}
-		else
+	}
+
+	if(un_version != "")
+	{
+		if(vercmp(cvar_string("g_xonoticversion"), un_version) < 0)
 		{
 			// update needed
-			if(n >= 2)
-				print(sprintf(_("Update can be downloaded at:\n%s\n"), argv(1)));
-			if(n >= 3)
-				_Nex_ExtResponseSystem_UpdateToURL = strzone(argv(2));
+			_Nex_ExtResponseSystem_UpdateTo = strzone(un_version);
+			if(un_download) { print(sprintf(_("Update can be downloaded at:\n%s\n"), un_download)); }
+			if(un_url) { _Nex_ExtResponseSystem_UpdateToURL = strzone(un_url); }
 		}
+	}
+	
+	if(un_emergency_pk3s != "")
+	{
+		_Nex_ExtResponseSystem_Packs = strzone(argv(4));
+		_Nex_ExtResponseSystem_PacksStep = 1;
+	}
 
-		_Nex_ExtResponseSystem_UpdateTo = strzone(_Nex_ExtResponseSystem_UpdateTo);
-
-		if(n >= 4)
-		{
-			_Nex_ExtResponseSystem_BannedServers = strzone(argv(3));
-			_Nex_ExtResponseSystem_BannedServersNeedsRefresh = 1;
-		}
+	if(un_promoted != "")
+	{
+		_Nex_ExtResponseSystem_PromotedServers = strzone(un_promoted);
+		_Nex_ExtResponseSystem_PromotedServersNeedsRefresh = 1;
+	}
 
-		if(n >= 5)
-		{
-			if(cvar("menu_updatecheck_getpacks"))
-			{
-				_Nex_ExtResponseSystem_Packs = strzone(argv(4));
-				_Nex_ExtResponseSystem_PacksStep = 1;
-			}
-		}
+	if(un_recommended != "")
+	{
+		_Nex_ExtResponseSystem_RecommendedServers = strzone(un_recommended);
+		_Nex_ExtResponseSystem_RecommendedServersNeedsRefresh = 1;
 	}
+
 }
 
 // END OF URI SYSTEM ////////////////////////////////////////////////////////
@@ -366,7 +419,7 @@ void updateCheck()
 
 			// for privacy, munge the start count a little
 			startcnt = floor((floor(startcnt / 10) + random()) * 10);
-			uri = sprintf("http://www.xonotic.org/dl/checkupdate.txt?version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt);
+			uri = sprintf("http://www.xonotic.org/dl/checkupdate.txt?format=keys&version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt);
 
 #ifdef CVAR_POPCON
 			float cvar_handle, popcon_handle;
@@ -465,7 +518,7 @@ float preMenuInit()
 string campaign_name_previous;
 float campaign_won_previous;
 #ifdef WATERMARK
-var string autocvar_menu_watermark = WATERMARK();
+var string autocvar_menu_watermark = WATERMARK;
 #else
 var string autocvar_menu_watermark = "";
 #endif
@@ -473,13 +526,12 @@ void postMenuDraw()
 {
 	if(autocvar_menu_watermark != "")
 	{
-		vector fs = '48 48 0';
 		draw_CenterText('0.5 0.1 0', sprintf(_("^1%s TEST BUILD"), autocvar_menu_watermark), globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
 	}
 }
 void preMenuDraw()
 {
-	vector fs, sz, line, mid;
+	vector fs, sz = '0 0 0', line, mid;
 
 	updateCheck();
 
@@ -610,7 +662,6 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
 	GAMETYPE(MAPINFO_TYPE_RACE) \
 	GAMETYPE(MAPINFO_TYPE_CTS) \
-	GAMETYPE(MAPINFO_TYPE_RUNEMATCH) \
 	GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \
 	/* nothing */