From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 9 Feb 2011 20:22:43 +0000 (+0100)
Subject: add cl_allow_uidtracking
X-Git-Tag: xonotic-v0.5.0~311^2~26^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a27e71a8dd871e36fc3990525e70affc98d9a8c4;p=xonotic%2Fxonotic-data.pk3dir.git

add cl_allow_uidtracking
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0ad17417e..76456a1ed 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -2048,6 +2048,8 @@ set cl_db_saveasdump 0 "write client.db in dump format (loads slower, easier to
 
 // uid2name
 seta cl_allow_uid2name -1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid2name (allows showing your name in race rankings for instance)"
+seta cl_allow_uidtracking 1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid tracking (allows associating your data with your player ID)"
+// FIXME set to -1 before release, once we have a dialog for this!
 
 // polygonoffset for submodel SUCKS SUCKS SUCKS (only a hack for quake1, we don't need that)
 r_polygonoffset_submodel_offset 0
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 11bff62af..e1822d6b5 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -3095,7 +3095,7 @@ void PlayerPostThink (void)
 
 	playerdemo_write();
 
-	if((g_cts || g_race) && self.cvar_cl_allow_uid2name == 1)
+	if((g_cts || g_race) && self.cvar_al_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)
 	{
 		if(!self.stored_netname)
 			self.stored_netname = strzone(uid2name(self.crypto_idfp));
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index d6b33dc67..944dcc4ce 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -329,6 +329,7 @@ float sv_loddistance2;
 .string weaponorder_byimpulse;
 
 .float cvar_cl_allow_uid2name;
+.float cvar_cl_allow_uidtracking;
 .string stored_netname;
 
 void Announce(string snd);
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 112162e40..508957b4a 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -616,6 +616,7 @@ void GetCvars(float f)
 #endif
 	GetCvars_handleFloatOnce(s, f, cvar_cl_gunalign, "cl_gunalign");
 	GetCvars_handleFloat(s, f, cvar_cl_allow_uid2name, "cl_allow_uid2name");
+	GetCvars_handleFloat(s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking");
 
 	// fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
 	if (f > 0)
diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index 58f251c9e..c5ba3b013 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -40,7 +40,7 @@ void PlayerStats_AddPlayer(entity e)
 	if(playerstats_db < 0)
 		return;
 
-	if(e.crypto_idfp != "")
+	if(e.crypto_idfp != "" && e.cvar_cl_allow_uidtracking == 1)
 		e.playerstats_id = strzone(e.crypto_idfp);
 	else if(clienttype(e) == CLIENTTYPE_BOT)
 		e.playerstats_id = strzone(sprintf("bot#%d", e.playerid));