From 26da74c4aae0b5eb528ec2f6a8feeecf2faa6847 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Tue, 11 Mar 2025 11:42:06 -0400 Subject: [PATCH] Karma doesn't combo. --- src/p_inter.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 0465f2733..d9c78af6f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2160,7 +2160,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da else { const UINT8 type = (damagetype & DMG_TYPEMASK); - const boolean hardhit = (type == DMG_EXPLODE || type == DMG_KARMA); // This damage type can do evil stuff like ALWAYS combo + const boolean explosioncombo = (type == DMG_EXPLODE); // This damage type can do evil stuff like ALWAYS combo INT16 ringburst = 5; // Check if the player is allowed to be damaged! @@ -2196,9 +2196,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da { // Check if we should allow explosion combos. - boolean allowcombo = hardhit; - - if ((allowcombo == false) && (player->flashing > 0 || player->squishedtimer > 0)) + if ((explosioncombo == false) && (player->flashing > 0 || player->squishedtimer > 0)) { // Post-hit invincibility K_DoInstashield(player); @@ -2284,7 +2282,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da K_PlayPainSound(target, source); - if ((hardhit == true) || (cv_kartdebughuddrop.value && !modeattacking)) + if ((explosioncombo == true) || (cv_kartdebughuddrop.value && !modeattacking)) { K_DropItems(player); }