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 a962785fbf79e8f8fe178b562fce1b70c0c143b5..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]);
@@ -422,10 +421,7 @@ void CL_PlayDemo(const char *demo)
        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();
@@ -683,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();
 }
 
 /*