fix grid by renaming cvar...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 950a8e116014dd3d15d42f8eec86694f7bfa999f..5c2800aa85855dd3eb76cf1017f005b09290d885 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1320,8 +1320,8 @@ set _hud_configure 0 "1 = configure the HUD"
 seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode"
 seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
-seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth"
-seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight"
+seta hud_configure_grid_xsize 0.01 "snap to X * vid_conwidth"
+seta hud_configure_grid_ysize 0.01 "snap to Y * vid_conheight"
 seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index e3c1b29ce1f68ebe90230b1fdfc0ca6691c51125..11aad21fb7d6151a4c7757b84fc74502b76e29e0 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -12,8 +12,8 @@ var float autocvar__hud_configure;
 var float autocvar_hud_configure_checkcollisions;
 var float autocvar_hud_configure_bg_minalpha;
 var float autocvar_hud_configure_grid;
-var float autocvar_hud_configure_grid_x;
-var float autocvar_hud_configure_grid_y;
+var float autocvar_hud_configure_grid_xsize;
+var float autocvar_hud_configure_grid_ysize;
 var float autocvar_hud_configure_grid_alpha;
 
 var string autocvar_hud_skin;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index ba771f56846546bb757fa246d25592c33a8ce8bd..fc1f2f7c9b30f96960b1059201c460ab34dab54e 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -706,8 +706,8 @@ void HUD_Panel_SetPos(vector pos)
 
        if(autocvar_hud_configure_grid)
        {
-               pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_x, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
-               pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_y, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
+               pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
        }
 
        if(hud_configure_checkcollisions)
@@ -890,8 +890,8 @@ void HUD_Panel_SetPosSize(vector mySize)
        // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
        if(autocvar_hud_configure_grid)
        {
-               mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_x, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
-               mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_y, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
+               mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
        }
 
        if(hud_configure_checkcollisions)
@@ -949,16 +949,16 @@ void HUD_Panel_Arrow_Action(float nPrimary)
                if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW)
                {
                        if (hudShiftState & S_SHIFT)
-                               step = bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
+                               step = bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
                        else
-                               step = 2 * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
+                               step = 2 * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
                }
                else
                {
                        if (hudShiftState & S_SHIFT)
-                               step = bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
+                               step = bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
                        else
-                               step = 2 * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
+                               step = 2 * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
                }
        }
        else
@@ -4419,16 +4419,17 @@ void HUD_Main (void)
        {
                float i;
                // x-axis
-               for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_x, 0.2); ++i)
+               for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2); ++i)
                {
-                       drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_x, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
+                       drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
                }
                // y-axis
-               for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_y, 0.2); ++i)
+               for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2); ++i)
                {
-                       drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_y, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
+                       drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
                }
        }
+       print("grid_xsize: ", ftos(autocvar_hud_configure_grid_xsize), "\n");
 
        float f;
        vector color;