From 8d2327c5c9c0045fc8358cc768928449e6c25c52 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 5 Jan 2024 17:48:44 -0800 Subject: [PATCH] Battle UFO: do not suck up into tractor beam if player is fast-falling --- src/p_map.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/p_map.c b/src/p_map.c index 26165ac47..6c0c75b72 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -785,7 +785,11 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return BMIT_CONTINUE; // overhead } - P_SetObjectMomZ(tm.thing, FRACUNIT, true); + if (!tm.thing->player || !tm.thing->player->fastfall) + { + P_SetObjectMomZ(tm.thing, FRACUNIT, true); + } + fixed_t friction = 33*FRACUNIT/35; tm.thing->momx = FixedMul(tm.thing->momx, friction); tm.thing->momy = FixedMul(tm.thing->momy, friction);