From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 3 Aug 2015 16:48:44 +0000 (+0000)
Subject: Only abort the move of a MOVETYPE_TOSS entity if it is actually supposed to
X-Git-Tag: xonotic-v0.8.2~79
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=6b31e3a96fb3b4260f356674d5c1011b631dea7d;p=xonotic%2Fdarkplaces.git

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 c84f0c15..3d7bf81e 100644
--- 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;
 		}
 	}