From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 12 Apr 2009 07:23:09 +0000 (+0000)
Subject: fix bug with sv_gameplayfix_slidemoveprojectiles not allowing proximity
X-Git-Tag: xonotic-v0.1.0preview~1706
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=03b1dcc4bd9bf9f30eff43bc6815ca517ca7ef81;p=xonotic%2Fdarkplaces.git

fix bug with sv_gameplayfix_slidemoveprojectiles not allowing proximity
mines to stick in hipnotic


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

diff --git a/sv_phys.c b/sv_phys.c
index 591c2baf..6de48267 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -2008,7 +2008,7 @@ void SV_Physics_Toss (prvm_edict_t *ent)
 			else
 				ent->fields.server->flags = (int)ent->fields.server->flags & ~FL_ONGROUND;
 		}
-		if (!sv_gameplayfix_slidemoveprojectiles.integer)
+		if (!sv_gameplayfix_slidemoveprojectiles.integer || (ent->fields.server->movetype != MOVETYPE_BOUNCE && ent->fields.server->movetype == MOVETYPE_BOUNCEMISSILE))
 			break;
 	}