X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fshownames.qc;h=d5e24888d34a79e03d2de8db4a8c19ca22c8219f;hb=5fab88f2b713eb8f20a7296a20f57f6dfafd220d;hp=28d0d161eb3453108a9d854fbff1562f06fc0bed;hpb=277a2eeaa5b955419d958e347c11ad12480a67cc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 28d0d161e..d5e24888d 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -3,38 +3,50 @@
 // self.healthvalue
 // self.armorvalue
 // self.sameteam = player is on same team as local client
+// self.fadedelay = time to wait before name tag starts fading in for enemies
+// self.pointtime = last time you pointed at this player
 //
 const float SHOWNAMES_FADESPEED = 4;
+const float SHOWNAMES_FADEDELAY = 0.4;
 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) 
+			return;
 
-	if(ent.sv_entnum == player_localentnum && !autocvar_chase_active)
-		return;
+	makevectors(view_angles);
 
 	if(ent.sameteam || (!ent.sameteam && autocvar_hud_shownames_enemies))
 	{
 		ent.origin_z += autocvar_hud_shownames_offset;
-
-		if(!ent.sameteam)
+	
+		float hit;
+		if(ent.sameteam && !autocvar_hud_shownames_crosshairdistance)
+		{
+			hit = 1;
+		}
+		else
 		{
-			/* WIP, why does trace_ent != ent not work as intended here?
-			   if(autocvar_hud_shownames_enemies != 2) // player has to point at enemy if so
-			   {
-			   traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, MOVETYPE_FLY, world);
-			   print("trace_endpos: ", vtos(trace_endpos), " view_origin: ", vtos(view_origin), "\n");
-			   if(trace_ent != ent)
-			   return;
-			   }*/
-
-			traceline(ent.origin, view_origin, 1, ent);
+			traceline(view_origin, ent.origin, MOVE_NORMAL, ent);
+			if(trace_fraction < 1 && trace_networkentity != ent.sv_entnum)
+				hit = 0;
+			else
+				hit = 1;
 		}
 
+		// handle tag fading
+		float overlap, onscreen, crosshairdistance;
 		vector o, eo;
+		
 		o = project_3d_to_2d(ent.origin);
-		float overlap;
-
+		
 		if(autocvar_hud_shownames_antioverlap)
 		{
 			// fade tag out if another tag that is closer to you overlaps
@@ -56,18 +68,40 @@ void Draw_ShowNames(entity ent)
 			}
 		}
 
-		if(!ent.sameteam && trace_endpos != view_origin) // out of view, fade out
-			ent.alpha = max(0, ent.alpha - SHOWNAMES_FADESPEED * frametime);
+		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)
+				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.fadedelay = 0; // reset fade in delay, enemy has left the view
+		}
 		else if(ent.healthvalue < 1) // 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);
-		else // fade in
+			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)
 			return;
-
+		
 		float dist;
 		dist = vlen(ent.origin - view_origin);
 
@@ -90,7 +124,7 @@ void Draw_ShowNames(entity ent)
 			resize = 0.5 + 0.5 * ((autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance) - max(0, dist - autocvar_hud_shownames_mindistance)) / (autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance);
 
 		// draw the sprite image
-		if not(o_z < 0 || o_x < 0 || o_y < 0 || o_x > vid_conwidth || o_y > vid_conheight)
+		if(o_z >= 0)
 		{
 			o_z = 0;
 
@@ -150,7 +184,6 @@ void Draw_ShowNames_All()
 	float i;
 	for(i = 0; i < maxclients; ++i)
 	{
-		vector o;
 		float t;
 		t = GetPlayerColor(i);
 		if(t == COLOR_SPECTATOR)