X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fshownames.qc;h=4a948ca2e845b804d586f44d997bb5e8b419e308;hb=d0c9f09e15aac75e277d69de13bd23b719d3d52b;hp=beb2a89215fb5a10df40b30640256f5603e7b38d;hpb=0ecf24858b4d35b25c121ee61a9eab391a493835;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index beb2a8921..4a948ca2e 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -14,17 +14,10 @@ void Draw_ShowNames(entity ent)
 	if(!autocvar_hud_shownames)
 		return;
 
-#ifdef COMPAT_XON050_ENGINE
-	if((ent.sv_entnum == player_localentnum) || (ent.sv_entnum == spectatee_status)) // ent is me or person i'm spectating
-#else
 	if(ent.sv_entnum == player_localentnum) // ent is me or person i'm spectating
-#endif
 		if(!(autocvar_hud_shownames_self && autocvar_chase_active))
 			return;
 
-	makevectors(view_angles);
-
-	if(getplayeralpha(ent.sv_entnum-1) >= SHOWNAMES_MIN_ALPHA)
 	if(ent.sameteam || (!ent.sameteam && autocvar_hud_shownames_enemies))
 	{
 		ent.origin_z += autocvar_hud_shownames_offset;
@@ -101,7 +94,11 @@ void Draw_ShowNames(entity ent)
 		else if(time > ent.fadedelay) // fade in for enemies
 			ent.alpha = min(1, ent.alpha + SHOWNAMES_FADESPEED * frametime);
 
-		if(!ent.alpha)
+		// multiply by player alpha
+		if(!ent.sameteam || (ent.sv_entnum == player_localentnum))
+			ent.alpha *= getplayeralpha(ent.sv_entnum-1);
+
+		if(ent.alpha < ALPHA_MIN_VISIBLE && gametype != MAPINFO_TYPE_CTS)
 			return;
 
 		float dist;