scoreboard_border_thickness --> hud_panel_mapvote_highlight_border

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index bfd9949c817c4dffdcb3342a86046fec22be9331..4bcb286898b6cf73278c84be614ca112c2a94faf 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -329,6 +329,7 @@ seta hud_panel_mapvote_bg_color_team "" "override panel color with team color in
 seta hud_panel_mapvote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_mapvote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_mapvote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_mapvote_highlight_border "" "highlight border size of the selected map"
 
 seta hud_panel_itemstime_pos "" "position of this base of the panel"
 seta hud_panel_itemstime_size "" "size of this panel"

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 499170ec61c658ee8882d6379fb95d337cd81ed5..245dcae291c208fb20fb957a91f30de7977b99d6 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -832,8 +832,6 @@ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info pr
 
 // scoreboard
 seta scoreboard_columns default
-seta scoreboard_border_thickness 1 "scoreboard border thickness"
-seta scoreboard_accuracy_border_thickness 1 "accuracy stats border thickness"
 
 seta accuracy_color_levels "0 20 100" "accuracy values at which a specified color (accuracy_color<X>) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order"
 seta accuracy_color0 "1 0 0"

diff --git a/hud_luma.cfg b/hud_luma.cfg
index 27f12b26dfd80cbcc9f0197b8cfe6ffa3de0300f..ee80daa63c9626d5e58193556798d93507749751 100644 (file)
--- a/hud_luma.cfg
+++ b/hud_luma.cfg
@@ -330,6 +330,7 @@ seta hud_panel_mapvote_bg_color_team ""
 seta hud_panel_mapvote_bg_alpha ""
 seta hud_panel_mapvote_bg_border ""
 seta hud_panel_mapvote_bg_padding ""
+seta hud_panel_mapvote_highlight_border "1"
 
 seta hud_panel_itemstime_pos "0.030000 0.260000"
 seta hud_panel_itemstime_size "0.070000 0.230000"

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index 2c860d335073aa3b31fb7c3a949993b93097c90b..6b3163f0ed247117f43e626610b031b9e12eb352 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -330,6 +330,7 @@ seta hud_panel_mapvote_bg_color_team ""
 seta hud_panel_mapvote_bg_alpha ""
 seta hud_panel_mapvote_bg_border ""
 seta hud_panel_mapvote_bg_padding ""
+seta hud_panel_mapvote_highlight_border "1"
 
 seta hud_panel_itemstime_pos "0.030000 0.260000"
 seta hud_panel_itemstime_size "0.070000 0.230000"

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index e7f06a59c8d0eabe5a932e3cd427aa6846b98608..8113c197517dace5043fe4095b993348b3bc3a7f 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -330,6 +330,7 @@ seta hud_panel_mapvote_bg_color_team ""
 seta hud_panel_mapvote_bg_alpha ""
 seta hud_panel_mapvote_bg_border ""
 seta hud_panel_mapvote_bg_padding ""
+seta hud_panel_mapvote_highlight_border "1"
 
 seta hud_panel_itemstime_pos "0.000000 0.310000"
 seta hud_panel_itemstime_size "0.070000 0.180000"

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index df80196a45597176b9a72181ece57b4e14cf7ade..54206598efb4655853dd26945e317afb4081958c 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -330,6 +330,7 @@ seta hud_panel_mapvote_bg_color_team ""
 seta hud_panel_mapvote_bg_alpha ""
 seta hud_panel_mapvote_bg_border ""
 seta hud_panel_mapvote_bg_padding ""
+seta hud_panel_mapvote_highlight_border "1"
 
 seta hud_panel_itemstime_pos "0.000000 0.310000"
 seta hud_panel_itemstime_size "0.070000 0.180000"

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index 3e2b0bb54d48d1ce7587c47e6139bc6e241b5add..a9ff1ba90a6070cc19667e1dfe5ea4d012fca393 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -330,6 +330,7 @@ seta hud_panel_mapvote_bg_color_team ""
 seta hud_panel_mapvote_bg_alpha ""
 seta hud_panel_mapvote_bg_border ""
 seta hud_panel_mapvote_bg_padding ""
+seta hud_panel_mapvote_highlight_border "1"
 
 seta hud_panel_itemstime_pos "0.020000 0.490000"
 seta hud_panel_itemstime_size "0.090000 0.140000"

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 037e6aec83b92889a3db0d98bb27dfafd2851028..113310e1b81f5972e0bb56ec9203ce73af68d339 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -330,6 +330,7 @@ seta hud_panel_mapvote_bg_color_team ""
 seta hud_panel_mapvote_bg_alpha ""
 seta hud_panel_mapvote_bg_border ""
 seta hud_panel_mapvote_bg_padding ""
+seta hud_panel_mapvote_highlight_border "1"
 
 seta hud_panel_itemstime_pos "0.000000 0.290000"
 seta hud_panel_itemstime_size "0.150000 0.060000"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index e3cf7ce5980f198a5c1bb84c9bf82e2bd4316602..02a412ef62b04ea38954fdac4cc1127beef20447 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -262,6 +262,7 @@ float autocvar_hud_panel_healtharmor_progressbar_gfx_smooth;
 int autocvar_hud_panel_healtharmor_text;
 bool autocvar_hud_panel_infomessages;
 bool autocvar_hud_panel_infomessages_flip;
+float autocvar_hud_panel_mapvote_highlight_border = 1;
 bool autocvar_hud_panel_modicons;
 int autocvar_hud_panel_modicons_ca_layout;
 int autocvar_hud_panel_modicons_dom_layout;
@@ -395,7 +396,6 @@ float autocvar_r_drawviewmodel;
 int autocvar_r_fakelight;
 int autocvar_r_fullbright;
 float autocvar_r_letterbox;
-float autocvar_scoreboard_border_thickness;
 string autocvar_scoreboard_columns;
 bool autocvar_v_flipped;
 float autocvar_vid_conheight;

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index b7751ed06ef75cf730252aaca51946e70c0721bf..79bfae3adbc78c2b0567cc5d8541da8aadf724ae 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -88,10 +88,10 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
        // Bounding box details
        float rect_margin = hud_fontsize.y / 2;
 
-       pos.x += rect_margin + autocvar_scoreboard_border_thickness;
-       pos.y += rect_margin + autocvar_scoreboard_border_thickness;
-       maxh -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
-       tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
+       pos.x += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+       pos.y += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+       maxh -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
+       tsize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
 
        vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
        vector rect_size = '1 1 0';
@@ -109,7 +109,7 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
        if(id == mv_ownvote)
        {
                drawfill(rect_pos, rect_size, rgb, 0.1*alpha, DRAWFLAG_NORMAL);
-               drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, alpha, DRAWFLAG_NORMAL);
+               drawborderlines(autocvar_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, alpha, DRAWFLAG_NORMAL);
        }
 
        vector offset = pos;
@@ -193,10 +193,10 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 
        float rect_margin = hud_fontsize.y / 2;
 
-       pos.x += rect_margin + autocvar_scoreboard_border_thickness;
-       pos.y += rect_margin + autocvar_scoreboard_border_thickness;
-       isize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
-       tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
+       pos.x += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+       pos.y += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+       isize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
+       tsize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
 
        vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
        vector rect_size = '1 1 0';
@@ -240,7 +240,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
        if(id == mv_ownvote)
        {
                drawfill(rect_pos, rect_size, rgb, 0.1*theAlpha, DRAWFLAG_NORMAL);
-               drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, theAlpha, DRAWFLAG_NORMAL);
+               drawborderlines(autocvar_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, theAlpha, DRAWFLAG_NORMAL);
        }
 
        drawstring(text_pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL);