From: terencehill <piuntn@gmail.com>
Date: Mon, 18 May 2020 22:05:27 +0000 (+0200)
Subject: Fix names above players not centered if viewed from a distance greater than 1000qu
X-Git-Tag: xonotic-v0.8.5~1063
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e65a6920419c0b67a40570b510780ee3f138c10;p=xonotic%2Fxonotic-data.pk3dir.git

Fix names above players not centered if viewed from a distance greater than 1000qu
---

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index c2fc8a806..87633056d 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -154,11 +154,10 @@ void Draw_ShowNames(entity this)
 		myPos.x += 0.5 * (mySize.x / resize - mySize.x);
 		myPos.y += (mySize.y / resize - mySize.y);
 		// this is where the origin of the string
-		vector namepos = myPos;
 		float namewidth = mySize.x;
 		if (autocvar_hud_shownames_status && this.sameteam)
 		{
-			vector pos = namepos + eY * autocvar_hud_shownames_fontsize * resize;
+			vector pos = myPos + 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);
@@ -181,8 +180,8 @@ void Draw_ShowNames(entity this)
 		drawfontscale = '1 1 0' * resize;
 		s = textShortenToWidth(s, namewidth, '1 1 0' * autocvar_hud_shownames_fontsize, stringwidth_colors);
 		float width = stringwidth(s, true, '1 1 0' * autocvar_hud_shownames_fontsize);
-		if (width != namewidth) namepos.x += (namewidth - width) / 2;
-		drawcolorcodedstring(namepos, s, '1 1 0' * autocvar_hud_shownames_fontsize, a, DRAWFLAG_NORMAL);
+		myPos.x = o.x - (width * resize) / 2;
+		drawcolorcodedstring(myPos, s, '1 1 0' * autocvar_hud_shownames_fontsize, a, DRAWFLAG_NORMAL);
 		drawfontscale = '1 1 0';
 	}
 }