From b59dd9441f94229b7c1e69022e021b3895187367 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 22 Feb 2025 08:11:23 -0500 Subject: [PATCH] Adjust player bumping --- src/k_kart.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 3dd28e607..ac21b3822 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1626,13 +1626,15 @@ static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against) // from causing super crazy bumps. fixed_t spd = K_GetKartSpeed(mobj->player, false, true); - weight = (mobj->player->kartweight) * FRACUNIT; + fixed_t speedfactor = 8 * mapobjectscale; - if (mobj->player->speed > spd) - weight += (mobj->player->speed - spd) / 8; + weight = (mobj->player->kartweight) * FRACUNIT; if (mobj->player->itemtype == KITEM_BUBBLESHIELD) weight += 9*FRACUNIT; + + if (mobj->player->speed > spd) + weight += FixedDiv((mobj->player->speed - spd), speedfactor); } return weight; @@ -1690,7 +1692,7 @@ fixed_t K_GetMobjWeight(mobj_t *mobj, mobj_t *against) break; } - return FixedMul(weight, mobj->scale); + return weight; } static void K_SpawnBumpForObjs(mobj_t *mobj1, mobj_t *mobj2)