Fix loading of external Q1BSP textures. Does not fix skybox. Causes console spam

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index da199ed4950d63f05323bd26023d5729c9178158..56c301b38a6c3a4f4f184f6751ea9466b5608c05 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -389,7 +389,7 @@ void CL_Record_f(cmd_state_t *cmd)
        cls.demofile = FS_OpenRealFile(name, "wb", false);
        if (!cls.demofile)
        {
-               Con_Error("ERROR: couldn't open.\n");
+               Con_Print(CON_ERROR "ERROR: couldn't open.\n");
                return;
        }
        strlcpy(cls.demoname, name, sizeof(cls.demoname));
@@ -429,7 +429,7 @@ void CL_PlayDemo_f(cmd_state_t *cmd)
        f = FS_OpenVirtualFile(name, false);
        if (!f)
        {
-               Con_Errorf("ERROR: couldn't open %s.\n", name);
+               Con_Printf(CON_ERROR "ERROR: couldn't open %s.\n", name);
                cls.demonum = -1;               // stop demo loop
                return;
        }
@@ -438,7 +438,7 @@ void CL_PlayDemo_f(cmd_state_t *cmd)
 
        // disconnect from server
        CL_Disconnect ();
-       Host_ShutdownServer ();
+       SV_Shutdown ();
 
        // update networking ports (this is mainly just needed at startup)
        NetConn_UpdateSockets();
@@ -619,3 +619,106 @@ void CL_TimeDemo_f(cmd_state_t *cmd)
        cls.demonum = -1;               // stop demo loop
 }
 
+/*
+===============================================================================
+
+DEMO LOOP CONTROL
+
+===============================================================================
+*/
+
+
+/*
+==================
+CL_Startdemos_f
+==================
+*/
+static void CL_Startdemos_f(cmd_state_t *cmd)
+{
+       int             i, c;
+
+       if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-capturedemo"))
+               return;
+
+       c = Cmd_Argc(cmd) - 1;
+       if (c > MAX_DEMOS)
+       {
+               Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS);
+               c = MAX_DEMOS;
+       }
+       Con_DPrintf("%i demo(s) in loop\n", c);
+
+       for (i=1 ; i<c+1 ; i++)
+               strlcpy (cls.demos[i-1], Cmd_Argv(cmd, i), sizeof (cls.demos[i-1]));
+
+       // LadyHavoc: clear the remaining slots
+       for (;i <= MAX_DEMOS;i++)
+               cls.demos[i-1][0] = 0;
+
+       if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
+       {
+               cls.demonum = 0;
+               CL_NextDemo ();
+       }
+       else
+               cls.demonum = -1;
+}
+
+
+/*
+==================
+CL_Demos_f
+
+Return to looping demos
+==================
+*/
+static void CL_Demos_f(cmd_state_t *cmd)
+{
+       if (cls.state == ca_dedicated)
+               return;
+       if (cls.demonum == -1)
+               cls.demonum = 1;
+       CL_Disconnect_f (cmd);
+       CL_NextDemo ();
+}
+
+/*
+==================
+CL_Stopdemo_f
+
+Return to looping demos
+==================
+*/
+static void CL_Stopdemo_f(cmd_state_t *cmd)
+{
+       if (!cls.demoplayback)
+               return;
+       CL_Disconnect ();
+       SV_Shutdown ();
+}
+
+// LadyHavoc: pausedemo command
+static void CL_PauseDemo_f(cmd_state_t *cmd)
+{
+       cls.demopaused = !cls.demopaused;
+       if (cls.demopaused)
+               Con_Print("Demo paused\n");
+       else
+               Con_Print("Demo unpaused\n");
+}
+
+void CL_Demo_Init(void)
+{
+       Cmd_AddCommand(CMD_CLIENT, "record", CL_Record_f, "record a demo");
+       Cmd_AddCommand(CMD_CLIENT, "stop", CL_Stop_f, "stop recording or playing a demo");
+       Cmd_AddCommand(CMD_CLIENT, "playdemo", CL_PlayDemo_f, "watch a demo file");
+       Cmd_AddCommand(CMD_CLIENT, "timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log");
+       Cmd_AddCommand(CMD_CLIENT, "startdemos", CL_Startdemos_f, "start playing back the selected demos sequentially (used at end of startup script)");
+       Cmd_AddCommand(CMD_CLIENT, "demos", CL_Demos_f, "restart looping demos defined by the last startdemos command");
+       Cmd_AddCommand(CMD_CLIENT, "stopdemo", CL_Stopdemo_f, "stop playing or recording demo (like stop command) and return to looping demos");
+       // LadyHavoc: added pausedemo
+       Cmd_AddCommand(CMD_CLIENT, "pausedemo", CL_PauseDemo_f, "pause demo playback (can also safely pause demo recording if using QUAKE, QUAKEDP or NEHAHRAMOVIE protocol, useful for making movies)");
+       Cvar_RegisterVariable (&cl_autodemo);
+       Cvar_RegisterVariable (&cl_autodemo_nameformat);
+       Cvar_RegisterVariable (&cl_autodemo_delete);
+}