From 1f112c6b87a77dbefe643479d4066f4c5983ae4a Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 3 Apr 2007 04:09:11 +0000 Subject: [PATCH] fix bug in the previous movement patch where moves were not applied to the QC fields when not MOVETYPE_WALK git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7038 d7cf8633-e32d-0410-b094-e92efae38249 --- sv_phys.c | 3 ++- sv_user.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sv_phys.c b/sv_phys.c index 3635117c..67578e7b 100644 --- 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 dd265371..eda1dbc3 100644 --- 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; -- 2.39.2