From 7304dff3e5dc6605c91234c199ae8f8e3674cdd8 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 2 Nov 2020 02:03:50 -0500 Subject: [PATCH] Don't let karma players pick anything up --- src/p_inter.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index e8157543f..7ce08cb82 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -108,11 +108,13 @@ void P_RampConstant(const BasicFF_t *FFInfo, INT32 Start, INT32 End) // boolean P_CanPickupItem(player_t *player, UINT8 weapon) { - if (player->exiting || mapreset) + if (player->exiting || mapreset || player->eliminated) return false; - /*if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0) // No bumpers in Match - return false;*/ +#ifndef OTHERKARMAMODES + if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0) // No bumpers in Match + return false; +#endif if (weapon) {