From 70ab01cb49a98d9949fe6328db8f184e22f706df Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 3 Oct 2004 11:05:31 +0000
Subject: [PATCH] vid_hardware gamma should be more consistant now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@295 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/view.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/engine/client/view.c b/engine/client/view.c
index 46587d5d..54c78a50 100644
--- a/engine/client/view.c
+++ b/engine/client/view.c
@@ -627,6 +627,7 @@ V_UpdatePalette
 */
 void GLV_UpdatePalette (void)
 {
+	qboolean ogw;
 	int		i, j;
 	qboolean	new;
 //	qbyte	*basepal, *newpal;
@@ -636,9 +637,19 @@ void GLV_UpdatePalette (void)
 	qboolean force;
 
 	V_CalcPowerupCshift ();
-	
+
+// drop the damage value
+	cl.cshifts[CSHIFT_DAMAGE].percent -= host_frametime*150;
+	if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
+		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
+
+// drop the bonus value
+	cl.cshifts[CSHIFT_BONUS].percent -= host_frametime*100;
+	if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
+		cl.cshifts[CSHIFT_BONUS].percent = 0;
+
 	new = false;
-	
+
 	for (i=0 ; i<NUM_CSHIFTS ; i++)
 	{
 		if (cl.cshifts[i].percent != cl.prev_cshifts[i].percent)
@@ -654,16 +665,6 @@ void GLV_UpdatePalette (void)
 			}
 	}
 
-// drop the damage value
-	cl.cshifts[CSHIFT_DAMAGE].percent -= host_frametime*150;
-	if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
-		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
-
-// drop the bonus value
-	cl.cshifts[CSHIFT_BONUS].percent -= host_frametime*100;
-	if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
-		cl.cshifts[CSHIFT_BONUS].percent = 0;
-
 	force = V_CheckGamma ();
 	if (!new && !force)
 		return;
@@ -695,10 +696,11 @@ void GLV_UpdatePalette (void)
 		ramps[2][i] = gammatable[ib]<<8;
 	}
 
-	VID_ShiftPalette (NULL);	
-	if (gammaworks)
+	ogw = gammaworks;
+	VID_ShiftPalette (NULL);
+	if (ogw != gammaworks)
 	{
-		BuildGammaTable(1,1);
+		Con_DPrintf("Gamma working state %i\n", gammaworks);
 	}
 }
 #endif