Revert last 2 commits (cause is elsewhere)

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index a00bd8fa8a806fe8f82284d6dc179f8a001f6f78..75ef40521ea443504048bb7669c161db0f671fda 100644 (file)
--- 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 7aad7847241d24beaeda9f5c567960199decb9a7..a89e84a03725d7f8ff16525ef81faa52e9d81d49 100644 (file)
--- 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;