From: FruitieX <fruitiex@gmail.com>
Date: Sat, 14 May 2011 13:43:07 +0000 (+0300)
Subject: new cvars: sv_shownames and sv_shownames_delay (default on, 0.2 sec)
X-Git-Tag: xonotic-v0.5.0~260
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae649f8d11948e44f459ddf51f0d4709eff5b50c;p=xonotic%2Fxonotic-data.pk3dir.git

new cvars: sv_shownames and sv_shownames_delay (default on, 0.2 sec)
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b0509bba3..100b266b1 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -410,7 +410,9 @@ net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set ekg 0	"Throw huge amounts of gibs"
 
+seta sv_shownames 1 "enable sending name tag information to clients (WARNING: possible bandwidth hog until we have CSQC players)"
 seta sv_shownames_cull_distance 2500 "distance after which to not send origin/health/armor of another player"
+seta sv_shownames_delay 0.2 "delay between shownames updates"
 
 cl_movement 1
 cl_movement_track_canjump 0
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 70719e0d7..49f37ed30 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1244,4 +1244,6 @@ float autocvar_waypoint_benchmark;
 float autocvar_welcome_message_time;
 float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 float autocvar_g_trueaim_minrange;
+float autocvar_sv_shownames;
 float autocvar_sv_shownames_cull_distance;
+float autocvar_sv_shownames_delay;
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index a655b0199..494004198 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1774,12 +1774,15 @@ void ClientConnect (void)
 
 	PlayerStats_AddPlayer(self);
 
-    self.shownames = spawn();
-    self.shownames.owner = self;
-    self.shownames.think = shownames_think;
-    self.shownames.nextthink = time;
-	self.shownames.customizeentityforclient = shownames_customize;
-    Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
+    if(autocvar_sv_shownames)
+    {
+        self.shownames = spawn();
+        self.shownames.owner = self;
+        self.shownames.think = shownames_think;
+        self.shownames.nextthink = time;
+        self.shownames.customizeentityforclient = shownames_customize;
+        Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
+    }
 }
 
 /*
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 3e507f4ab..74639426a 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -787,7 +787,7 @@ void shownames_think()
         self.armorvalue = max(0, floor(self.owner.armorvalue));
         self.SendFlags |= 4;
     }
-    self.nextthink = time;
+    self.nextthink = time + autocvar_sv_shownames_delay;
 }
 
 float shownames_customize()