From 3b98ba656199326f711668dc54ad324a28244d68 Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 9 Aug 2019 09:28:22 +0000 Subject: [PATCH] Attempt to work around odd behavior when attempting to use stuff like wall aligned sprites with the new version of clipmove The behavior was always "wrong" as clipmove does not handle movement of lines, just movement of clip boxes against lines and face sprite points, but the newer version of clipmove actively bounces sprites away from lines they would otherwise clip into. This was causing wall-aligned sprites that called any functions that ended up calling clipmove to get pushed away from the wall unintentionally. git-svn-id: https://svn.eduke32.com/eduke32@7932 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 95063cf14..9a168da8d 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -431,6 +431,8 @@ int A_GetClipdist(int spriteNum, int clipDist) if (A_CheckSpriteFlags(spriteNum, SFLAG_REALCLIPDIST)) clipDist = pSprite->clipdist << 2; + else if ((pSprite->cstat & 48) == 16) + clipDist = 0; else if (isEnemy) { if (pSprite->xrepeat > 60)