Only abort the move of a MOVETYPE_TOSS entity if it is actually supposed to

stop moving.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12218 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=84e21233e4e9e692431554f995281b6bb5739026

diff --git a/sv_phys.c b/sv_phys.c
index c84f0c159650a1ceda860bd51858df958a3fc8cb..3d7bf81e8a1fa7d6b52cec571e33b71dc7e1092b 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -2713,10 +2713,14 @@ void SV_Physics_Toss (prvm_edict_t *ent)
                                        ent->priv.server->suspendedinairflag = true;
                                VectorClear (PRVM_serveredictvector(ent, velocity));
                                VectorClear (PRVM_serveredictvector(ent, avelocity));
+                               movetime = 0;
                        }
                        else
+                       {
                                PRVM_serveredictfloat(ent, flags) = (int)PRVM_serveredictfloat(ent, flags) & ~FL_ONGROUND;
-                       movetime = 0;
+                               if (!sv_gameplayfix_slidemoveprojectiles.integer)
+                                       movetime = 0;
+                       }
                        break;
                }
        }