From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 15 Oct 2013 16:43:23 +0000 (+0200)
Subject: Use new cvar check URL; kill CVAR_POPCON.
X-Git-Tag: xonotic-v0.8.0~256^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=56e378ae75002cadb9e8908a6562817b682220d4;p=xonotic%2Fxonotic-data.pk3dir.git

Use new cvar check URL; kill CVAR_POPCON.
---

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index a10ccd2fd..833787328 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -1,6 +1,6 @@
 SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
 PERL ?= perl
-QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
+QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"'
 QCC ?= gmqcc
 
 QCCVERSIONFILE := qccversion.$(shell $(QCC) --version > qccversion.txt && git hash-object qccversion.txt)
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 0bc966cfb..dd022eb69 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -439,36 +439,8 @@ 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?format=keys&version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt);
-
-#ifdef CVAR_POPCON
-			float cvar_handle, popcon_handle;
-			float n, i, j;
-			string k, s;
-			cvar_handle = buf_create();
-			buf_cvarlist(cvar_handle, "", "");
-			n = buf_getsize(cvar_handle);
-			popcon_handle = buf_create();
-			for(i= 0, j = 0; i < n; ++i)
-			{
-				k = bufstr_get(cvar_handle, i);
-				if(!(cvar_type(k) & CVAR_TYPEFLAG_SAVED))
-					continue;
-				s = sprintf("%s=%d", uri_escape(k), cvar_string(k) != cvar_defstring(k));
-				bufstr_set(popcon_handle, j, s);
-				++j;
-			}
-			buf_del(cvar_handle);
-			uri_postbuf(
-				uri, URI_GET_UPDATENOTIFICATION,
-				"application/x-www-form-urlencoded",
-				"&",
-				popcon_handle
-			);
-			buf_del(popcon_handle);
-#else
+			uri = sprintf("http://update.xonotic.org/checkupdate.txt?version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt);
 			uri_get(uri, URI_GET_UPDATENOTIFICATION);
-#endif
 		}
 	}