fix miscounting of timedemo frames on cold/warm runs in the same session

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index 70d3bafc10d70fca1476b2f8eed640f75aea6ba8..457536db0476ccfcab864ce7a78389aa06fb352b 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -347,7 +347,7 @@ void SV_AirMove (void)
                // noclip
                VectorCopy (wishvel, host_client->edict->fields.server->velocity);
        }
-       else if (onground && (!sv_gameplayfix_qwplayerphysics.integer || !host_client->edict->fields.server->button2 || !((int)host_client->edict->fields.server->flags & FL_JUMPRELEASED)))
+       else if (onground)
        {
                SV_UserFriction ();
                SV_Accelerate ();
@@ -629,13 +629,8 @@ void SV_ExecuteClientMoves(void)
                        }
                }
                // now copy the new move
+               sv_readmoves[sv_numreadmoves-1].time = max(sv_readmoves[sv_numreadmoves-1].time, host_client->cmd.time); // prevent backstepping of time
                host_client->cmd = sv_readmoves[sv_numreadmoves-1];
-               host_client->cmd.time = max(host_client->cmd.time, sv.time);
-                       // physics will run up to sv.time, so allow no predicted moves
-                       // before that otherwise, there is a speedhack by turning
-                       // prediction on and off repeatedly on client side because the
-                       // engine would run BOTH client and server physics for the same
-                       // time
                host_client->movesequence = 0;
                // make sure that normal physics takes over immediately
                host_client->clmovement_skipphysicsframes = 0;