From 609b0c0ae00ad8b312646690c079c4abd78a48ed Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 30 Jun 2023 00:46:52 -0700 Subject: [PATCH] MT_FLOATINGITEM: check P_PlayerInPain before picking up power-ups --- src/p_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index ef7e9367a..cc5f2a5ea 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -335,7 +335,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) case MT_FLOATINGITEM: // SRB2Kart if (special->threshold >= FIRSTPOWERUP) { - if (player->flashing || player->tumbleBounces > 0) + if (P_PlayerInPain(player)) return; K_GivePowerUp(player, special->threshold, special->movecount);