Merge branch 'sonicitems' into encore

This commit is contained in:
toaster 2018-08-12 16:18:29 +01:00
commit 5a6b34c4ca

View file

@ -155,8 +155,8 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
if (player->exiting || mapreset) if (player->exiting || mapreset)
return false; return false;
if (weapon == 2 && 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)
{ {