From 5ae1c334fa9608b81e6c7067cb110a0fd17b5280 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 14 May 2021 10:03:07 +0200 Subject: [PATCH] - Duke: fixed bad check in 'ifnotmoving' CON command. --- source/build/include/build.h | 4 ++-- source/games/duke/src/gameexec.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/build/include/build.h b/source/build/include/build.h index 80c086141..957499acc 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -704,8 +704,8 @@ extern int32_t(*changespritestat_replace)(int16_t spritenum, int16_t newstatnum) enum EHitBits { kHitNone = 0, - kHitTypeMask = 0xE000, - kHitIndexMask = 0x1FFF, + kHitTypeMask = 0xC000, + kHitIndexMask = 0x3FFF, kHitSector = 0x4000, kHitWall = 0x8000, kHitSprite = 0xC000, diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index 08884d189..aec75bf8d 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -2809,7 +2809,7 @@ int ParseState::parse(void) parseifelse( fi.floorspace(g_sp->sectnum)); break; case concmd_ifnotmoving: - parseifelse( (g_ac->movflag&kHitTypeMask) > kHitSprite ); + parseifelse( (g_ac->movflag&kHitTypeMask) > kHitSector ); break; case concmd_respawnhitag: insptr++;