X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fshownames.qc;h=3c89f312b0eb4c3dd4c1634edefa97ad4a89739f;hb=2ea018e26b688038823d6a52a17ab8b6abd26a9e;hp=f20f143b0315497e797817c0533a55b8a8f8966a;hpb=9226d2a17f8329b6964cf4be5c5433e7e763c240;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index f20f143b0..3c89f312b 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -13,21 +13,19 @@ 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 not (autocvar_hud_shownames_self && autocvar_chase_active) 
+		if(!(autocvar_hud_shownames_self && autocvar_chase_active))
 			return;
 
-	makevectors(view_angles);
-
 	if(ent.sameteam || (!ent.sameteam && autocvar_hud_shownames_enemies))
 	{
 		ent.origin_z += autocvar_hud_shownames_offset;
-	
+
 		float hit;
 		if(ent.sameteam && !autocvar_hud_shownames_crosshairdistance)
 		{
@@ -45,9 +43,9 @@ void Draw_ShowNames(entity ent)
 		// handle tag fading
 		float overlap = FALSE, onscreen, crosshairdistance;
 		vector o, eo;
-		
+
 		o = project_3d_to_2d(ent.origin);
-		
+
 		if(autocvar_hud_shownames_antioverlap)
 		{
 			// fade tag out if another tag that is closer to you overlaps
@@ -57,7 +55,7 @@ void Draw_ShowNames(entity ent)
 				if(e == ent)
 					continue;
 				eo = project_3d_to_2d(e.origin);
-				if not(eo_z < 0 || eo_x < 0 || eo_y < 0 || eo_x > vid_conwidth || eo_y > vid_conheight)
+				if (!(eo_z < 0 || eo_x < 0 || eo_y < 0 || eo_x > vid_conwidth || eo_y > vid_conheight))
 				{
 					eo_z = 0;
 					if(vlen((eX * o_x + eY * o_y) - eo) < autocvar_hud_shownames_antioverlap_distance && vlen(ent.origin - view_origin) > vlen(e.origin - view_origin))
@@ -71,38 +69,42 @@ void Draw_ShowNames(entity ent)
 
 		onscreen = (o_z >= 0 && o_x >= 0 && o_y >= 0 && o_x <= vid_conwidth && o_y <= vid_conheight);
 		crosshairdistance = sqrt( pow(o_x - vid_conwidth/2, 2) + pow(o_y - vid_conheight/2, 2) );
-		
+
 		if(autocvar_hud_shownames_crosshairdistance)
 		{
 			if(autocvar_hud_shownames_crosshairdistance > crosshairdistance)
 				ent.pointtime = time;
-				
-			if not(ent.pointtime + autocvar_hud_shownames_crosshairdistance_time > time)
+
+			if (!(ent.pointtime + autocvar_hud_shownames_crosshairdistance_time > time))
 				overlap = TRUE;
 			else
 				overlap = (autocvar_hud_shownames_crosshairdistance_antioverlap ? overlap : FALSE); // override what antioverlap says unless allowed by cvar.
 		}
-		
+
 		if(!ent.fadedelay)
 			ent.fadedelay = time + SHOWNAMES_FADEDELAY;
 
 		if(!ent.sameteam && (!onscreen || !hit)) // out of view, fade out
-		{ 
-			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * frametime); 
+		{
+			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * frametime);
 			ent.fadedelay = 0; // reset fade in delay, enemy has left the view
 		}
 		else if(ent.csqcmodel_isdead) // dead player, fade out slowly
-			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * 0.25 * frametime); 
+			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * 0.25 * frametime);
 		else if(overlap) // tag overlap detected, fade out
-			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * frametime); 
+			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * frametime);
 		else if(ent.sameteam) // fade in for team mates
 			ent.alpha = min(1, ent.alpha + SHOWNAMES_FADESPEED * frametime);
 		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;
 		dist = vlen(ent.origin - view_origin);
 
@@ -218,7 +220,7 @@ void Draw_ShowNames_All()
 		setorigin(e, getplayerorigin(i));
 		if(e.origin == GETPLAYERORIGIN_ERROR)
 			continue;
-			
+
 		e.csqcmodel_isdead = getplayerisdead(i);
 
 		Draw_ShowNames(e);