cl_main: Keep old CL_Disconnect for simplicity. Move guts to CL_DisconnectEx

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index f8fbe5b5b3ff65862093762106da16ddda50763f..beab8f84ed84354dc28d5f813e3a77ae4b13895b 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -256,9 +256,8 @@ void CL_ReadDemoMessage(void)
                }
                if (cl_message.cursize > cl_message.maxsize)
                {
-                       Con_Printf("Demo message (%i) > cl_message.maxsize (%i)", cl_message.cursize, cl_message.maxsize);
+                       CL_DisconnectEx(false, "Demo message (%i) > cl_message.maxsize (%i)", cl_message.cursize, cl_message.maxsize);
                        cl_message.cursize = 0;
-                       CL_Disconnect();
                        return;
                }
                VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
@@ -401,29 +400,15 @@ void CL_Record_f(cmd_state_t *cmd)
        cls.demo_lastcsprogscrc = -1;
 }
 
-
-/*
-====================
-CL_PlayDemo_f
-
-playdemo [demoname]
-====================
-*/
-void CL_PlayDemo_f(cmd_state_t *cmd)
+void CL_PlayDemo(const char *demo)
 {
-       char    name[MAX_QPATH];
+       char name[MAX_QPATH];
        int c;
        qbool neg = false;
        qfile_t *f;
 
-       if (Cmd_Argc(cmd) != 2)
-       {
-               Con_Print("playdemo <demoname> : plays a demo\n");
-               return;
-       }
-
        // open the demo file
-       strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name));
+       strlcpy (name, demo, sizeof (name));
        FS_DefaultExtension (name, ".dem", sizeof (name));
        f = FS_OpenVirtualFile(name, false);
        if (!f)
@@ -436,10 +421,7 @@ void CL_PlayDemo_f(cmd_state_t *cmd)
        cls.demostarting = true;
 
        // disconnect from server
-       if(cls.state == ca_connected)
-               CL_Disconnect();
-       if(sv.active)
-               SV_Shutdown();
+       CL_Disconnect();
 
        // update networking ports (this is mainly just needed at startup)
        NetConn_UpdateSockets();
@@ -466,6 +448,24 @@ void CL_PlayDemo_f(cmd_state_t *cmd)
        cls.demostarting = false;
 }
 
+/*
+====================
+CL_PlayDemo_f
+
+playdemo [demoname]
+====================
+*/
+void CL_PlayDemo_f(cmd_state_t *cmd)
+{
+       if (Cmd_Argc(cmd) != 2)
+       {
+               Con_Print("playdemo <demoname> : plays a demo\n");
+               return;
+       }
+
+       CL_PlayDemo(Cmd_Argv(cmd, 1));
+}
+
 typedef struct
 {
        int frames;
@@ -605,7 +605,7 @@ void CL_TimeDemo_f(cmd_state_t *cmd)
 
        srand(0); // predictable random sequence for benchmarking
 
-       CL_PlayDemo_f (cmd);
+       CL_PlayDemo(Cmd_Argv(cmd, 1));
 
 // cls.td_starttime will be grabbed at the second frame of the demo, so
 // all the loading time doesn't get counted
@@ -679,8 +679,8 @@ static void CL_Demos_f(cmd_state_t *cmd)
                return;
        if (cls.demonum == -1)
                cls.demonum = 1;
-       CL_Disconnect_f (cmd);
-       CL_NextDemo ();
+       CL_Disconnect();
+       CL_NextDemo();
 }
 
 /*