made reconnect command reconnect to the last server you were on, even if it was an...

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 2da15b322b93597437df166f6babc8661d55826b..e528ddddf212fe369cd110a01c9e36b9e713b13f 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -826,11 +826,9 @@ static void SCR_CaptureVideo_RIFF_OverflowCheck(int framesize)
        cursize = SCR_CaptureVideo_RIFF_GetPosition() - cls.capturevideo.riffstackstartoffset[0];
        // if this would overflow the windows limit of 1GB per RIFF chunk, we need
        // to close the current RIFF chunk and open another for future frames
-       if (8 + cursize + framesize > 1<<30)
+       if (8 + cursize + framesize + cls.capturevideo.riffindexbuffer.cursize + 8 > 1<<30)
        {
                SCR_CaptureVideo_RIFF_Finish();
-               while (cls.capturevideo.riffstacklevel > 0)
-                       SCR_CaptureVideo_RIFF_Pop();
                // begin a new 1GB extended section of the AVI
                SCR_CaptureVideo_RIFF_Push("RIFF", "AVIX");
                SCR_CaptureVideo_RIFF_Push("LIST", "movi");
@@ -1537,8 +1535,6 @@ void SCR_DrawScreen (void)
 
                if(!CL_VM_UpdateView())
                        R_RenderView();
-               else
-                       SCR_DrawConsole();
 
                if (scr_zoomwindow.integer)
                {
@@ -1574,9 +1570,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 ();
@@ -1591,8 +1584,7 @@ void SCR_DrawScreen (void)
        CL_DrawVideo();
        R_Shadow_EditLights_DrawSelectedLightProperties();
 
-       if(!csqc_loaded)
-               SCR_DrawConsole();
+       SCR_DrawConsole();
 
        SCR_DrawBrand();