simplify: just turn off rtlights on MATERIALFLAG_FULLBRIGHT, which is forced by custo...

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index d5ca01e61e40651d7d15c3b17e446756cba8c5d7..26ddc00a12f7bbf9277196a0a66649da1e4aae95 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -966,6 +966,10 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable(&vid_touchscreen_outlinealpha);
        Cvar_RegisterVariable(&vid_touchscreen_overlayalpha);
 
+       // if we want no console, turn it off here too
+       if (COM_CheckParm ("-noconsole"))
+               Cvar_SetQuick(&scr_conforcewhiledisconnected, "0");
+
        Cmd_AddCommand ("sizeup",SCR_SizeUp_f, "increase view size (increases viewsize cvar)");
        Cmd_AddCommand ("sizedown",SCR_SizeDown_f, "decrease view size (decreases viewsize cvar)");
        Cmd_AddCommand ("screenshot",SCR_ScreenShot_f, "takes a screenshot of the next rendered frame");
@@ -1608,17 +1612,16 @@ static void SCR_DrawTouchscreenOverlay(void)
        }
 }
 
-extern void R_UpdateFogColor(void);
+extern void R_UpdateFog(void);
 void R_ClearScreen(qboolean fogcolor)
 {
        float clearcolor[4];
        // clear to black
        Vector4Clear(clearcolor);
-       if (fogcolor)
+       if (fogcolor && r_fog_clear.integer)
        {
-               R_UpdateFogColor();
-               if (r_fog_clear.integer)
-                       VectorCopy(r_refdef.fogcolor, clearcolor);
+               R_UpdateFog();
+               VectorCopy(r_refdef.fogcolor, clearcolor);
        }
        // clear depth is 1.0
        // LordHavoc: we use a stencil centered around 128 instead of 0,