From: FruitieX Date: Thu, 21 Oct 2010 19:21:39 +0000 (+0300) Subject: s/hud_border_thickness/autocvar_scoreboard_border_thickness/ X-Git-Tag: xonotic-v0.1.0preview~267^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f78920895a3160431d3a9358711e1411a32fc394;p=xonotic%2Fxonotic-data.pk3dir.git s/hud_border_thickness/autocvar_scoreboard_border_thickness/ --- diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 5e724442b..a98b70683 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -234,3 +234,5 @@ var string autocvar_hud_panel_infomessages_bg_alpha; var string autocvar_hud_panel_infomessages_bg_border; var string autocvar_hud_panel_infomessages_bg_padding; var float autocvar_hud_panel_infomessages_flip; + +var float autocvar_scoreboard_border_thickness; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index e862fe10a..7f5c84429 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4915,9 +4915,6 @@ void HUD_Main (void) else if(autocvar__menu_alpha == 0 && scoreboard_fade_alpha == 0) hud_fade_alpha = 1; - hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5); - hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5); - hud_fontsize = HUD_GetFontsize("hud_fontsize"); if(!autocvar__hud_configure && !hud_fade_alpha) diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 9e41d0b25..5e9d59b6e 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -37,8 +37,6 @@ float weapontime; float weaponprevtime; float teamnagger; -float hud_border_thickness; -float hud_accuracy_border_thickness; float hud_configure_checkcollisions; float hud_configure_prev; diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 18e0ce1a2..40fcfda11 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -71,8 +71,8 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin pos_x = pos_x + text_size*0.5 - img_size_x*0.5; pos_y = pos_y - img_size_y; - pos += hud_border_thickness * '1 1 0'; - img_size -= (hud_border_thickness * 2) * '1 1 0'; + pos += autocvar_scoreboard_border_thickness * '1 1 0'; + img_size -= (autocvar_scoreboard_border_thickness * 2) * '1 1 0'; if(pic == "") { drawfill(pos, img_size, '.5 .5 .5', .7, DRAWFLAG_NORMAL); @@ -83,9 +83,9 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin } if(id == mv_ownvote) - drawborderlines(hud_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL); + drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL); else - drawborderlines(hud_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL); + drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL); if(id == mv_selection) drawfill(pos, img_size, '1 1 1', 0.1, DRAWFLAG_NORMAL); diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 9e07eed7e..4000f30a7 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -766,16 +766,16 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, rgb + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL); // table border - tmp_y += hud_border_thickness; + tmp_y += autocvar_scoreboard_border_thickness; tmp_y += body_table_height; - drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg, DRAWFLAG_NORMAL); // more transparency for the scoreboard + drawborderlines(autocvar_scoreboard_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg, DRAWFLAG_NORMAL); // more transparency for the scoreboard // separator header/table pos_y += 1.25 * hud_fontsize_y; - tmp_y = hud_border_thickness; + tmp_y = autocvar_scoreboard_border_thickness; drawfill(pos, tmp, '0 0 0', scoreboard_alpha_bg, DRAWFLAG_NORMAL); - pos_y += hud_border_thickness; + pos_y += autocvar_scoreboard_border_thickness; // table background tmp_y = body_table_height; @@ -789,14 +789,14 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz // go back to the top to make alternated columns highlighting and to print the strings pos_y -= 1.25 * hud_fontsize_y; - pos_y -= hud_border_thickness; + pos_y -= autocvar_scoreboard_border_thickness; pos += '1 1 0'; if (scoreboard_highlight) { column_dim_y = 1.25 * hud_fontsize_y; // header - column_dim_y += hud_border_thickness; + column_dim_y += autocvar_scoreboard_border_thickness; column_dim_y += body_table_height; } @@ -846,7 +846,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz pos_x = xmin; pos_y += 1.25 * hud_fontsize_y; // skip the header - pos_y += hud_border_thickness; + pos_y += autocvar_scoreboard_border_thickness; // fill the table and draw the rows i = 0; @@ -917,7 +917,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_scoreboard_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); else drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, scoreboard_alpha_bg, DRAWFLAG_NORMAL); - drawborderlines(hud_accuracy_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); + drawborderlines(autocvar_scoreboard_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); // column highlighting for(i = 0; i < weapon_cnt/rows; ++i) @@ -1050,7 +1050,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_ drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_scoreboard_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL); else drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, scoreboard_alpha_bg, DRAWFLAG_NORMAL); - drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); + drawborderlines(autocvar_scoreboard_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL); // row highlighting for(i = 0; i