From d480ce24a95b8bc857b8b629abdf929e90b88c60 Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Sat, 11 Nov 2017 01:17:42 +0000 Subject: [PATCH] Stop players bumping when they're reborn --- src/k_kart.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index 37f1a43d..4bbb7b40 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1050,6 +1050,11 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce) if (!mobj1 || !mobj2) return; + // Don't bump when you're being reborn + if ((mobj1->player && mobj1->player->playerstate != PST_LIVE) + || (mobj2->player && mobj2->player->playerstate != PST_LIVE)) + return; + if (cv_collidesounds.value == 1) { S_StartSound(mobj1, cv_collidesoundnum.value);