added -demo and -demolooponly options. -demo starts the wanted demo and then shuts...

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index 96e980df0e305a7ba5aebd066cee939d2017ad16..cdf8209cfa086e15278ac48e504f4c034d3da167 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
-#include "menu.h"
+
+int old_vsync = 0;
 
 void CL_FinishTimeDemo (void);
 
@@ -57,9 +58,6 @@ void CL_NextDemo (void)
                {
                        Con_Print("No demos listed with startdemos\n");
                        cls.demonum = -1;
-                       // put up menu instead of staring at console
-                       if (key_dest != key_menu)
-                               M_ToggleMenu_f();
                        return;
                }
        }
@@ -88,6 +86,10 @@ void CL_StopPlayback (void)
 
        if (cls.timedemo)
                CL_FinishTimeDemo ();
+
+       if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+               Host_Quit_f();
+
 }
 
 /*
@@ -114,7 +116,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);
 }
 
 /*
@@ -289,7 +290,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");
@@ -337,7 +338,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");
@@ -345,8 +346,6 @@ void CL_PlayDemo_f (void)
                return;
        }
 
-       SCR_BeginLoadingPlaque ();
-
        strlcpy(cls.demoname, name, sizeof(cls.demoname));
        cls.demoplayback = true;
        cls.state = ca_connected;
@@ -415,7 +414,6 @@ 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;