Declare more ints as ints

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

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 413eaaf54714170958e354c59a6d5cf39c1bdffb..8aeb12a046b4ff10b169d70b23ea4eca6e742b28 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -14,16 +14,10 @@ void Draw_ShowNames(entity ent)
        if(!autocvar_hud_shownames)
                return;
 
-#ifdef COMPAT_XON050_ENGINE
-       if((ent.sv_entnum == player_localentnum) || (ent.sv_entnum == spectatee_status)) // ent is me or person i'm spectating
-#else
        if(ent.sv_entnum == player_localentnum) // ent is me or person i'm spectating
-#endif
                if(!(autocvar_hud_shownames_self && autocvar_chase_active))
                        return;
 
-       makevectors(view_angles);
-
        if(ent.sameteam || (!ent.sameteam && autocvar_hud_shownames_enemies))
        {
                ent.origin_z += autocvar_hud_shownames_offset;
@@ -104,7 +98,7 @@ void Draw_ShowNames(entity ent)
                if(!ent.sameteam || (ent.sv_entnum == player_localentnum))
                        ent.alpha *= getplayeralpha(ent.sv_entnum-1);
 
-               if(ent.alpha < ALPHA_MIN_VISIBLE)
+               if(ent.alpha < ALPHA_MIN_VISIBLE && gametype != MAPINFO_TYPE_CTS)
                        return;
 
                float dist;
@@ -186,7 +180,7 @@ void Draw_ShowNames(entity ent)
 entity shownames_ent[255];
 void Draw_ShowNames_All()
 {
-       float i;
+       int i;
        for(i = 0; i < maxclients; ++i)
        {
                float t;