From 3e64f08cd105b14643bfb888c4705319167915e0 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Mon, 20 Mar 2017 20:30:04 +0000 Subject: [PATCH] Fix r5498 so that projectiles actually do not hit their owner during their first tic of movement. Clear the hitscan bit instead of blocking bit because Proj_MoveCustom uses CLIPMASK1. git-svn-id: https://svn.eduke32.com/eduke32@6082 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 1588e4f12..c7b0d74df 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -2778,7 +2778,7 @@ ACTOR_STATIC void Proj_MoveCustom(int spriteNum) if (!projectileMoved && (unsigned)pSprite->owner < MAXSPRITES) { backupCstat = sprite[pSprite->owner].cstat; - sprite[pSprite->owner].cstat &= (uint16_t)~CSTAT_SPRITE_BLOCK; + sprite[pSprite->owner].cstat &= (uint16_t)~CSTAT_SPRITE_BLOCK_HITSCAN; } do