Include gmqcc binaries for Windows and Linux

[voretournament/voretournament.git] / data / qcsrc / client / radar.qc

diff --git a/data/qcsrc/client/radar.qc b/data/qcsrc/client/radar.qc
index dd766b7d0bc3f2fb4255402c3c769fa9c48d04b8..b9cdab9be65273ca0f5f84bef13f50f783c58327 100644 (file)
--- a/data/qcsrc/client/radar.qc
+++ b/data/qcsrc/client/radar.qc
@@ -64,7 +64,7 @@ void draw_radar_background(float ca, float bg)
 \r
        if(bg > 0)\r
        {\r
-               R_BeginPolygon("gfx/hud/bg_radar.tga", 0);\r
+               R_BeginPolygon(strcat("gfx/hud/", cvar_string("hud_style"), "/bg_radar.tga"), 0);\r
                R_PolygonVertex(pos1, yinvert('0 1 0'), '1 1 1', bg);\r
                R_PolygonVertex(pos2, yinvert('1 1 0'), '1 1 1', bg);\r
                R_PolygonVertex(pos3, yinvert('1 0 0'), '1 1 1', bg);\r
@@ -106,14 +106,14 @@ void draw_radar_foreground(float fg)
 \r
        if(fg > 0)\r
        {\r
-               R_BeginPolygon("gfx/hud/fg_radar.tga", 0);\r
+               R_BeginPolygon(strcat("gfx/hud/", cvar_string("hud_style"), "/fg_radar.tga"), 0);\r
                R_PolygonVertex(pos1, yinvert('0 1 0'), '1 1 1', fg);\r
                R_PolygonVertex(pos2, yinvert('1 1 0'), '1 1 1', fg);\r
                R_PolygonVertex(pos3, yinvert('1 0 0'), '1 1 1', fg);\r
                R_PolygonVertex(pos4, yinvert('0 0 0'), '1 1 1', fg);\r
                R_EndPolygon();\r
 \r
-               R_BeginPolygon("gfx/hud/fg_radar_team.tga", 0);\r
+               R_BeginPolygon(strcat("gfx/hud/", cvar_string("hud_style"), "/fg_radar_team.tga"), 0);\r
                R_PolygonVertex(pos1, yinvert('0 1 0'), rgb, fg);\r
                R_PolygonVertex(pos2, yinvert('1 1 0'), rgb, fg);\r
                R_PolygonVertex(pos3, yinvert('1 0 0'), rgb, fg);\r
@@ -386,6 +386,8 @@ void() radar_view =
        {\r
                col = GetPlayerColor(tm.sv_entnum);\r
                if(cvar("cl_radar_players") > 1 || (cvar("cl_radar_players") > 0 && teamplay && GetPlayerColor(player_localentnum - 1) == col))\r
+               if not(tm.sv_entnum == spectatee_status - 1) // don't show the player we are spectating, since we also draw ourself separately\r
+               if not(tm.sv_entnum == getstati(STAT_VORE_EATEN) - 1) // don't show the player who ate us, since we also draw ourself separately\r
                if not(tm.eaten) // don't show prey on the radar\r
                        draw_radar_player(tm.origin, tm.angles, GetTeamRGB(col));\r
        }\r