From: divverent Date: Sat, 30 Jul 2016 00:20:55 +0000 (+0000) Subject: Don't run MOVETYPE_NOCLIP physics asynchronously X-Git-Tag: xonotic-v0.8.2~29 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f39886316f78f6111c8174862ae09e9f657551d;p=xonotic%2Fdarkplaces.git Don't run MOVETYPE_NOCLIP physics asynchronously From: Mario git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12270 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=4e78d2ad3f79e76f90cd265787d43952fedd7406 --- diff --git a/sv_phys.c b/sv_phys.c index 87717114..92f75c28 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -3074,9 +3074,12 @@ static void SV_Physics_ClientEntity(prvm_edict_t *ent) break; case MOVETYPE_NOCLIP: SV_RunThink(ent); - SV_CheckWater(ent); - VectorMA(PRVM_serveredictvector(ent, origin), sv.frametime, PRVM_serveredictvector(ent, velocity), PRVM_serveredictvector(ent, origin)); - VectorMA(PRVM_serveredictvector(ent, angles), sv.frametime, PRVM_serveredictvector(ent, avelocity), PRVM_serveredictvector(ent, angles)); + if (host_client->clmovement_inputtimeout <= 0) // don't run physics here if running asynchronously + { + SV_CheckWater(ent); + VectorMA(PRVM_serveredictvector(ent, origin), sv.frametime, PRVM_serveredictvector(ent, velocity), PRVM_serveredictvector(ent, origin)); + VectorMA(PRVM_serveredictvector(ent, angles), sv.frametime, PRVM_serveredictvector(ent, avelocity), PRVM_serveredictvector(ent, angles)); + } break; case MOVETYPE_STEP: if (host_client->clmovement_inputtimeout <= 0) // don't run physics here if running asynchronously