From f8834b02019b03c9bead2414a28f790d6ce933f9 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 25 Mar 2018 19:07:21 -0400 Subject: [PATCH 1/2] MT_NIGHTSBUMPER Spawn: Don't reset mthing->options (cherry picked from commit dc9fd6f02ed4b681ed4982d119672f07cc91e585) --- src/p_mobj.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 5f85474c6..1e2fe4f8f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9194,9 +9194,6 @@ ML_NOCLIMB : Direction not controllable // the bumper in 30 degree increments. mobj->threshold = (mthing->options & 15) % 12; // It loops over, etc P_SetMobjState(mobj, mobj->info->spawnstate+mobj->threshold); - - // you can shut up now, OBJECTFLIP. And all of the other options, for that matter. - mthing->options &= ~0xF; break; case MT_EGGCAPSULE: if (mthing->angle <= 0) From b666fa3131ec391f85dfc1cc56de047ebaf53ec2 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 25 Mar 2018 19:42:46 -0400 Subject: [PATCH 2/2] P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER (cherry picked from commit d85f108997bfeca3e0b1731c1aad70617456400b) --- src/p_mobj.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index 1e2fe4f8f..a146027b9 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9381,6 +9381,14 @@ ML_NOCLIMB : Direction not controllable } } + // ignore MTF_ flags and return early + if (i == MT_NIGHTSBUMPER) + { + mobj->angle = FixedAngle(mthing->angle*FRACUNIT); + mthing->mobj = mobj; + return; + } + mobj->angle = FixedAngle(mthing->angle*FRACUNIT); if ((mthing->options & MTF_AMBUSH)