From: terencehill <piuntn@gmail.com>
Date: Sun, 12 May 2013 17:55:17 +0000 (+0200)
Subject: Move most of the hud config code from hud.qc to hud_config.qc
X-Git-Tag: xonotic-v0.8.0~226^2~1^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5fb482d688ac2211f227cc95d131512134378abe;p=xonotic%2Fxonotic-data.pk3dir.git

Move most of the hud config code from hud.qc to hud_config.qc
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 469fe67fa..06cc36ead 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4418,16 +4418,10 @@ void HUD_Main (void)
 	if(scoreboard_fade_alpha)
 		hud_fade_alpha = (1 - scoreboard_fade_alpha);
 
-	if(autocvar__hud_configure)
-		if(isdemo())
-			HUD_Configure_Exit_Force();
+	HUD_Configure_Frame();
 
 	if(intermission == 2) // no hud during mapvote
-	{
-		if (autocvar__hud_configure)
-			HUD_Configure_Exit_Force();
 		hud_fade_alpha = 0;
-	}
 	else if(autocvar__menu_alpha == 0 && scoreboard_fade_alpha == 0)
 		hud_fade_alpha = 1;
 
@@ -4453,24 +4447,6 @@ void HUD_Main (void)
 		hud_skin_prev = strzone(autocvar_hud_skin);
 	}
 
-	// HUD configure visible grid
-	if(autocvar__hud_configure && autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha)
-	{
-		hud_configure_gridSize_x = bound(0.005, cvar("hud_configure_grid_xsize"), 0.2);
-		hud_configure_gridSize_y = bound(0.005, cvar("hud_configure_grid_ysize"), 0.2);
-		hud_configure_realGridSize_x = hud_configure_gridSize_x * vid_conwidth;
-		hud_configure_realGridSize_y = hud_configure_gridSize_y * vid_conheight;
-		vector s;
-		// x-axis
-		s = eX + eY * vid_conheight;
-		for(i = 1; i < 1/hud_configure_gridSize_x; ++i)
-			drawfill(eX * i * hud_configure_realGridSize_x, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
-		// y-axis
-		s = eY + eX * vid_conwidth;
-		for(i = 1; i < 1/hud_configure_gridSize_y; ++i)
-			drawfill(eY * i * hud_configure_realGridSize_y, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
-	}
-
 #ifdef COMPAT_XON050_ENGINE
     current_player = (spectatee_status > 0) ? spectatee_status : player_localentnum;
 #else
@@ -4585,20 +4561,7 @@ void HUD_Main (void)
 			HUD_Panel_UpdatePosSize()
 			HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha));
 		}
-		if(!hud_configure_prev || hud_configure_prev == -1)
-		{
-			if(autocvar_hud_cursormode) { setcursormode(1); }
-			hudShiftState = 0;
-			for(i = HUD_PANEL_NUM - 1; i >= 0; --i)
-				hud_panel[panel_order[i]].update_time = time;
-		}
 	}
-	else if (hud_configure_prev && autocvar_hud_cursormode)
-		setcursormode(0);
 
 	hud_configure_prev = autocvar__hud_configure;
-
-	if (!autocvar__hud_configure) // hud config mode disabled, enable normal theAlpha stuff again
-		if (menu_enabled)
-			menu_enabled = 0;
 }
diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index ca8ec19c1..388e6d437 100644
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -1197,6 +1197,55 @@ void HUD_Panel_Mouse()
 
 	prevMouseClicked = mouseClicked;
 }
+void HUD_Configure_DrawGrid()
+{
+	float i;
+	if(autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha)
+	{
+		hud_configure_gridSize_x = bound(0.005, cvar("hud_configure_grid_xsize"), 0.2);
+		hud_configure_gridSize_y = bound(0.005, cvar("hud_configure_grid_ysize"), 0.2);
+		hud_configure_realGridSize_x = hud_configure_gridSize_x * vid_conwidth;
+		hud_configure_realGridSize_y = hud_configure_gridSize_y * vid_conheight;
+		vector s;
+		// x-axis
+		s = eX + eY * vid_conheight;
+		for(i = 1; i < 1/hud_configure_gridSize_x; ++i)
+			drawfill(eX * i * hud_configure_realGridSize_x, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
+		// y-axis
+		s = eY + eX * vid_conwidth;
+		for(i = 1; i < 1/hud_configure_gridSize_y; ++i)
+			drawfill(eY * i * hud_configure_realGridSize_y, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
+	}
+}
+
+void HUD_Configure_Frame()
+{
+	float i;
+	if(autocvar__hud_configure)
+	{
+		if(isdemo() || intermission == 2)
+		{
+			HUD_Configure_Exit_Force();
+			return;
+		}
+		if(!hud_configure_prev || hud_configure_prev == -1)
+		{
+			if(autocvar_hud_cursormode)
+				setcursormode(1);
+			hudShiftState = 0;
+			for(i = HUD_PANEL_NUM - 1; i >= 0; --i)
+				hud_panel[panel_order[i]].update_time = time;
+		}
+		HUD_Configure_DrawGrid();
+	}
+	else if(hud_configure_prev)
+	{
+		if(menu_enabled)
+			menu_enabled = 0;
+		if(autocvar_hud_cursormode)
+			setcursormode(0);
+	}
+}
 
 const float hlBorderSize = 4;
 const string hlBorder = "gfx/hud/default/border_highlighted";