Shownames: restore an early alpha check that was made exclusive to CTS by mistake...

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 3f0688d61d0e4a2c577ae2ae10660197ccd18380..45496e87987d9deeb436d578fceba4af7d1a66cd 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -138,6 +138,9 @@ void Draw_ShowNames(entity this)
        }
        if (MUTATOR_CALLHOOK(ShowNames_Draw, this, a)) return;
        a = M_ARGV(1, float);
+
+       if (a < ALPHA_MIN_VISIBLE) return;
+
        float dist = -1; // dist will be calculated only when really needed to avoid wasting a vlen call
        if (autocvar_hud_shownames_maxdistance)
        {

diff --git a/qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc
index ce095bf2032a0e1a63fccaaac1fc0c3840d91148..1af406f3129224c59c9f4ed3005c71f88cf96de5 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc
+++ b/qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc
@@ -43,11 +43,6 @@ MUTATOR_HOOKFUNCTION(cl_cts, ShowRankings)
        }
 }
 
-MUTATOR_HOOKFUNCTION(cl_cts, ShowNames_Draw)
-{
-       return (ISGAMETYPE(CTS) && M_ARGV(1, float) < ALPHA_MIN_VISIBLE);
-}
-
 MUTATOR_HOOKFUNCTION(cl_cts, ShowRaceTimer)
 {
        return ISGAMETYPE(CTS); // show the race timer panel