add cl_allow_uidtracking

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0ad17417e2678c5c50d4cb7d33136475832c7d5c..76456a1ed826885514bb97e890e50c77171cce36 100644 (file)
--- 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 11bff62af1f71256b12f87e0d038f1f6f1815cf0..e1822d6b5f540fbccf33fc2f4d991ba856f373c5 100644 (file)
--- 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 d6b33dc67dc339a00fbb409a497b76a066a5d8a9..944dcc4ce0a249ce877681f01682219cbc38250e 100644 (file)
--- 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 112162e407efc87d2010ab71a154d38dcbd25821..508957b4aa4c6b14edb98c49d50f48216afc4dcd 100644 (file)
--- 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 58f251c9e97d706ea9aa2986bea9371b60d94226..c5ba3b013f63949d8d411750bf4f4627c39caaa2 100644 (file)
--- 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));