From 18de9855aecb88e72f6d8844c19de49561628a93 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Sun, 7 May 2006 07:25:18 +0000
Subject: [PATCH] build fixes, miscalc on bar thing

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2249 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/cl_screen.c | 10 +++++-----
 engine/client/view.c      |  4 ++++
 engine/gl/gl_rmisc.c      |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/engine/client/cl_screen.c b/engine/client/cl_screen.c
index 6d78a6b81..679c510c1 100644
--- a/engine/client/cl_screen.c
+++ b/engine/client/cl_screen.c
@@ -1368,27 +1368,27 @@ void SCR_DrawLoading (void)
 			x = (vid.width - pic->width)/2;
 			y = (vid.height - 48 - pic->height)/2;
 			Draw_Pic (x, y, pic);
-			x = (vid.width/2) - 80;
+			x = (vid.width/2) - 96;
 			y += pic->height + 8;
 		}
 		else
 		{
-			x = (vid.width/2) - 80;
+			x = (vid.width/2) - 96;
 			y = (vid.height/2) - 8;
 		}
 
 		if (loading_stage)
 		{
-			sizex = current_loading_size * 160 / total_loading_size;
+			sizex = current_loading_size * 192 / total_loading_size;
 			if (loading_stage == 1)
 			{
 				Draw_FillRGB(x, y, sizex, 16, 1.0, 0.0, 0.0);
-				Draw_FillRGB(x+sizex, y, 160-sizex, 16, 0.0, 0.0, 0.0);
+				Draw_FillRGB(x+sizex, y, 192-sizex, 16, 0.0, 0.0, 0.0);
 			}
 			else
 			{
 				Draw_FillRGB(x, y, sizex, 16, 1.0, 1.0, 0.0);
-				Draw_FillRGB(x+sizex, y, 160-sizex, 16, 1.0, 0.0, 0.0);
+				Draw_FillRGB(x+sizex, y, 192-sizex, 16, 1.0, 0.0, 0.0);
 			}
 
 			Draw_String(x+8, y+4, va("Loading %s... %i%%", 
diff --git a/engine/client/view.c b/engine/client/view.c
index 4a28c5961..d6a356436 100644
--- a/engine/client/view.c
+++ b/engine/client/view.c
@@ -365,19 +365,23 @@ void BuildGammaTable (float g, float c)
 V_CheckGamma
 =================
 */
+#ifdef SWQUAKE
 void SWV_Gamma_Callback(struct cvar_s *var, char *oldvalue)
 {
 	BuildGammaTable (v_gamma.value, v_contrast.value);
 	vid.recalc_refdef = 1; // force a surface cache flush
 	SWV_UpdatePalette (true);
 }
+#endif
 
+#ifdef RGLQUAKE
 void GLV_Gamma_Callback(struct cvar_s *var, char *oldvalue)
 {
 	BuildGammaTable (v_gamma.value, v_contrast.value);
 	vid.recalc_refdef = 1; // force a surface cache flush
 	GLV_UpdatePalette (true);
 }
+#endif
 
 qboolean V_CheckGamma (void)
 {
diff --git a/engine/gl/gl_rmisc.c b/engine/gl/gl_rmisc.c
index 514c4456e..b4b296bbe 100644
--- a/engine/gl/gl_rmisc.c
+++ b/engine/gl/gl_rmisc.c
@@ -654,7 +654,7 @@ if (!data)
 */
 void GLR_TimeRefresh_f (void);
 
-extern cvar_t gl_bump, v_contrast;
+extern cvar_t gl_bump, v_contrast, r_drawflat;
 extern cvar_t r_stains, r_stainfadetime, r_stainfadeammount;
 
 // callback defines