]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Don't run MOVETYPE_NOCLIP physics asynchronously
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 30 Jul 2016 00:20:55 +0000 (00:20 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 30 Jul 2016 00:20:55 +0000 (00:20 +0000)
From: Mario <mario@smbclan.net>

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

sv_phys.c

index 87717114d0cffddcb5f7278126259b31e41e2a64..92f75c2862dc6ac7f0ed569c9b4cd7fbe4c9a12f 100644 (file)
--- 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