thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-20 04:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'explosion-combo' into 'master'

Browse source 
Always allow combos into DMG_EXPLODE (fixes #321)

Closes #321

See merge request KartKrew/Kart!752
This commit is contained in:
Oni 2022-11-04 00:40:50 +00:00
commit 32dba0fd5b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -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))
{
if (gametyperules & GTR_BUMPERS)
{