thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-18 03:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'chrome-fixes' into 'master'

Browse source 
Let UFO Catcher trip Mine radius

Closes #571

See merge request KartKrew/Kart!1381
This commit is contained in:
Oni 2023-08-13 14:55:48 +00:00
commit d2a948e490
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/k_collide.cpp
View file

@ -238,8 +238,15 @@ static inline BlockItReturn_t PIT_SSMineSearch(mobj_t *thing)
if (grenade->flags2 & MF2_DEBRIS) // don't explode twice
return BMIT_ABORT;
if (thing->type != MT_PLAYER) // Don't explode for anything but an actual player.
switch (thing->type)
{
case MT_PLAYER: // Don't explode for anything but an actual player.
case MT_SPECIAL_UFO: // Also UFO catcher
break;
default:
return BMIT_CONTINUE;
}
if (thing == grenade->target && grenade->threshold != 0) // Don't blow up at your owner instantly.
return BMIT_CONTINUE;
@ -287,6 +294,13 @@ static inline BlockItReturn_t PIT_SSMineExplode(mobj_t *thing)
if (PIT_SSMineChecks(thing) == true)
return BMIT_CONTINUE;
// Don't do Big Boy Damage to the UFO Catcher with
// lingering spinout damage
if (thing->type == MT_SPECIAL_UFO && explodespin)
{
return BMIT_CONTINUE;
}
P_DamageMobj(thing, grenade, grenade->target, 1, (explodespin ? DMG_NORMAL : DMG_EXPLODE));
lagadded = (thing->hitlag - oldhitlag);