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

Allow Eggman items to be picked up by players using invulerability items

Browse source
This commit is contained in:
Sally Cochenour 2020-03-17 20:30:30 -04:00
parent 54e1444852
commit 1886115e54
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_inter.c
View file

@ -108,7 +108,7 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
return false; return false;
/*if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // No bumpers in Match /*if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // No bumpers in Match
return false;*/ return false;*/
if (weapon) if (weapon)
{ {
@ -118,10 +118,7 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
// Invulnerable // Invulnerable
if (player->powers[pw_flashing] > 0 if (player->powers[pw_flashing] > 0
|| (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinouttype] != 2) || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinouttype] != 2)
|| player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_squishedtimer] > 0)
|| player->kartstuff[k_invincibilitytimer] > 0
|| player->kartstuff[k_growshrinktimer] > 0
|| player->kartstuff[k_hyudorotimer] > 0)
return false; return false;
// Already have fake // Already have fake