Merge remote branch 'origin/master' into samual/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / shownames.qc

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 3e9a22cfdb1b34d75077a2d1ca7e8d063984620b..b13f6122c268cdaaa1b4cd18a0783ff70387d82d 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -11,9 +11,10 @@ void Draw_ShowNames(entity ent)
 {
        if(!autocvar_hud_shownames)
                return;
-
-       if((ent.sv_entnum == player_localentnum) && !(autocvar_hud_shownames_self && autocvar_chase_active))
-               return;
+       
+       if((ent.sv_entnum == player_localentnum) || (ent.sv_entnum == spectatee_status)) // ent is me or person i'm spectating
+               if not (autocvar_hud_shownames_self && autocvar_chase_active) 
+                       return;
 
        makevectors(view_angles);