fix typo

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index c52e4ae264fd007d661170c837bbc07e806e02b0..b3ac4e92c97c04381246c67d7a7d8620aed434b9 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();
+
 }
 
 /*
@@ -112,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);
 }
 
 /*
@@ -182,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();
@@ -287,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");
@@ -310,7 +313,7 @@ play [demoname]
 */
 void CL_PlayDemo_f (void)
 {
-       char    name[256];
+       char    name[MAX_QPATH];
        int c;
        qboolean neg = false;
 
@@ -325,17 +328,17 @@ 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));
 
        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");
@@ -415,6 +418,6 @@ void CL_TimeDemo_f (void)
 
        cls.timedemo = true;
        // get first message this frame
-       cls.td_lastframe = -1;  
+       cls.td_lastframe = -1;
 }