Draw the radar foreground in front of players

diff --git a/data/qcsrc/client/radar.qc b/data/qcsrc/client/radar.qc
index 2808d339e3af4e83c94992f7936452feb18f25f8..bae1c5c57ae9408d631853ebe6628160e11be423 100644 (file)
--- a/data/qcsrc/client/radar.qc
+++ b/data/qcsrc/client/radar.qc
@@ -53,15 +53,14 @@ vector yinvert(vector v)
        return v;\r
 }\r
 \r
-void draw_radar_background(float ca, float bg, float fg)\r
+void draw_radar_background(float ca, float bg)\r
 {\r
-       vector col, rgb;\r
+       vector col;\r
        vector pos1, pos2, pos3, pos4;\r
        pos1 = '1 0 0' * (radar_origin2d_x - radar_size2d_x * 0.5 + radar_extraclip_mins_x) + '0 1 0' * (radar_origin2d_y - radar_size2d_y * 0.5 + radar_extraclip_mins_y);\r
        pos2 = '1 0 0' * (radar_origin2d_x + radar_size2d_x * 0.5 + radar_extraclip_maxs_x) + '0 1 0' * (radar_origin2d_y - radar_size2d_y * 0.5 + radar_extraclip_mins_y);\r
        pos3 = '1 0 0' * (radar_origin2d_x + radar_size2d_x * 0.5 + radar_extraclip_maxs_x) + '0 1 0' * (radar_origin2d_y + radar_size2d_y * 0.5 + radar_extraclip_maxs_y);\r
        pos4 = '1 0 0' * (radar_origin2d_x - radar_size2d_x * 0.5 + radar_extraclip_mins_x) + '0 1 0' * (radar_origin2d_y + radar_size2d_y * 0.5 + radar_extraclip_maxs_y);\r
-       rgb = GetTeamRGB(GetPlayerColor(player_localentnum - 1));\r
 \r
        if(bg > 0)\r
        {\r
@@ -93,6 +92,17 @@ void draw_radar_background(float ca, float bg, float fg)
                }\r
                R_EndPolygon();\r
        }\r
+}\r
+\r
+void draw_radar_foreground(float fg)\r
+{\r
+       vector rgb;\r
+       vector pos1, pos2, pos3, pos4;\r
+       pos1 = '1 0 0' * (radar_origin2d_x - radar_size2d_x * 0.5 + radar_extraclip_mins_x) + '0 1 0' * (radar_origin2d_y - radar_size2d_y * 0.5 + radar_extraclip_mins_y);\r
+       pos2 = '1 0 0' * (radar_origin2d_x + radar_size2d_x * 0.5 + radar_extraclip_maxs_x) + '0 1 0' * (radar_origin2d_y - radar_size2d_y * 0.5 + radar_extraclip_mins_y);\r
+       pos3 = '1 0 0' * (radar_origin2d_x + radar_size2d_x * 0.5 + radar_extraclip_maxs_x) + '0 1 0' * (radar_origin2d_y + radar_size2d_y * 0.5 + radar_extraclip_maxs_y);\r
+       pos4 = '1 0 0' * (radar_origin2d_x - radar_size2d_x * 0.5 + radar_extraclip_mins_x) + '0 1 0' * (radar_origin2d_y + radar_size2d_y * 0.5 + radar_extraclip_maxs_y);\r
+       rgb = GetTeamRGB(GetPlayerColor(player_localentnum - 1));\r
 \r
        if(fg > 0)\r
        {\r
@@ -355,7 +365,7 @@ void() radar_view =
                radar_size2d_y + radar_extraclip_maxs_y - radar_extraclip_mins_y\r
        );\r
 \r
-       draw_radar_background(cl_radar_content_alpha, cl_radar_background_alpha, cl_radar_foreground_alpha);\r
+       draw_radar_background(cl_radar_content_alpha, cl_radar_background_alpha);\r
 \r
        if(showmap)\r
        {\r
@@ -381,6 +391,8 @@ void() radar_view =
        draw_radar_player(view_origin, view_angles, '1 1 1');\r
 \r
        drawresetcliparea();\r
+\r
+       draw_radar_foreground(cl_radar_foreground_alpha);\r
 };\r
 \r
 \r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 53a0caff844f1e771a682c1bee319ade1c7db1ed..8de339e53796d4dbf5ef78fcc92dd28d1c73cbd7 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -146,8 +146,8 @@
 \r
 - 0.7: Bots should digest items even at 0 skill\r
 \r
-- 0.7 BUG: Players on the minimap appear in front of the foreground\r
-\r
 - 0.7: Farewell has an issue with the radar\r
 \r
-- 0.7: Make self a different color on the radar (maybe just change brightness?)
\ No newline at end of file
+- 0.7: Make self a different color on the radar (maybe just change brightness?)\r
+\r
+- 0.7 | 0.8: Should the hud splash texture really be named blood?
\ No newline at end of file