X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fshownames.qc;h=74136906e4c6a955c1bace120df660ea08dcdc68;hb=f785b8a76c2336cb00e78fe9e738d55512a086f5;hp=8a7d225bff7bdc319260e5e0648a2aaff9b7aa08;hpb=ae277921268b84c7b7ee5ab901ce7f0088c07605;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 8a7d225bf..74136906e 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -2,6 +2,7 @@
 
 #include "autocvars.qh"
 #include "miscfunctions.qh"
+#include "resources.qh"
 #include "hud/_mod.qh"
 
 #include <common/ent_cs.qh>
@@ -37,8 +38,18 @@ const float SHOWNAMES_FADESPEED = 4;
 const float SHOWNAMES_FADEDELAY = 0.4;
 void Draw_ShowNames(entity this)
 {
-	if (this.sv_entnum == (current_player + 1))  // self or spectatee
-		if (!(autocvar_hud_shownames_self && autocvar_chase_active)) return;
+	if (this.sv_entnum == current_player + 1) // self or spectatee
+	{
+		if (!autocvar_chase_active)
+			return;
+
+		if (!autocvar_hud_shownames_self
+			&& !(spectatee_status > 0 && time <= spectatee_status_changed_time + 1))
+		{
+			return;
+		}
+	}
+
 	if (!this.sameteam && !autocvar_hud_shownames_enemies) return;
 	bool hit;
 	if (!autocvar_hud_shownames_crosshairdistance && this.sameteam)
@@ -117,7 +128,7 @@ void Draw_ShowNames(entity this)
 		// FIXME: alpha is negative when dead, breaking death fade
 		if (!this.csqcmodel_isdead) a *= f;
 	}
-	if (a < ALPHA_MIN_VISIBLE && gametype != MAPINFO_TYPE_CTS) return;
+	if (a < ALPHA_MIN_VISIBLE && ISGAMETYPE(CTS)) return;
 	if (vdist(this.origin - view_origin, >=, max_shot_distance)) return;
 	float dist = vlen(this.origin - view_origin);
 	if (autocvar_hud_shownames_maxdistance)
@@ -151,16 +162,18 @@ void Draw_ShowNames(entity this)
 		{
 			vector pos = namepos + eY * autocvar_hud_shownames_fontsize * resize;
 			vector sz = vec2(0.5 * mySize.x, resize * autocvar_hud_shownames_statusbar_height);
+			if (autocvar_hud_shownames_statusbar_highlight)
+				drawfill(pos + eX * 0.25 * mySize.x, sz, '0.7 0.7 0.7', a / 2, DRAWFLAG_NORMAL);
 			if (this.healthvalue > 0)
 			{
 				HUD_Panel_DrawProgressBar(pos, sz, "nametag_statusbar",
 					this.healthvalue / autocvar_hud_panel_healtharmor_maxhealth, false, 1, '1 0 0', a,
 					DRAWFLAG_NORMAL);
 			}
-			if (this.armorvalue > 0)
+			if (GetResource(this, RES_ARMOR) > 0)
 			{
 				HUD_Panel_DrawProgressBar(pos + eX * 0.5 * mySize.x, sz, "nametag_statusbar",
-					this.armorvalue / autocvar_hud_panel_healtharmor_maxarmor, false, 0, '0 1 0', a,
+					GetResource(this, RES_ARMOR) / autocvar_hud_panel_healtharmor_maxarmor, false, 0, '0 1 0', a,
 					DRAWFLAG_NORMAL);
 			}
 		}
@@ -193,13 +206,13 @@ void Draw_ShowNames_All()
 		if (entcs.m_entcs_private)
 		{
 			it.healthvalue = entcs.healthvalue;
-			it.armorvalue = entcs.armorvalue;
+			SetResourceExplicit(it, RES_ARMOR, GetResource(entcs, RES_ARMOR));
 			it.sameteam = true;
 		}
 		else
 		{
 			it.healthvalue = 0;
-			it.armorvalue = 0;
+			SetResourceExplicit(it, RES_ARMOR, 0);
 			it.sameteam = false;
 		}
 		bool dead = entcs_IsDead(i) || entcs_IsSpectating(i);