Keep showing overlapping player tags but with low alpha

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

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 0bde46a15cb201c08a9c2cfdae59b88e06fd6d99..f07e66fb573c43dc35ee69f68447352d9cfe1f01 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -108,10 +108,18 @@ void Draw_ShowNames(entity this)
                this.alpha = max(0, this.alpha - SHOWNAMES_FADESPEED * frametime);
                this.fadedelay = 0; // reset fade in delay, enemy has left the view
        }
-       else if (OFF_SCREEN(o) || overlap > 0) // out of view or tag overlap detected, fade out
+       else if (OFF_SCREEN(o)) // out of view, fade out
        {
                this.alpha = max(0, this.alpha - SHOWNAMES_FADESPEED * frametime);
        }
+       else if (overlap > 0) // tag overlap detected, fade out
+       {
+               float minalpha = autocvar_hud_shownames_antioverlap_minalpha;
+               if (this.alpha >= minalpha)
+                       this.alpha = max(minalpha, this.alpha - SHOWNAMES_FADESPEED * frametime);
+               else
+                       this.alpha = min(minalpha, this.alpha + SHOWNAMES_FADESPEED * frametime);
+       }
        else if (this.sameteam)  // fade in for team mates
        {
                this.alpha = min(1, this.alpha + SHOWNAMES_FADESPEED * frametime);