From 3d81bedbad70b7ea613793e7b5913e9bb739ae4c Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 5 Oct 2011 15:52:30 +0200 Subject: [PATCH] Alias hud_panel_radar_maximized and friends to avoid unhappy situations where the game starts with the radar maximized --- defaultXonotic.cfg | 6 ++++-- keybinds.txt | 2 +- qcsrc/client/Main.qc | 7 +++++++ qcsrc/client/autocvars.qh | 1 - qcsrc/client/hud.qc | 6 +++--- qcsrc/client/hud.qh | 2 ++ qcsrc/client/teamradar.qc | 2 +- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 9ea422f76..1a2da0be4 100644 --- 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 63311277e..2df89afae 100644 --- 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 606123ad1..1cf0d68d0 100644 --- 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 f066a9fe5..7259761c2 100644 --- 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 05b42ed36..ba3bf43df 100644 --- 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 b1b54f519..2491d5ca3 100644 --- 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 f89c9f8a0..0323a3856 100644 --- 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; -- 2.39.2