]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix bug with sv_gameplayfix_slidemoveprojectiles not allowing proximity
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 12 Apr 2009 07:23:09 +0000 (07:23 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 12 Apr 2009 07:23:09 +0000 (07:23 +0000)
mines to stick in hipnotic

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

sv_phys.c

index 591c2baf933c6e367e3a82d27f82857e09a6f07a..6de482673ece7bb62ad654f8c108ec72c450639b 100644 (file)
--- 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;
        }