X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=0bc966cfb46dcf1901874d94065dfd0f0b9e46e7;hp=e80bf30e4e410b183ca23dc487b6f15afd1ae5b1;hb=1eddbe8b6dd92aa9aa41f56b00a8bc7fd519da53;hpb=278f5440b4272f696c6b6e5bb9bb3139b8b53a11

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index e80bf30e4e..0bc966cfb4 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -280,10 +280,15 @@ 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));
 	}
 }
 
+void DisableServerBackwardsCompatibility()
+{
+	cvar_set("gameversion_min", ftos(100 * floor(cvar("gameversion") / 100)));
+}
+
 void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 {
 	float n;
@@ -313,41 +318,109 @@ 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 = "";
+	string un_compatexpire = "";
 	
-	if(n >= 1)
+	for(i = 0; i < n; ++i)
 	{
-		_Nex_ExtResponseSystem_UpdateTo = argv(0);
-
-		if(vercmp(cvar_string("g_xonoticversion"), _Nex_ExtResponseSystem_UpdateTo) >= 0)
-		{
-			_Nex_ExtResponseSystem_UpdateTo = ""; // no update needed
-		}
-		else
+		s = substring(argv(i), 2, -1);
+		if(s == "") { continue; } // ignore empty lines
+		
+		switch(substring(argv(i), 0, 1))
 		{
-			// 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));
+			#define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))
+			case "V":
+			{
+				un_version = s;
+				break;
+			}
+			case "C":
+			{
+				un_compatexpire = 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;
+			}
 		}
+	}
 
-		_Nex_ExtResponseSystem_UpdateTo = strzone(_Nex_ExtResponseSystem_UpdateTo);
-
-		if(n >= 4)
+	if(un_version != "")
+	{
+		if(vercmp(cvar_string("g_xonoticversion"), un_version) < 0)
 		{
-			_Nex_ExtResponseSystem_BannedServers = strzone(argv(3));
-			_Nex_ExtResponseSystem_BannedServersNeedsRefresh = 1;
+			// update needed
+			_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); }
+			DisableServerBackwardsCompatibility();
 		}
-
-		if(n >= 5)
+		else if(cvar_string("g_xonoticversion") == un_version)
 		{
-			if(cvar("menu_updatecheck_getpacks"))
+			if(un_compatexpire != "")
 			{
-				_Nex_ExtResponseSystem_Packs = strzone(argv(4));
-				_Nex_ExtResponseSystem_PacksStep = 1;
+				string curdate = strftime(FALSE, "%Y%m%d%H%M%S");
+				if (strcmp(curdate, un_compatexpire) >= 0)
+					DisableServerBackwardsCompatibility();
 			}
 		}
 	}
+	
+	if(un_emergency_pk3s != "")
+	{
+		_Nex_ExtResponseSystem_Packs = strzone(un_emergency_pk3s);
+		_Nex_ExtResponseSystem_PacksStep = 1;
+	}
+
+	if(un_promoted != "")
+	{
+		_Nex_ExtResponseSystem_PromotedServers = strzone(un_promoted);
+		_Nex_ExtResponseSystem_PromotedServersNeedsRefresh = 1;
+	}
+
+	if(un_recommended != "")
+	{
+		_Nex_ExtResponseSystem_RecommendedServers = strzone(un_recommended);
+		_Nex_ExtResponseSystem_RecommendedServersNeedsRefresh = 1;
+	}
 }
 
 // END OF URI SYSTEM ////////////////////////////////////////////////////////
@@ -366,7 +439,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;
@@ -609,7 +682,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 */