fix crash in nq connect (oops)

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index 606d79aa20d8e55a36ae3ce9e65f1f1bf50edb64..e152d4242b9814a9df30b6f6c136b8bcbb258827 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -604,12 +604,17 @@ SV_ReadClientMove
 */
 qboolean SV_ReadClientMove (void)
 {
+       qboolean kickplayer = false;
        int i;
        double oldmovetime;
        usercmd_t *move = &host_client->cmd;
 
        oldmovetime = move->time;
 
+       // if this move has been applied, clear it, and start accumulating new data
+       if (move->applied)
+               memset(move, 0, sizeof(*move));
+
        if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 
        // read ping time
@@ -681,7 +686,7 @@ qboolean SV_ReadClientMove (void)
 
        if (!host_client->spawned)
                memset(move, 0, sizeof(*move));
-       else if (move->time > sv.time + 0.01) // add a little fuzz factor due to float precision issues
+       else if (move->time > (float)sv.time + 0.001f) // add a little fuzz factor due to float precision issues
        {
                Con_DPrintf("client move->time %f > sv.time %f, kicking\n", move->time, sv.time);
                // if the client is lying about time, we have definitively detected a
@@ -690,7 +695,7 @@ qboolean SV_ReadClientMove (void)
                // this fixes the timestamp to prevent a speed cheat from working
                move->time = sv.time;
                // but we kick the player for good measure
-               return true;
+               kickplayer = true;
        }
        else
        {
@@ -698,21 +703,20 @@ qboolean SV_ReadClientMove (void)
                host_client->movesequence = move->sequence;
                if (host_client->movesequence)
                {
-                       double frametime = move->time - oldmovetime;
+                       double frametime = bound(0, move->time - oldmovetime, 0.1);
                        double oldframetime = prog->globals.server->frametime;
-                       if (frametime > 0.1)
-                               frametime = 0.1;
+                       //if (move->time - oldmovetime >= 0.1001)
+                       //      Con_DPrintf("client move exceeds 100ms!  (time %f -> time %f)\n", oldmovetime, move->time);
                        prog->globals.server->frametime = frametime;
                        SV_Physics_ClientEntity(host_client->edict);
                        prog->globals.server->frametime = oldframetime;
                }
        }
-       return false;
+       return kickplayer;
 }
 
 void SV_ApplyClientMove (void)
 {
-       double movetime;
 #ifdef NUM_PING_TIMES
        int i;
        float total;
@@ -720,9 +724,11 @@ void SV_ApplyClientMove (void)
        prvm_eval_t *val;
        usercmd_t *move = &host_client->cmd;
 
-       if (!move->receivetime)
+       if (!move->receivetime || move->applied)
                return;
 
+       move->applied = true;
+
        // calculate average ping time
        host_client->ping = move->receivetime - move->time;
 #ifdef NUM_PING_TIMES
@@ -762,11 +768,6 @@ void SV_ApplyClientMove (void)
        if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector);
        if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_cursor_trace_ent))) val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber));
        if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ping))) val->_float = host_client->ping * 1000.0;
-
-       // don't clear move->time as it is used for applying cl_movement 1 moves
-       movetime = move->time;
-       memset(move, 0, sizeof(*move));
-       move->time = movetime;
 }
 
 void SV_FrameLost(int framenum)
@@ -814,7 +815,7 @@ void SV_ReadClientMessage(void)
                        return;
                }
 
-               cmd = MSG_ReadChar ();
+               cmd = MSG_ReadByte ();
                if (cmd == -1)
                {
                        // end of message