diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 936421115..676350fbb 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -10285,7 +10285,7 @@ void ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr // 1st rule // Compare with game.c:G_MaybeTakeOnFloorPal() - if (fpal > 0 && g_firstFogPal > 0 && !(fpal >= g_firstFogPal && fpal <= g_firstFogPal+3)) + if (fpal > 0 && (!g_firstFogPal || !(fpal >= g_firstFogPal && fpal <= g_firstFogPal+3))) tspr->pal = fpal; // 2nd and 3rd rule minus "actor condition" diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 47a4713ab..3380a44e3 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -7036,7 +7036,7 @@ static int32_t G_MaybeTakeOnFloorPal(spritetype *datspr, int32_t sect) { int32_t dapal = sector[sect].floorpal; - if (dapal && g_firstFogPal && !(dapal >= g_firstFogPal && dapal <= g_firstFogPal+3) + if (dapal && (!g_firstFogPal || !(dapal >= g_firstFogPal && dapal <= g_firstFogPal+3)) && !g_noFloorPal[dapal] && !A_CheckSpriteFlags(datspr->owner,SFLAG_NOPAL)) {