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

Do not kill player because of damage outside of GTR_BUMPERS

Browse source 
Removes more Karma Bomb crap.
This commit is contained in:
James R 2023-03-08 18:11:50 -08:00
parent a3c64068e6
commit f6c8dd655a
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/p_inter.c
View file

@ -2145,9 +2145,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
const boolean hardhit = (type == DMG_EXPLODE || type == DMG_KARMA || type == DMG_TUMBLE); // This damage type can do evil stuff like ALWAYS combo const boolean hardhit = (type == DMG_EXPLODE || type == DMG_KARMA || type == DMG_TUMBLE); // This damage type can do evil stuff like ALWAYS combo
INT16 ringburst = 5; INT16 ringburst = 5;
// Do not die from damage outside of bumpers health system
damage = 0;
// Check if the player is allowed to be damaged! // Check if the player is allowed to be damaged!
// If not, then spawn the instashield effect instead. // If not, then spawn the instashield effect instead.
if (!force) if (!force)
@ -2227,28 +2224,27 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
} }
} }
// We successfully damaged them! Give 'em some bumpers! if (gametyperules & GTR_BUMPERS)
if (type != DMG_STING && type != DMG_STUMBLE)
{ {
damage = 1;
if (damagetype & DMG_STEAL) if (damagetype & DMG_STEAL)
{ {
// Steals 2 bumpers
damage = 2; damage = 2;
}
}
else
{
// Do not die from damage outside of bumpers health system
damage = 0;
}
if (type == DMG_KARMA) if (type == DMG_STING || type == DMG_STUMBLE)
{ {
damage = K_Bumpers(player); damage = 0;
} }
} else
else {
{ // We successfully damaged them! Give 'em some bumpers!
if (type == DMG_KARMA)
{
// Take half of their bumpers for karma comeback damage
damage = max(1, K_Bumpers(player) / 2);
}
}
if (source && source != player->mo && source->player) if (source && source != player->mo && source->player)
{ {