fix bug in the previous movement patch where moves were not applied to the QC fields...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7038 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sv_phys.c b/sv_phys.c
index 3635117cbeb2dea831793395c6b025ab8dcf0ac0..67578e7b6b7b6a6e5c9aacc7a2f9f05218e937fd 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -2003,7 +2003,6 @@ void SV_Physics_ClientMove(void)
 {
        prvm_edict_t *ent;
        ent = host_client->edict;
-       SV_ClientThink();
        if (!SV_CheckWater (ent) && ! ((int)ent->fields.server->flags & FL_WATERJUMP) )
                SV_AddGravity (ent);
        SV_CheckStuck (ent);
@@ -2019,6 +2018,8 @@ void SV_Physics_ClientEntity(prvm_edict_t *ent)
                return;
        }
 
+       SV_ClientThink();
+
        // make sure the velocity is sane (not a NaN)
        SV_CheckVelocity(ent);
        // LordHavoc: a hack to ensure that the (rather silly) id1 quakec

diff --git a/sv_user.c b/sv_user.c
index dd26537193a6e60643153131b29384152e32801f..eda1dbc3ab76c7e1198358315c357f085be42674 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -615,8 +615,10 @@ 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;