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

Anti item farming: edge case fixups

Browse source
This commit is contained in:
AJ Martinez 2023-09-12 16:18:50 -07:00
parent c1ab333b27
commit e71e194ddf
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -8245,7 +8245,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->incontrol = min(player->incontrol, 5*TICRATE); player->incontrol = min(player->incontrol, 5*TICRATE);
player->incontrol = max(player->incontrol, -5*TICRATE); player->incontrol = max(player->incontrol, -5*TICRATE);
if (P_PlayerInPain(player)) if (P_PlayerInPain(player) || player->respawn.state != RESPAWNST_NONE)
player->lastpickuptype = -1; // got your ass beat, go grab anything player->lastpickuptype = -1; // got your ass beat, go grab anything
if (player->tumbleBounces > 0) if (player->tumbleBounces > 0)

5
src/p_inter.c
View file

@ -439,7 +439,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
break; break;
} }
P_UpdateLastPickup(player, 3); // Ring Capsules shouldn't affect pickup cheese, they're just used as condensed ground-ring placements.
if (special->threshold != KITEM_SUPERRING)
P_UpdateLastPickup(player, 3);
S_StartSound(toucher, special->info->deathsound); S_StartSound(toucher, special->info->deathsound);
P_KillMobj(special, toucher, toucher, DMG_NORMAL); P_KillMobj(special, toucher, toucher, DMG_NORMAL);
return; return;