From 741cceabef1f09c2cd5dd30359297ead542ff5c1 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 27 Oct 2010 00:25:47 +0200 Subject: [PATCH] Un-autocvarize hud_configure_checkcollisions as the cvar should be fetched only when moving a panel Comment collisions debug code out --- qcsrc/client/autocvars.qh | 1 - qcsrc/client/hud.qc | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index a98b70683..e517b0cde 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -16,7 +16,6 @@ var float autocvar__menu_alpha; var float autocvar__hud_configure; var float autocvar_hud_configure_teamcolorforced; -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_xsize; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 397941f0e..86242af6c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -664,8 +664,8 @@ vector HUD_Panel_CheckMove(vector myPos, vector mySize) else // push it downwards myTarget_y = panel_pos_y + panel_size_y; } - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); } return myTarget; @@ -677,8 +677,8 @@ void HUD_Panel_SetPos(vector pos) vector mySize; mySize = panel_size; - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); if(autocvar_hud_configure_grid) { @@ -806,8 +806,8 @@ vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) { else mySize_y = min(mySize_y, dist_y); } - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL); } return mySize; @@ -860,8 +860,8 @@ void HUD_Panel_SetPosSize(vector mySize) if(myPos_y + mySize_y > vid_conheight) mySize_y = vid_conheight - myPos_y; - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL); // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken if(autocvar_hud_configure_grid) @@ -892,8 +892,8 @@ void HUD_Panel_SetPosSize(vector mySize) myPos_y = resizeorigin_y; } - if(cvar("hud_configure_checkcollisions_debug")) - drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL); + //if(cvar("hud_configure_checkcollisions_debug")) + //drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL); HUD_Panel_GetName(highlightedPanel); string s; @@ -1367,7 +1367,7 @@ void HUD_Panel_Mouse() if (prev_pos != panel_pos || prev_size != panel_size) { - hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && autocvar_hud_configure_checkcollisions); + hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions")); // backup! panel_pos_backup = prev_pos; panel_size_backup = prev_size; -- 2.39.2