Alias hud_panel_radar_maximized and friends to avoid unhappy situations where the...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9ea422f760922646b35d59b63b9ae4e3cbbc345a..1a2da0be47dfed4064ddf975b4b17d85312b5958 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1052,7 +1052,7 @@ bind t messagemode
 bind y messagemode2
 bind z messagemode2
 bind u "+con_chat_maximize"
-bind m "toggle hud_panel_radar_maximized"
+bind m +hud_panel_radar_maximized
 bind i +show_info
 bind PAUSE pause
 bind F10 quit
@@ -1471,9 +1471,11 @@ 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 0 "show the radar centered and 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"
+alias +hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 1"
+alias -hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 0"
+alias hud_panel_radar_maximized "cl_cmd hud_panel_radar_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 63311277e15a03dc56f45a6b14a8ae0ab5edd284..2df89afae0e9f0ecf8b5dd4cdc6a737071a65a80 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -33,7 +33,7 @@
 "togglezoom"                            "toggle zoom"
 "+showscores"                           "show scores"
 "screenshot"                            "screen shot"
-"toggle hud_panel_radar_maximized"      "maximize/minimize radar"
+"+hud_panel_radar_maximized"            "maximize radar"
 ""                                      ""
 ""                                      "Communicate"
 "messagemode"                           "public chat"

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 606123ad1c1d2c2ba4696b3f792bc8eb05a65e89..1cf0d68d0ea194f27418f3c972ad0a406ab31d14 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -507,6 +507,13 @@ void GameCommand(string msg)
        if(cmd == "mv_download") {
                Cmd_MapVote_MapDownload(argc);
        }
+       else if(cmd == "hud_panel_radar_maximized")
+       {
+               if(argc == 1)
+                       hud_panel_radar_maximized = !hud_panel_radar_maximized;
+               else
+                       hud_panel_radar_maximized = (stof(argv(1)) != 0);
+       }
        else if(cmd == "settemp") {
                cvar_clientsettemp(argv(1), argv(2));
        }

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index f066a9fe58c5159e865865f97f00b4e4ae769b7b..7259761c204406119b377876e73bd7377c6db012 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -274,7 +274,6 @@ 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;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 05b42ed3629e095b47b54dffb9a87bb05e5df438..ba3bf43dfa44db5e5d84afba6809736c04b9ccb9 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2339,7 +2339,7 @@ void HUD_Radar(void)
 {
        if (!autocvar__hud_configure)
        {
-               if (autocvar_hud_panel_radar_maximized)
+               if (hud_panel_radar_maximized)
                {
                        if (!hud_draw_maximized) return;
                }
@@ -2355,7 +2355,7 @@ void HUD_Radar(void)
        HUD_Panel_UpdateCvars(radar);
        HUD_Panel_ApplyFadeAlpha();
 
-       if (autocvar_hud_panel_radar_maximized && !autocvar__hud_configure)
+       if (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;
@@ -4907,7 +4907,7 @@ void HUD_Main (void)
 
        hud_draw_maximized = 1; // panels that may be maximized must check this var
        // draw maximized panels on top
-       if(autocvar_hud_panel_radar_maximized)
+       if(hud_panel_radar_maximized)
                HUD_Radar();
        if(autocvar__con_chat_maximized)
                HUD_Chat();

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index b1b54f519b6939b32a725fca1c2f41cf5a1e9aa3..2491d5ca38a7f656fc55319981070771b3124b9e 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -2,7 +2,9 @@ float log(float f);
 
 float panel_order[HUD_PANEL_NUM];
 string hud_panelorder_prev;
+
 float hud_draw_maximized;
+float hud_panel_radar_maximized;
 
 vector mousepos;
 vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index f89c9f8a014ee6724e20334c2270d4a1876098bd..0323a3856a8856c8837a7f0eaa38e2e072be9e5c 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -177,7 +177,7 @@ 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 (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;