incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix being awarded bumpers erroneously (#135 point 2)

Browse source
This commit is contained in:
NepDisk 2025-09-28 09:58:28 -04:00
parent ee9579b950
commit 93e679298e
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p_inter.c
View file

@ -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)