From: Mario <mario@smbclan.net>
Date: Fri, 14 Oct 2016 16:54:55 +0000 (+1000)
Subject: Revert last 2 commits (cause is elsewhere)
X-Git-Tag: xonotic-v0.8.2~510
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05039e3afcab834e31b01cfcedb1de1a287d85d5;p=xonotic%2Fxonotic-data.pk3dir.git

Revert last 2 commits (cause is elsewhere)
---

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index a00bd8fa8..75ef40521 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -179,8 +179,7 @@ void Draw_ShowNames_All()
 		assert(getthink(entcs), eprint(entcs));
 		getthink(entcs)(entcs);
 		if (!entcs.has_origin) continue;
-		bool dead = entcs_IsDead(i) || entcs_IsSpectating(i);
-		if (entcs.m_entcs_private && !dead)
+		if (entcs.m_entcs_private)
 		{
 			it.healthvalue = entcs.healthvalue;
 			it.armorvalue = entcs.armorvalue;
@@ -192,6 +191,7 @@ 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);
diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 7aad78472..a89e84a03 100644
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -75,7 +75,7 @@ MACRO_END
 		do {
 			if (radar_showennemies) break;
 			if (SAME_TEAM(to, player)) break;
-			if (!IS_PLAYER(to) && time > game_starttime) break;
+			if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break;
 			sf &= ENTCS_PUBLICMASK; // no private updates
 		} while (0);
 		sf |= this.m_forceupdate;