From: FruitieX <fruitiex@gmail.com>
Date: Wed, 13 Apr 2011 12:09:31 +0000 (+0300)
Subject: @ CSQC: You've been trolled, you've been trolled... Also enemy nametags are no longer... 
X-Git-Tag: xonotic-v0.5.0~286
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a860cafa8bea3a71f974b2f4c832cc9125fc1b33;p=xonotic%2Fxonotic-data.pk3dir.git

@ CSQC: You've been trolled, you've been trolled... Also enemy nametags are no longer visible through solid :D
---

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 8a4115ce4..d5ad28a78 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -16,6 +16,13 @@ void Draw_ShowNames()
 
         InterpolateOrigin_Do();
 
+        if(!self.sameteam)
+        {
+            traceline(self.origin, view_origin, 1, self);
+            if(trace_endpos != view_origin)
+                return;
+        }
+
         // draw the sprite image
         vector o;
         o = project_3d_to_2d(self.origin);
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 85c7b0741..586409806 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -777,8 +777,8 @@ void shownames_think()
 
 float shownames_customize()
 {
-    return TRUE;
-    if(vlen(other.origin - self.origin) < autocvar_sv_shownames_cull_distance)
+   // return TRUE;
+    //if(vlen(other.origin - self.origin) < autocvar_sv_shownames_cull_distance)
     if(self.owner != other) // no need to spam own coordinates
     if(self.owner.team == other.team || (self.owner.team != other.team && checkpvs(self.origin, other)))
         return TRUE;