changed Cmd_AddCommand to only work for console commands, not client commands execute...

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index af7015902170e583dca0688cc877d18f345d35fc..3e7f1c50aadb579c3e624fd8eb1b94b3676a112a 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -46,7 +46,7 @@ Called to play the next demo in the demo loop
 */
 void CL_NextDemo (void)
 {
-       char    str[1024];
+       char    str[MAX_INPUTLINE];
 
        if (cls.demonum == -1)
                return;         // don't play demos
@@ -86,6 +86,10 @@ void CL_StopPlayback (void)
 
        if (cls.timedemo)
                CL_FinishTimeDemo ();
+
+       if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+               Host_Quit_f();
+
 }
 
 /*
@@ -160,11 +164,11 @@ void CL_ReadDemoMessage(void)
                                        cls.td_starttime = realtime;
                                if (host_framecount > cls.td_startframe + 2)
                                {
-                                       cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
-                                       cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+                                       cls.td_minframetime = min(cls.td_minframetime, cl.realframetime);
+                                       cls.td_maxframetime = max(cls.td_maxframetime, cl.realframetime);
                                }
                                else
-                                       cls.td_minframetime = cls.td_maxframetime = host_realframetime;
+                                       cls.td_minframetime = cls.td_maxframetime = cl.realframetime;
                        }
                        else if (cl.time <= cl.mtime[0])
                        {
@@ -181,11 +185,11 @@ void CL_ReadDemoMessage(void)
                VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
                for (i = 0;i < 3;i++)
                {
-                       r = FS_Read(cls.demofile, &f, 4);
+                       r = (int)FS_Read(cls.demofile, &f, 4);
                        cl.mviewangles[0][i] = LittleFloat(f);
                }
 
-               if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
+               if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == net_message.cursize)
                {
                        MSG_BeginReading();
                        CL_ParseServerMessage();
@@ -212,9 +216,6 @@ stop recording a demo
 */
 void CL_Stop_f (void)
 {
-       if (cmd_source != src_command)
-               return;
-
        if (!cls.demorecording)
        {
                Con_Print("Not recording a demo.\n");
@@ -245,9 +246,6 @@ void CL_Record_f (void)
        int c, track;
        char name[MAX_OSPATH];
 
-       if (cmd_source != src_command)
-               return;
-
        c = Cmd_Argc();
        if (c != 2 && c != 3 && c != 4)
        {
@@ -286,7 +284,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");
@@ -309,13 +307,10 @@ play [demoname]
 */
 void CL_PlayDemo_f (void)
 {
-       char    name[256];
+       char    name[MAX_QPATH];
        int c;
        qboolean neg = false;
 
-       if (cmd_source != src_command)
-               return;
-
        if (Cmd_Argc() != 2)
        {
                Con_Print("play <demoname> : plays a demo\n");
@@ -324,17 +319,18 @@ void CL_PlayDemo_f (void)
 
        // disconnect from server
        CL_Disconnect ();
-       Host_ShutdownServer (false);
+       Host_ShutdownServer ();
 
        // update networking ports (this is mainly just needed at startup)
-       NetConn_ClientFrame();
+       NetConn_UpdateSockets();
 
        // open the demo file
        strlcpy (name, Cmd_Argv(1), sizeof (name));
        FS_DefaultExtension (name, ".dem", sizeof (name));
+       cls.protocol = PROTOCOL_QUAKE;
 
        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");
@@ -393,9 +389,6 @@ timedemo [demoname]
 */
 void CL_TimeDemo_f (void)
 {
-       if (cmd_source != src_command)
-               return;
-
        if (Cmd_Argc() != 2)
        {
                Con_Print("timedemo <demoname> : gets demo speeds\n");
@@ -414,6 +407,6 @@ void CL_TimeDemo_f (void)
 
        cls.timedemo = true;
        // get first message this frame
-       cls.td_lastframe = -1;  
+       cls.td_lastframe = -1;
 }