merged NetConn_SendReliableMessage into NetConn_SendUnreliableMessage, and also merge...

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 4509dedbfb602019dbedc6737377282eae55204f..398828139a25940e94390348620d58b2c3026ff7 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -1480,7 +1480,7 @@ extern void CL_ClientMovement_Replay();
 int CL_ReadFromServer(void)
 {
        CL_ReadDemoMessage();
-       CL_SendCmd();
+       CL_SendMove();
 
        r_refdef.time = cl.time;
        r_refdef.extraupdate = !r_speeds.integer;
@@ -1529,31 +1529,6 @@ int CL_ReadFromServer(void)
        return 0;
 }
 
-/*
-=================
-CL_SendCmd
-=================
-*/
-void CL_UpdatePrydonCursor(void);
-void CL_SendCmd(void)
-{
-       // send the reliable message (forwarded commands) if there is one
-       if (cls.netcon && cls.netcon->message.cursize && NetConn_CanSendMessage(cls.netcon))
-       {
-               if (developer.integer)
-               {
-                       Con_Print("CL_SendCmd: sending reliable message:\n");
-                       SZ_HexDumpToConsole(&cls.netcon->message);
-               }
-               if (NetConn_SendReliableMessage(cls.netcon, &cls.netcon->message) == -1)
-                       Host_Error("CL_WriteToServer: lost server connection");
-               SZ_Clear(&cls.netcon->message);
-       }
-
-       // send a move periodically
-       CL_SendMove();
-}
-
 // LordHavoc: pausedemo command
 static void CL_PauseDemo_f (void)
 {