From 03cad0fe3b9aced32845eb5f844c9bf698350b0a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 4 Jan 2022 17:06:26 +0100 Subject: [PATCH] - consider slope sprites unavailable in map formats 5 and 6. Exhumed has several sprites flagged with this combo - they all need to be treated as face sprites. --- source/core/maploader.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/core/maploader.cpp b/source/core/maploader.cpp index 3536d17b2..66bb284b5 100644 --- a/source/core/maploader.cpp +++ b/source/core/maploader.cpp @@ -341,6 +341,8 @@ static void ReadSpriteV6(FileReader& fr, spritetype& spr, int& secno) spr.extra = fr.ReadInt16(); spr.blend = 0; spr.detail = 0; + if ((spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK) == CSTAT_SPRITE_ALIGNMENT_SLOPE) + spr.cstat &= ~CSTAT_SPRITE_ALIGNMENT_MASK; } static void ReadSpriteV5(FileReader& fr, spritetype& spr, int& secno) @@ -363,6 +365,8 @@ static void ReadSpriteV5(FileReader& fr, spritetype& spr, int& secno) spr.lotag = fr.ReadInt16(); spr.hitag = fr.ReadInt16(); spr.extra = fr.ReadInt16(); + if ((spr.cstat & CSTAT_SPRITE_ALIGNMENT_MASK) == CSTAT_SPRITE_ALIGNMENT_SLOPE) + spr.cstat &= ~CSTAT_SPRITE_ALIGNMENT_MASK; auto sec = spr.sectp; if ((sec->ceilingstat & CSTAT_SECTOR_SKY) > 0)