cleanup and a few comments

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

diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc
index c697268eb4d2ef82928b800ee5771e5cc302ad8e..6084b319effe65738b2e9a45909b7c26c04d4acb 100644 (file)
--- a/qcsrc/client/hud/crosshair.qc
+++ b/qcsrc/client/hud/crosshair.qc
@@ -63,9 +63,8 @@ float EnemyHitCheck()
        if(n > maxclients)
                return SHOTTYPE_HITWORLD;
        t = entcs_GetTeam(n - 1);
-       if(teamplay)
-               if(t == myteam)
-                       return SHOTTYPE_HITTEAM;
+       if(teamplay && t == myteam)
+               return SHOTTYPE_HITTEAM;
        if(t == NUM_SPECTATOR)
                return SHOTTYPE_HITWORLD;
        return SHOTTYPE_HITENEMY;
@@ -123,8 +122,6 @@ float TrueAimCheck(entity wepent)
 
        vector traceorigin = entcs_receiver(player_localentnum - 1).origin + (eZ * STAT(VIEWHEIGHT));
 
-       vecs = decompressShotOrigin(STAT(SHOTORG));
-
        traceline(traceorigin, traceorigin + view_forward * max_shot_distance, mv, ta);
        trueaimpoint = trace_endpos;
        // move trueaimpoint a little bit forward to make the final tracebox reliable
@@ -134,6 +131,8 @@ float TrueAimCheck(entity wepent)
        if(vdist((trueaimpoint - traceorigin), <, g_trueaim_minrange))
                trueaimpoint = traceorigin + view_forward * g_trueaim_minrange;
 
+       vecs = decompressShotOrigin(STAT(SHOTORG));
+
        if(vecs.x > 0)
                vecs.y = -vecs.y;
        else
@@ -229,7 +228,7 @@ void HUD_Crosshair(entity this)
        if(autocvar_chase_active > 0 && autocvar_crosshair_chase && STAT(HEALTH) <= 0 && csqcplayer)
                csqcplayer.alpha = csqcplayer.m_alpha;
 
-       if (autocvar_chase_active > 0 && autocvar_chase_front)
+       if (autocvar_chase_active > 0 && (autocvar_chase_front || autocvar_cl_lockview))
        {
                if (csqcplayer.alpha != csqcplayer.m_alpha)
                        HUD_Crosshair_ApplyPlayerAlpha(csqcplayer.m_alpha);