thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-spb-combo' into 'master'

Browse source 
SPB: fix endless combo on players in its path

Closes #1015

See merge request KartKrew/Kart!1900
This commit is contained in:
AJ Martinez 2024-02-09 22:49:31 +00:00
commit 7b5abc19b9
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_inter.c
View file

@ -2642,6 +2642,14 @@ static boolean P_FlashingException(const player_t *player, const mobj_t *inflict
return false;
}
if (inflictor->type == MT_SPB)
{
// The SPB does not die on impact with players other than its intended target.
// Ignoring flashing tics would cause an endless combo on anyone who gets in way of the SPB.
// Upon hitting its target, DMG_EXPLODE will be used (which ignores flashing tics).
return false;
}
if (!P_IsKartItem(inflictor->type) && inflictor->type != MT_PLAYER)
{
// Exception only applies to player items.