From 3c9f97a58edf2027f6886586c1df35733ef472af Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 21 Jun 2016 00:32:28 +0000 Subject: [PATCH] Allow SFLAG_NOCLIP to apply to projectile movement git-svn-id: https://svn.eduke32.com/eduke32@5782 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/actors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 068b6c64a..44a0075d0 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -2770,7 +2770,7 @@ ACTOR_STATIC void Proj_MoveCustom(int32_t i) tmpvect.y = (k*(sintable[s->ang&2047]))>>14; tmpvect.z = ll; - j = A_MoveSprite(i, &tmpvect, CLIPMASK1); + j = A_MoveSprite(i, &tmpvect, (A_CheckSpriteFlags(i, SFLAG_NOCLIP) ? 0 : CLIPMASK1)); } while (!j && --cnt > 0); if (cst) sprite[s->owner].cstat = cst; @@ -3014,7 +3014,7 @@ ACTOR_STATIC void G_MoveWeapons(void) tmpvect.x = (k*(sintable[(s->ang+512)&2047]))>>14; tmpvect.y = (k*(sintable[s->ang&2047]))>>14; tmpvect.z = ll; - j = A_MoveSprite(i,&tmpvect, CLIPMASK1); + j = A_MoveSprite(i,&tmpvect, (A_CheckSpriteFlags(i, SFLAG_NOCLIP) ? 0 : CLIPMASK1)); }