Merge branch 'DefaultUser/more_damagetext' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / shownames.qc

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index a00bd8fa8a806fe8f82284d6dc179f8a001f6f78..6a4515ac14f128f4b20eba195a090b849a0a138c 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -4,6 +4,7 @@
 
 #include <common/ent_cs.qh>
 #include <common/constants.qh>
+#include <common/net_linked.qh>
 #include <common/mapinfo.qh>
 #include <common/teams.qh>
 
@@ -179,8 +180,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 +192,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);