Remove radar_showennemies, so player names can show for enemies without using Xonotic...

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 94f5936c99f66a1725cb1aa3769629630b232322..7ecabb603e41ae67b9f56d840f97191bb7997ed4 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -1453,8 +1453,7 @@ void ClientConnect (void)
                ctf_clientconnect();\r
        }*/\r
 \r
-       if(teams_matter || radar_showennemies)\r
-               attach_entcs();\r
+       attach_entcs();\r
 \r
        bot_relinkplayerlist();\r
 \r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index af3fa770879e1dd6bac5269fcf1ca88f0cfd2c08..5bc4e17e98e5c2a695318a087508740b4957c984 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -613,8 +613,6 @@ FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);
 \r
 .float stat_leadlimit;\r
 \r
-float radar_showennemies;\r
-\r
 #ifdef PROFILING\r
 float client_cefc_accumulator;\r
 float client_cefc_accumulatortime;\r

diff --git a/data/qcsrc/server/ent_cs.qc b/data/qcsrc/server/ent_cs.qc
index ff20effe5db672836dc4153e085984df995583cf..9fc1ecb59b0d5ce7f2cb005dbc554b13d36b8079 100644 (file)
--- a/data/qcsrc/server/ent_cs.qc
+++ b/data/qcsrc/server/ent_cs.qc
@@ -30,10 +30,6 @@ float entcs_customize()
                return FALSE;\r
        if(other == o)\r
                return FALSE;\r
-       if(other.classname == "player")\r
-               if(!teamplay || o.team != other.team)\r
-                       if not (radar_showennemies)\r
-                               return FALSE;\r
        return TRUE;\r
 }\r
 \r