From d95b9210e9b7a8043a35b8ddf2fd161d483a2848 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 24 May 2025 18:34:07 -0400 Subject: [PATCH] Invert binary conversion code for spikes This has been the cause of the most annoying long standing bug to date. Who knew this got inverted in 2.2 --- src/p_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 7585be750..fdf2284ca 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7272,7 +7272,7 @@ static void P_ConvertBinaryThingTypes(void) if (mapthings[i].options & MTF_EXTRA) mapthings[i].args[2] |= TMSF_RETRACTED; } - if (mapthings[i].options & MTF_AMBUSH) + if (!(mapthings[i].options & MTF_AMBUSH)) mapthings[i].args[2] |= TMSF_INTANGIBLE; break; case 523: //Spike @@ -7283,7 +7283,7 @@ static void P_ConvertBinaryThingTypes(void) if (mapthings[i].options & MTF_EXTRA) mapthings[i].args[2] |= TMSF_RETRACTED; } - if (mapthings[i].options & MTF_AMBUSH) + if (!(mapthings[i].options & MTF_AMBUSH)) mapthings[i].args[2] |= TMSF_INTANGIBLE; break; case 540: //Fan