added libpng.so fallback name, primarily for FreeBSD

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index 865a1b36a5d3152cafdbd76c08ac5bd5043f8002..627ccd12d68eaf4fbcd59355865512310a121f56 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
@@ -164,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])
                        {
@@ -189,7 +189,7 @@ void CL_ReadDemoMessage(void)
                        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();
@@ -313,7 +313,7 @@ play [demoname]
 */
 void CL_PlayDemo_f (void)
 {
-       char    name[256];
+       char    name[MAX_QPATH];
        int c;
        qboolean neg = false;
 
@@ -328,14 +328,15 @@ 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, false);