From: Mario <mario@smbclan.net>
Date: Fri, 14 Oct 2016 16:51:52 +0000 (+1000)
Subject: Also don't consider player same team if they're dead or spectating
X-Git-Tag: xonotic-v0.8.2~511
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6077abc559094e7245cbcea7ddb45a2da6c29774;p=xonotic%2Fxonotic-data.pk3dir.git

Also don't consider player same team if they're dead or spectating
---

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 75ef40521..a00bd8fa8 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -179,7 +179,8 @@ void Draw_ShowNames_All()
 		assert(getthink(entcs), eprint(entcs));
 		getthink(entcs)(entcs);
 		if (!entcs.has_origin) continue;
-		if (entcs.m_entcs_private)
+		bool dead = entcs_IsDead(i) || entcs_IsSpectating(i);
+		if (entcs.m_entcs_private && !dead)
 		{
 			it.healthvalue = entcs.healthvalue;
 			it.armorvalue = entcs.armorvalue;
@@ -191,7 +192,6 @@ void Draw_ShowNames_All()
 			it.armorvalue = 0;
 			it.sameteam = false;
 		}
-		bool dead = entcs_IsDead(i) || entcs_IsSpectating(i);
 		if (!it.csqcmodel_isdead) setorigin(it, entcs.origin);
 		it.csqcmodel_isdead = dead;
 		Draw_ShowNames(it);