thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-29 03:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'spindash-ring-pickup' into 'master'

Browse source 
Don't pick up rings in spindash charge (resolves #679)

Closes #679

See merge request KartKrew/Kart!1491
This commit is contained in:
Oni 2023-09-12 04:34:34 +00:00
commit d46ad5be56
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_inter.c
View file

@ -572,7 +572,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
return;
// Don't immediately pick up spilled rings
if (special->threshold > 0 || P_PlayerInPain(player))
if (special->threshold > 0 || P_PlayerInPain(player) || player->spindash) // player->spindash: Otherwise, players can pick up rings that are thrown out of them from invinc spindash penalty
return;
if (!(P_CanPickupItem(player, 0)))