scoreboard_offset_vertical: additional distance between top/bottom of screen for...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9695b5a3408ca41dd3c729c80138123919f730d0..07f5f709829423f4bc0f08e76193456fa467a899 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1453,6 +1453,7 @@ seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scor
 seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
 seta scoreboard_offset_left 0.15 "how many pixels the scoreboard is offset from the left screen edge"
 seta scoreboard_offset_right 0.15 "how many pixels the scoreboard is offset from the right screen edge"
+seta scoreboard_offset_vertical 0.2 "how many pixels the scoreboard is offset from the top and bottom of the screen"
 seta scoreboard_bg_scale 0.25 "scale for the tiled scoreboard background"
 
 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"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 20e8399dae712d210d3f53ceedfc9933d9231061..897bb24e73753c9191f9d71fab1adad287fcfe63 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -123,30 +123,30 @@ float autocvar_g_balance_tuba_fadetime;
 float autocvar_g_balance_tuba_volume;
 float autocvar_g_balance_tuba_pitchstep;
 float autocvar_g_warmup_limit;
-var float autocvar_g_waypointsprite_uppercase = 1;
-var float autocvar_g_waypointsprite_alpha = 1;
-var float autocvar_g_waypointsprite_crosshairfadealpha = 1;
+float autocvar_g_waypointsprite_uppercase;
+float autocvar_g_waypointsprite_alpha;
+float autocvar_g_waypointsprite_crosshairfadealpha;
 float autocvar_g_waypointsprite_crosshairfadedistance;
-var float autocvar_g_waypointsprite_crosshairfadescale = 1;
+float autocvar_g_waypointsprite_crosshairfadescale;
 float autocvar_g_waypointsprite_distancealphaexponent;
-var float autocvar_g_waypointsprite_distancefadealpha = 1;
-var float autocvar_g_waypointsprite_distancefadedistancemultiplier = 1;
-var float autocvar_g_waypointsprite_distancefadescale = 1;
-var float autocvar_g_waypointsprite_edgefadealpha = 1;
+float autocvar_g_waypointsprite_distancefadealpha;
+float autocvar_g_waypointsprite_distancefadedistancemultiplier;
+float autocvar_g_waypointsprite_distancefadescale;
+float autocvar_g_waypointsprite_edgefadealpha;
 float autocvar_g_waypointsprite_edgefadedistance;
-var float autocvar_g_waypointsprite_edgefadescale = 1;
-var float autocvar_g_waypointsprite_edgeoffset_bottom = 0;
-var float autocvar_g_waypointsprite_edgeoffset_left = 0;
-var float autocvar_g_waypointsprite_edgeoffset_right = 0;
-var float autocvar_g_waypointsprite_edgeoffset_top = 0;
-var float autocvar_g_waypointsprite_fontsize = 12;
+float autocvar_g_waypointsprite_edgefadescale;
+float autocvar_g_waypointsprite_edgeoffset_bottom;
+float autocvar_g_waypointsprite_edgeoffset_left;
+float autocvar_g_waypointsprite_edgeoffset_right;
+float autocvar_g_waypointsprite_edgeoffset_top;
+float autocvar_g_waypointsprite_fontsize;
 float autocvar_g_waypointsprite_minalpha;
 float autocvar_g_waypointsprite_minscale;
 float autocvar_g_waypointsprite_normdistance;
-var float autocvar_g_waypointsprite_scale = 1;
+float autocvar_g_waypointsprite_scale;
 float autocvar_g_waypointsprite_spam;
 float autocvar_g_waypointsprite_timealphaexponent;
-var float autocvar_hud_colorflash_alpha = 0.5;
+float autocvar_hud_colorflash_alpha;
 float autocvar_hud_configure_bg_minalpha;
 float autocvar_hud_configure_checkcollisions;
 float autocvar_hud_configure_grid;
@@ -359,6 +359,7 @@ var float autocvar_scoreboard_highlight_alpha = 0.10;
 var float autocvar_scoreboard_highlight_alpha_self = 0.25;
 float autocvar_scoreboard_offset_left;
 float autocvar_scoreboard_offset_right;
+float autocvar_scoreboard_offset_vertical;
 float autocvar_v_flipped;
 float autocvar_vid_conheight;
 float autocvar_vid_conwidth;

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index be457e480876119eaf22a614cfe8138c8ca374f1..6edf452a86223ffc2b52f913ea4459a71cd51ebc 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1151,11 +1151,11 @@ void HUD_DrawScoreboard()
        entity pl, tm;
        string str;
 
-       xmin = autocvar_scoreboard_offset_left * vid_conwidth;
-       ymin = autocvar_con_notify * autocvar_con_notifysize;
+       xmin = (autocvar_scoreboard_offset_left * vid_conwidth);
+       ymin = max((autocvar_con_notify * autocvar_con_notifysize), (autocvar_scoreboard_offset_vertical * vid_conwidth));
 
-       xmax = (1 - autocvar_scoreboard_offset_right) * vid_conwidth;
-       ymax = vid_conheight - ymin;
+       xmax = ((1 - autocvar_scoreboard_offset_right) * vid_conwidth);
+       ymax = (vid_conheight - ymin);
 
        sbwidth = xmax - xmin;