fix warning

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8047 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/vid_shared.c b/vid_shared.c
index bf73db173318a0cae361838ed52293be46f94e22..33c194b0c98a84a6c72b67bc3c07cc1b041222d4 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -918,27 +918,28 @@ void VID_UpdateGamma(qboolean force, int rampsize)
        // set vid_gammatables_trivial to true if the current settings would generate the identity gamma table
        vid_gammatables_trivial = false;
        if(v_psycho.integer == 0)
-       if(v_color_enable.integer)
+       if(v_contrastboost.value == 1)
        {
-               if(v_contrastboost.value == 1)
-               if(v_color_black_r.value == 0)
-               if(v_color_black_g.value == 0)
-               if(v_color_black_b.value == 0)
-               if(fabs(v_color_grey_r.value - 0.5) < 1e-6)
-               if(fabs(v_color_grey_g.value - 0.5) < 1e-6)
-               if(fabs(v_color_grey_b.value - 0.5) < 1e-6)
-               if(v_color_white_r.value == 1)
-               if(v_color_white_g.value == 1)
-               if(v_color_white_b.value == 1)
-                       vid_gammatables_trivial = true;
-       }
-       else
-       {
-               if(v_contrastboost.value == 1)
-               if(v_gamma.value == 1)
-               if(v_contrast.value == 1)
-               if(v_brightness.value == 0)
-                       vid_gammatables_trivial = true;
+               if(v_color_enable.integer)
+               {
+                       if(v_color_black_r.value == 0)
+                       if(v_color_black_g.value == 0)
+                       if(v_color_black_b.value == 0)
+                       if(fabs(v_color_grey_r.value - 0.5) < 1e-6)
+                       if(fabs(v_color_grey_g.value - 0.5) < 1e-6)
+                       if(fabs(v_color_grey_b.value - 0.5) < 1e-6)
+                       if(v_color_white_r.value == 1)
+                       if(v_color_white_g.value == 1)
+                       if(v_color_white_b.value == 1)
+                               vid_gammatables_trivial = true;
+               }
+               else
+               {
+                       if(v_gamma.value == 1)
+                       if(v_contrast.value == 1)
+                       if(v_brightness.value == 0)
+                               vid_gammatables_trivial = true;
+               }
        }
 
 #define GAMMACHECK(cache, value) if (cache != (value)) gamma_changed = true;cache = (value)