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

Anti-marbel-garden softlock

Browse source 
Stumble if you touch a spike while already flashing/spunout (and not just collided with it 2 tics ago)
This commit is contained in:
toaster 2025-08-01 21:19:21 +01:00
parent d63d0279e6
commit 1c6254c426
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_map.c
View file

@ -1382,6 +1382,20 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
}
else
{
if (
thing->type == MT_WALLSPIKE
&& g_tm.thing->health
&& g_tm.thing->player
&& (g_tm.thing->player->justbumped < bumptime-2)
&& (
g_tm.thing->player->flashing
|| P_PlayerInPain(g_tm.thing->player)
)
)
{
K_StumblePlayer(g_tm.thing->player);
}
// Do not return because solidity code comes below.
P_DamageMobj(g_tm.thing, thing, thing, 1, DMG_NORMAL);
}