From 93e679298eb2916f09dc8ba16ff2097c88dcb725 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 28 Sep 2025 09:58:28 -0400 Subject: [PATCH] Fix being awarded bumpers erroneously (#135 point 2) --- src/p_inter.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 9d3498e81..b0ee14ebc 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2142,15 +2142,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da return false; } + // Check if we should allow explosion combos. + if ((explosioncombo == false) && (player->flashing > 0 || player->squishedtimer > 0)) { - - // Check if we should allow explosion combos. - if ((explosioncombo == false) && (player->flashing > 0 || player->squishedtimer > 0)) - { - // Post-hit invincibility - K_DoInstashield(player); - return false; - } + // Post-hit invincibility + K_DoInstashield(player); + return false; } } @@ -2165,7 +2162,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da { K_TakeBumpersFromPlayer(source->player, player, 1); } - else if (damage & DMG_KARMA) + else if (damage & DMG_KARMA && source->player->bumper <= 0) { source->player->karmapoints++; if (source->player->karmapoints >= 2)