fixed a crash if decals are stuck to submodels when cl_entities expands

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index 01310b58805b2d1ce4e8d6427b4f1becf96fc35c..e9236ce823bc63a974319013059b2f2b4cf9bc9d 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -112,7 +112,6 @@ void CL_WriteDemoMessage (void)
                FS_Write (cls.demofile, &f, 4);
        }
        FS_Write (cls.demofile, net_message.data, net_message.cursize);
-       FS_Flush (cls.demofile);
 }
 
 /*
@@ -287,7 +286,7 @@ void CL_Record_f (void)
 
        // open the demo file
        Con_Printf("recording to %s.\n", name);
-       cls.demofile = FS_Open (name, "wb", false);
+       cls.demofile = FS_Open (name, "wb", false, false);
        if (!cls.demofile)
        {
                Con_Print("ERROR: couldn't open.\n");
@@ -335,7 +334,7 @@ void CL_PlayDemo_f (void)
        FS_DefaultExtension (name, ".dem", sizeof (name));
 
        Con_Printf("Playing demo from %s.\n", name);
-       cls.demofile = FS_Open (name, "rb", false);
+       cls.demofile = FS_Open (name, "rb", false, false);
        if (!cls.demofile)
        {
                Con_Print("ERROR: couldn't open.\n");
@@ -343,8 +342,6 @@ void CL_PlayDemo_f (void)
                return;
        }
 
-       SCR_BeginLoadingPlaque ();
-
        strlcpy(cls.demoname, name, sizeof(cls.demoname));
        cls.demoplayback = true;
        cls.state = ca_connected;
@@ -383,11 +380,6 @@ void CL_FinishTimeDemo (void)
        // LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
        Con_Printf("%i frames %5.7f seconds %5.7f fps\nmin/avg/max: %5.7f/%5.7f/%5.7f\n", frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
        Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps min/avg/max: %5.7f/%5.7f/%5.7f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
-       if (gl_videosyncavailable)
-       {
-               Cvar_SetValueQuick (&vid_vsync, old_vsync);
-               qwglSwapIntervalEXT (old_vsync);
-       }
        if (COM_CheckParm("-benchmark"))
                Host_Quit_f();
 }
@@ -410,13 +402,6 @@ void CL_TimeDemo_f (void)
                return;
        }
 
-       if (gl_videosyncavailable)
-       {
-               old_vsync = vid_vsync.integer;
-               Cvar_SetValueQuick (&vid_vsync, 0);
-               qwglSwapIntervalEXT (0);
-       }
-
        CL_PlayDemo_f ();
 
 // cls.td_starttime will be grabbed at the second frame of the demo, so
@@ -425,11 +410,10 @@ void CL_TimeDemo_f (void)
        // instantly hide console and deactivate it
        key_dest = key_game;
        key_consoleactive = 0;
-       scr_conlines = 0;
        scr_con_current = 0;
 
        cls.timedemo = true;
        // get first message this frame
-       cls.td_lastframe = -1;  
+       cls.td_lastframe = -1;
 }