Adjust player bumping
This commit is contained in:
parent
e562d838b5
commit
1a42afafa3
1 changed files with 6 additions and 4 deletions
10
src/k_kart.c
10
src/k_kart.c
|
|
@ -1630,13 +1630,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;
|
||||
|
|
@ -1694,7 +1696,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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue