remove shownames entity when going spec, bring it back when joining. Don't show own...

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 76c190415b7eca3000e665ac33bd69ad11dc9969..82fa05e098308f487ccd8680a9bda2082783d52d 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -10,6 +10,9 @@ void Draw_ShowNames()
     if(!autocvar_hud_shownames)
         return;
 
+    if(self.the_entnum == player_localentnum && !autocvar_chase_active)
+        return;
+
     if(self.sameteam || (!self.sameteam && autocvar_hud_shownames_enemies))
     {
         self.origin = getplayerorigin(self.the_entnum-1);

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 01cf67c7e09583f7edaeee3a9ae0823be2a0154f..69456ab010373b4a2555e856e7c343f551a20b46 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -735,6 +735,9 @@ void PutObserverInServer (void)
        }
        else
                self.frags = FRAGS_SPECTATOR;
+
+    if(self.shownames)
+        remove(self.shownames);
 }
 
 void FixPlayermodel()
@@ -1100,6 +1103,12 @@ void PutClientInServer (void)
                PutObserverInServer ();
        }
 
+    self.shownames = spawn();
+    self.shownames.owner = self;
+    self.shownames.think = shownames_think;
+    self.shownames.nextthink = time;
+    Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
+
        //if(g_ctf)
        //      ctf_playerchanged();
 }
@@ -1773,12 +1782,6 @@ void ClientConnect (void)
        CheatInitClient();
 
        PlayerStats_AddPlayer(self);
-
-    self.shownames = spawn();
-    self.shownames.owner = self;
-    self.shownames.think = shownames_think;
-    self.shownames.nextthink = time;
-    Net_LinkEntity(self.shownames, FALSE, 0, SendEntity_ShowNames);
 }
 
 /*