From d44340e9b8ffc38d0b7f7d8ef43bd0ac3ad7fbdb Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 3 Nov 2022 04:56:21 -0700 Subject: [PATCH 1/2] Always allow combos into DMG_EXPLODE --- src/p_inter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index df22a056f..64179a58d 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1997,7 +1997,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // Check if the player is allowed to be damaged! // If not, then spawn the instashield effect instead. - if (!force && !(inflictor && inflictor->type == MT_SPBEXPLOSION && inflictor->extravalue1 == 1)) + // NB: "allowcombo", "hardhit" and related checks are here to disallow HITLAG COMBOS, not loss-of-control combos + // DMG_EXPLODE bypasses this check to prevent blocking eggbox/SPB with spinout flashtics + if (!force && (type != DMG_EXPLODE) && !(inflictor && inflictor->type == MT_SPBEXPLOSION && inflictor->extravalue1 == 1)) { if (gametyperules & GTR_BUMPERS) { From 4996692b4b476d4fb205daf3611e5bbdead51f8f Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 3 Nov 2022 05:09:18 -0700 Subject: [PATCH 2/2] Remove redundant MT_SPBEXPLOSION combo condition --- 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 64179a58d..da54636fb 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1999,7 +1999,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // If not, then spawn the instashield effect instead. // NB: "allowcombo", "hardhit" and related checks are here to disallow HITLAG COMBOS, not loss-of-control combos // DMG_EXPLODE bypasses this check to prevent blocking eggbox/SPB with spinout flashtics - if (!force && (type != DMG_EXPLODE) && !(inflictor && inflictor->type == MT_SPBEXPLOSION && inflictor->extravalue1 == 1)) + if (!force && (type != DMG_EXPLODE)) { if (gametyperules & GTR_BUMPERS) {