minor cleaning

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

diff --git a/cl_screen.c b/cl_screen.c
index e09b8d43991d1de02277e431c1c9cd05109fd215..e6629cebf444ae6d1b8cb02c56658033f6398d38 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -1572,9 +1572,6 @@ void SCR_DrawScreen (void)
 
        // draw 2D stuff
 
-       //FIXME: force menu if nothing else to look at?
-       //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected)
-
        if (cls.signon == SIGNONS)
        {
                SCR_DrawNet ();

diff --git a/gl_backend.h b/gl_backend.h
index 014884ed57b7deeeb3a83537ac89efa4a70351ab..247924892d070fb96edeb9719ca0fb58fcd3c5e5 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -103,8 +103,6 @@ void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, co
 qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect);
 // used by R_Envmap_f and internally in backend, clears the frame
 void R_ClearScreen(void);
-// invoke refresh of frame
-void SCR_UpdateScreen(void);
 // invoke refresh of loading plaque (nothing else seen)
 void SCR_UpdateLoadingScreen(qboolean clear);
 

diff --git a/gl_rmain.c b/gl_rmain.c
index bcccfd44bf483be9956fe538711fd94693bc18c6..c4ecf91fdfddea06f7833461bdc436fb043394d6 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2010,7 +2010,7 @@ void R_UpdateVariables(void)
 
        r_refdef.rtworld = r_shadow_realtime_world.integer;
        r_refdef.rtworldshadows = r_shadow_realtime_world_shadows.integer && gl_stencil;
-       r_refdef.rtdlight = (r_shadow_realtime_world.integer || r_shadow_realtime_dlight.integer) && !gl_flashblend.integer;
+       r_refdef.rtdlight = (r_shadow_realtime_world.integer || r_shadow_realtime_dlight.integer) && !gl_flashblend.integer && r_dynamic.integer;
        r_refdef.rtdlightshadows = r_refdef.rtdlight && (r_refdef.rtworld ? r_shadow_realtime_world_dlightshadows.integer : r_shadow_realtime_dlight_shadows.integer) && gl_stencil;
        r_refdef.lightmapintensity = r_refdef.rtworld ? r_shadow_realtime_world_lightmaps.value : 1;
        if (r_showsurfaces.integer)