From 1886115e54a58eb1639e1b90db247add621eb3bb Mon Sep 17 00:00:00 2001 From: Sally Cochenour Date: Tue, 17 Mar 2020 20:30:30 -0400 Subject: [PATCH] Allow Eggman items to be picked up by players using invulerability items --- src/p_inter.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 165cfae84..37b7ff36f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -108,7 +108,7 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon) return false; /*if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // No bumpers in Match - return false;*/ + return false;*/ if (weapon) { @@ -118,10 +118,7 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon) // Invulnerable if (player->powers[pw_flashing] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinouttype] != 2) - || player->kartstuff[k_squishedtimer] > 0 - || player->kartstuff[k_invincibilitytimer] > 0 - || player->kartstuff[k_growshrinktimer] > 0 - || player->kartstuff[k_hyudorotimer] > 0) + || player->kartstuff[k_squishedtimer] > 0) return false; // Already have fake