Make bots jump while being swallowed, to make it even harder to eat them. They should...

[voretournament/voretournament.git] / data / qcsrc / client / shownames.qc

diff --git a/data/qcsrc/client/shownames.qc b/data/qcsrc/client/shownames.qc
index 40daf62b652f9f5fc7fe49a47d982e63df240888..f00e9a407dc9c8c647bfc9751a069c8f17522744 100644 (file)
--- a/data/qcsrc/client/shownames.qc
+++ b/data/qcsrc/client/shownames.qc
@@ -13,9 +13,6 @@ void Draw_ShowNames(entity ent)
        if(ent.sv_entnum == player_localentnum && !cvar("chase_active"))
                return;
 
-       if(ent.predator) // don't show names for prey
-               return;
-
        float sameteam;
        if(teamplay && (GetPlayerColor(player_localentnum - 1) == GetPlayerColor(ent.sv_entnum - 1)))
                sameteam = TRUE;
@@ -26,7 +23,7 @@ void Draw_ShowNames(entity ent)
 
                // offset the name by player scale, decided by health
                if(g_healthsize)
-                       ent.origin_z -= (g_healthsize - ent.healthvalue) * cvar("hud_shownames_offset_healthsize");
+                       ent.origin_z -= (g_healthsize - bound(g_healthsize_min, ent.healthvalue, g_healthsize_max)) * cvar("hud_shownames_offset_healthsize");
 
                traceline(ent.origin, view_origin, 1, ent);
 
@@ -168,13 +165,11 @@ void Draw_ShowNames_All()
                {
                        e.healthvalue = entcs.healthvalue;
                        e.armorvalue = entcs.armorvalue;
-                       e.predator = entcs.predator;
                }
                else
                {
                        e.healthvalue = 2342;
                        e.armorvalue = 0;
-                       e.predator = 0;
                }
 
                e.origin = getplayerorigin(i);