Allow setting which players to see on the radar. Either show no players, either team...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index e557149c5ef651ed0089f52581edc51bf64ae636..d33fe5ad5f0fa6c940a7c91993dc96d1fd460283 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1396,6 +1396,7 @@ seta sv_status_privacy 1  "hide IP addresses from \"status\" replies shown to cli
 \r
 \r
 seta cl_radar 2        "show radar. 1 in team maches, 2 always"\r
+seta cl_radar_players 2 "show players on the radar. 0 disables, 1 shows only team mates, 2 shows all players"\r
 seta cl_radar_content_alpha 0.9        "alpha of the minimap"\r
 seta cl_radar_background_alpha 0.5     "set to -1 to disable"\r
 seta cl_radar_foreground_alpha 0.9     "set to -1 to disable"\r

diff --git a/data/qcsrc/client/radar.qc b/data/qcsrc/client/radar.qc
index 6e03aa1139d9cacc0ae8cd0200df2466f594367b..dd766b7d0bc3f2fb4255402c3c769fa9c48d04b8 100644 (file)
--- a/data/qcsrc/client/radar.qc
+++ b/data/qcsrc/client/radar.qc
@@ -385,7 +385,7 @@ void() radar_view =
        for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )\r
        {\r
                col = GetPlayerColor(tm.sv_entnum);\r
-               //if(color == COLOR_SPECTATOR || color == col)\r
+               if(cvar("cl_radar_players") > 1 || (cvar("cl_radar_players") > 0 && teamplay && GetPlayerColor(player_localentnum - 1) == col))\r
                if not(tm.eaten) // don't show prey on the radar\r
                        draw_radar_player(tm.origin, tm.angles, GetTeamRGB(col));\r
        }\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
index 4960b91ed61c0c21187b3007234bc23612db39bd..066bd474f280497755dad9d9fd436a59210eec5f 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -6,7 +6,7 @@ CLASS(VoretHudDialog) EXTENDS(VoretDialog)
        ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")\r
        ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)\r
        ATTRIB(VoretHudDialog, intendedWidth, float, 1)\r
-       ATTRIB(VoretHudDialog, rows, float, 19)\r
+       ATTRIB(VoretHudDialog, rows, float, 20)\r
        ATTRIB(VoretHudDialog, columns, float, 8)\r
 ENDCLASS(VoretHudDialog)\r
 #endif\r
@@ -95,6 +95,16 @@ void fillVoretHudDialog(entity me)
                me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "0", "Disabled"));\r
                me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "1", "Team games"));\r
                me.TD(me, 1, 1.2, e = makeVoretRadioButton(1, "cl_radar", "2", "Always"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Show players:"));\r
+                       setDependent(e, "cl_radar", 1, 2);\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_radar_players"));\r
+                       e.addValue(e, "Disabled", "0");\r
+                       e.addValue(e, "Teammates", "1");\r
+                       e.addValue(e, "All players", "2");\r
+                       e.configureVoretTextSliderValues(e);\r
+                       setDependent(e, "cl_radar", 1, 2);\r
        me.TR(me);\r
                me.TDempty(me, 0.2);\r
                me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Foreground:"));\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 6ba2edc1a33875b44f57f892ab5d86eb4fde3d7d..0e11c16cdf3b0e7c2fa960ffdd52e3a7bc6d00c4 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -64,8 +64,6 @@
 \r
 - 0.8: Remake helper voices\r
 \r
-- 0.8: Add a checkpvs() check in sending entcs (where radar_showenemies used to be), to not send it for enemies behind walls\r
-\r
 - 0.8: Loading screens with messages\r
 \r
 - +0.8: Refraction effect for damage when you have armor (using a model)\r