reworked predicted player physics to call PlayerPreThink before the move and PlayerPo...

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index eda1dbc3ab76c7e1198358315c357f085be42674..8dbd05c0e818dc1067061fc7b04ac4501835688e 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -615,10 +615,8 @@ void SV_ExecuteClientMoves(void)
                                if (sv.frametime > 0.05)
                                {
                                        prog->globals.server->frametime = sv.frametime = moveframetime * 0.5f;
-                                       SV_ClientThink();
                                        SV_Physics_ClientMove();
                                }
-                               SV_ClientThink();
                                SV_Physics_ClientMove();
                                sv.frametime = oldframetime2;
                                prog->globals.server->frametime = oldframetime;
@@ -643,6 +641,8 @@ void SV_ExecuteClientMoves(void)
                // now copy the new move
                host_client->cmd = sv_readmoves[sv_numreadmoves-1];
                host_client->movesequence = 0;
+               // make sure that normal physics takes over immediately
+               host_client->clmovement_skipphysicsframes = 0;
        }
 
        // calculate average ping time