fix ammo usage, and revert the size change to the electro blobs, it's not even needed...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / teamradar.qc

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 1a4ec004516636b50d211c4e35746fe2f5e58e3a..323db5e68cac525d343bf9a75f10871847a09b94 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -57,15 +57,6 @@ void draw_teamradar_background(float bg, float fg)
 {
        float fga;
        vector fgc;
-       if(bg > 0)
-       {
-               R_BeginPolygon("", 0);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y), '0 0 0', '0 0 0', bg);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5 + teamradar_extraclip_maxs_x) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y), '0 0 0', '0 0 0', bg);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5 + teamradar_extraclip_maxs_x) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5 + teamradar_extraclip_maxs_y), '0 0 0', '0 0 0', bg);
-               R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5 + teamradar_extraclip_maxs_y), '0 0 0', '0 0 0', bg);
-               R_EndPolygon();
-       }
 
        if(fg > 0 && minimapname != "")
        {
@@ -115,17 +106,17 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
                rgb2 = '1 1 1';
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, hud_alpha_fg);
-       R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, hud_alpha_fg);
-       R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, hud_alpha_fg);
-       R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, hud_alpha_fg);
+       R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, hud_fg_alpha);
+       R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, hud_fg_alpha);
        R_EndPolygon();
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, hud_alpha_fg);
-       R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, hud_alpha_fg);
-       R_PolygonVertex(coord-v_forward, '1 0 0', rgb, hud_alpha_fg);
-       R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, hud_alpha_fg);
+       R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord-v_forward, '1 0 0', rgb, hud_fg_alpha);
+       R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, hud_fg_alpha);
        R_EndPolygon();
 };
 
@@ -170,10 +161,10 @@ void draw_teamradar_link(vector start, vector end, float colors)
        c1 = colormapPaletteColor((colors & 0xF0) / 0x10, FALSE);
 
        R_BeginPolygon("", 0);
-       R_PolygonVertex(start - norm, '0 0 0', c0, hud_alpha_fg);
-       R_PolygonVertex(start + norm, '0 1 0', c0, hud_alpha_fg);
-       R_PolygonVertex(end + norm, '1 1 0', c1, hud_alpha_fg);
-       R_PolygonVertex(end - norm, '1 0 0', c1, hud_alpha_fg);
+       R_PolygonVertex(start - norm, '0 0 0', c0, hud_fg_alpha);
+       R_PolygonVertex(start + norm, '0 1 0', c0, hud_fg_alpha);
+       R_PolygonVertex(end + norm, '1 1 0', c1, hud_fg_alpha);
+       R_PolygonVertex(end - norm, '1 0 0', c1, hud_fg_alpha);
        R_EndPolygon();
 }
 
@@ -189,16 +180,16 @@ void teamradar_loadcvars()
 {
        v_flipped = cvar("v_flipped");
        hud_radar_scale = cvar("hud_radar_scale");
-       hud_radar_background_alpha = cvar("hud_radar_background_alpha") * hud_alpha_fg;
-       hud_radar_foreground_alpha = cvar("hud_radar_foreground_alpha") * hud_alpha_fg;
+       hud_radar_background_alpha = cvar("hud_radar_background_alpha") * hud_fg_alpha;
+       hud_radar_foreground_alpha = cvar("hud_radar_foreground_alpha") * hud_fg_alpha;
        hud_radar_rotation = cvar("hud_radar_rotation");
        hud_radar_zoommode = cvar("hud_radar_zoommode");
 
        // others default to 0
        // match this to defaultXonotic.cfg!
        if(!hud_radar_scale) hud_radar_scale = 4096;
-       if(!hud_radar_background_alpha) hud_radar_background_alpha = 0.4 * hud_alpha_fg;
-       if(!hud_radar_foreground_alpha) hud_radar_foreground_alpha = 0.8 * hud_alpha_fg;
+       if(!hud_radar_background_alpha) hud_radar_background_alpha = 0.4 * hud_fg_alpha;
+       if(!hud_radar_foreground_alpha) hud_radar_foreground_alpha = 0.8 * hud_fg_alpha;
        if(!hud_radar_size_x) hud_radar_size_x = 128;
        if(!hud_radar_size_y) hud_radar_size_y = hud_radar_size_x;