From 262f2234c61132a460f9c056d009272a3f1e6054 Mon Sep 17 00:00:00 2001 From: Evan Ramos Date: Sun, 17 May 2020 23:35:33 -0500 Subject: [PATCH] Duke3D: Disable dead code in implementation of undocumented SE 128 Avoids warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare] --- source/duke3d/src/actors.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index abc82eed3..453a45aa1 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -8177,29 +8177,33 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3 { walltype *pWall = &wall[pData[2]]; - if (pWall->cstat|32) +#if 0 + // Due to a typo in the original source code, this block never executes. + if (!(pWall->cstat & 32)) { - pWall->cstat &= (255-32); - pWall->cstat |= 16; + pWall->overpicnum++; if (pWall->nextwall >= 0) + wall[pWall->nextwall].overpicnum++; + + if (pData[0] < pData[1]) pData[0]++; + else { - wall[pWall->nextwall].cstat &= (255-32); - wall[pWall->nextwall].cstat |= 16; + pWall->cstat &= (128+32+8+4+2); + if (pWall->nextwall >= 0) + wall[pWall->nextwall].cstat &= (128+32+8+4+2); + DELETE_SPRITE_AND_CONTINUE(spriteNum); } + + break; } - else break; +#endif - pWall->overpicnum++; + pWall->cstat &= (255-32); + pWall->cstat |= 16; if (pWall->nextwall >= 0) - wall[pWall->nextwall].overpicnum++; - - if (pData[0] < pData[1]) pData[0]++; - else { - pWall->cstat &= (128+32+8+4+2); - if (pWall->nextwall >= 0) - wall[pWall->nextwall].cstat &= (128+32+8+4+2); - DELETE_SPRITE_AND_CONTINUE(spriteNum); + wall[pWall->nextwall].cstat &= (255-32); + wall[pWall->nextwall].cstat |= 16; } } break;