From 9f6c132629b71db15d1a70f5883e6ff1f37d49eb Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 30 Aug 2018 21:32:24 -0400 Subject: [PATCH] Karma players can bump again --- src/p_map.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 77f9653d3..2234534b3 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1491,10 +1491,15 @@ static boolean PIT_CheckThing(mobj_t *thing) if (thing->player->kartstuff[k_squishedtimer] || thing->player->kartstuff[k_hyudorotimer] || thing->player->kartstuff[k_justbumped] || thing->scale > tmthing->scale + (FRACUNIT/8) - || (G_BattleGametype() && thing->player->kartstuff[k_bumper] <= 0) || tmthing->player->kartstuff[k_squishedtimer] || tmthing->player->kartstuff[k_hyudorotimer] - || tmthing->player->kartstuff[k_justbumped] || tmthing->scale > thing->scale + (FRACUNIT/8) - || (G_BattleGametype() && tmthing->player->kartstuff[k_bumper] <= 0)) + || tmthing->player->kartstuff[k_justbumped] || tmthing->scale > thing->scale + (FRACUNIT/8)) + { + return true; + } + + if (G_BattleGametype() + && ((thing->player->kartstuff[k_bumper] && !tmthing->player->kartstuff[k_bumper]) + || (tmthing->player->kartstuff[k_bumper] && !thing->player->kartstuff[k_bumper]))) { return true; }