From 42f140399fc37dbdc3ed195a19ce942d01f8f7dc Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 29 Jun 2023 22:25:31 -0700 Subject: [PATCH 1/2] Don't pickup power-ups if you are flashing or (s)tumbling --- src/p_inter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index e2c5ed6fc..e6eea1dbd 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -335,6 +335,9 @@ 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) + return; + K_GivePowerUp(player, special->threshold, special->movecount); } else From 8b33c45cbd7f31ca33ce4f7072c4dd5218fb5849 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 29 Jun 2023 22:40:09 -0700 Subject: [PATCH 2/2] Fix Stumble damage floors damaging the player --- 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 e6eea1dbd..8473a1ec5 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2410,7 +2410,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // Instawhip breaks the rules and does "damaging stumble", // but sting and stumble shouldn't be rewarding Battle hits otherwise. - if ((type == DMG_STING || type == DMG_STUMBLE) && (inflictor && inflictor->type != MT_INSTAWHIP)) + if ((type == DMG_STING || type == DMG_STUMBLE) && !(inflictor && inflictor->type == MT_INSTAWHIP)) { damage = 0; }