merged NetConn_SendReliableMessage into NetConn_SendUnreliableMessage, and also merge...

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 78f2589a28bffd161801a2486463e87e9cfab1ac..5259676bcde90e351f944bdff5f7ef486224acb2 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -179,7 +179,7 @@ void CL_KeepaliveMessage (void)
        sizebuf_t old;
 
        // no need if server is local and definitely not if this is a demo
-       if (sv.active || cls.demoplayback)
+       if (sv.active || !cls.netcon)
                return;
 
 // read messages from server, should just be nops
@@ -1365,7 +1365,6 @@ void CL_ParseServerMessage(void)
        unsigned char           cmdlog[32];
        char            *cmdlogname[32], *temp;
        int                     cmdindex, cmdcount = 0;
-       qboolean        sendmove = false;
 
        if (cls.demorecording)
                CL_WriteDemoMessage ();
@@ -1466,7 +1465,7 @@ void CL_ParseServerMessage(void)
                case svc_time:
                        cl.mtime[1] = cl.mtime[0];
                        cl.mtime[0] = MSG_ReadFloat ();
-                       sendmove = true;
+                       cl.movement_needupdate = true;
                        break;
 
                case svc_clientdata:
@@ -1792,12 +1791,6 @@ void CL_ParseServerMessage(void)
 
        EntityFrameQuake_ISeeDeadEntities();
 
-       if (sendmove)
-       {
-               // send one move per server frame
-               CL_SendMove();
-       }
-
        parsingerror = false;
 }