hud_panel_radar_maximized to show the radar centered and bigger (customizable scale...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 29bf1e0b7c2c6bdfdd1538543d409f869f14f23a..47d610e61553bc1a6241ab24c5fff340b51cf695 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1053,6 +1053,7 @@ bind t messagemode
 bind y messagemode2
 bind z messagemode2
 bind u "+con_chat_maximize"
+bind m "toggle hud_panel_radar_maximized"
 bind i +show_info
 bind PAUSE pause
 bind F10 quit
@@ -1468,6 +1469,9 @@ seta hud_panel_radar_scale 4096 "distance you can see on the team radar"
 seta hud_panel_radar_rotation 0        "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
 seta hud_panel_radar_zoommode 0        "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
 alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
+seta hud_panel_radar_maximized;
+seta hud_panel_radar_maximized_scale "8192" "distance you can see on the radar when maximized"
+seta hud_panel_radar_maximized_size "0.5 0.5" "size of the radar when maximized"
 
 seta hud_panel_score_rankings 0 "show rankings: 1 always show my own score; 2 pure rankings"
 

diff --git a/keybinds.txt b/keybinds.txt
index ca1f9b37e074d6d8ad824987262002cffda23830..63311277e15a03dc56f45a6b14a8ae0ab5edd284 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -33,6 +33,7 @@
 "togglezoom"                            "toggle zoom"
 "+showscores"                           "show scores"
 "screenshot"                            "screen shot"
+"toggle hud_panel_radar_maximized"      "maximize/minimize radar"
 ""                                      ""
 ""                                      "Communicate"
 "messagemode"                           "public chat"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index bf425fc477921897eefd7cb7bfeaabb02d7feed8..086594b9da587980f6bcb9710cd1c1f73feba930 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -273,6 +273,9 @@ float autocvar_hud_panel_pressedkeys_aspect;
 float autocvar_hud_panel_racetimer;
 float autocvar_hud_panel_radar;
 float autocvar_hud_panel_radar_foreground_alpha;
+float autocvar_hud_panel_radar_maximized;
+float autocvar_hud_panel_radar_maximized_scale;
+vector autocvar_hud_panel_radar_maximized_size;
 float autocvar_hud_panel_radar_rotation;
 float autocvar_hud_panel_radar_scale;
 float autocvar_hud_panel_radar_zoommode;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 92bbc5223175722374ff81ddf32c37466898fa9e..78c30edc63e46803d161896ec810f8944f45af6d 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2310,6 +2310,25 @@ void HUD_Radar(void)
 
        HUD_Panel_UpdateCvars(radar);
        HUD_Panel_ApplyFadeAlpha();
+
+       if (autocvar_hud_panel_radar_maximized && !autocvar__hud_configure)
+       {
+               panel_size = autocvar_hud_panel_radar_maximized_size;
+               panel_size_x = bound(0.2, panel_size_x, 1) * vid_conwidth;
+               panel_size_y = bound(0.2, panel_size_y, 1) * vid_conheight;
+               panel_pos_x = (vid_conwidth - panel_size_x) / 2;
+               panel_pos_y = (vid_conheight - panel_size_y) / 2;
+               if(panel_bg == "0") // force a border when maximized
+               {
+                       if(precache_pic(panel_bg) == "") {
+                               panel_bg = strcat(hud_skin_path, "/border_default");
+                               if(precache_pic(panel_bg) == "") {
+                                       panel_bg = "gfx/hud/default/border_default";
+                               }
+                       }
+               }
+       }
+
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 852b3609243c5961072ac75f5b217ea25733cd9c..f89c9f8a014ee6724e20334c2270d4a1876098bd 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -177,6 +177,11 @@ void teamradar_loadcvars()
 {
        v_flipped = autocvar_v_flipped;
        hud_panel_radar_scale = autocvar_hud_panel_radar_scale;
+       if (autocvar_hud_panel_radar_maximized && !autocvar__hud_configure)
+       {
+               if (autocvar_hud_panel_radar_maximized_scale > 0)
+                       hud_panel_radar_scale = autocvar_hud_panel_radar_maximized_scale;
+       }
        hud_panel_radar_foreground_alpha = autocvar_hud_panel_radar_foreground_alpha * panel_fg_alpha;
        hud_panel_radar_rotation = autocvar_hud_panel_radar_rotation;
        hud_panel_radar_zoommode = autocvar_hud_panel_radar_zoommode;