thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make size differences impact bump knockback more

Browse source
This commit is contained in:
Sally Cochenour 2020-03-20 00:35:18 -04:00
parent e83e162463
commit 2ccc3894e2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/k_kart.c
View file

@ -1296,7 +1296,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against) static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against)
{ {
fixed_t weight = 5*mobj->scale; fixed_t weight = 5*FRACUNIT;
if (!mobj->player) if (!mobj->player)
return weight; return weight;
@ -1309,11 +1309,11 @@ static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against)
} }
else else
{ {
weight = (mobj->player->kartweight) * mobj->scale; weight = (mobj->player->kartweight) * FRACUNIT;
if (mobj->player->speed > K_GetKartSpeed(mobj->player, false)) if (mobj->player->speed > K_GetKartSpeed(mobj->player, false))
weight += (mobj->player->speed - K_GetKartSpeed(mobj->player, false))/8; weight += (mobj->player->speed - K_GetKartSpeed(mobj->player, false))/8;
if (mobj->player->kartstuff[k_itemtype] == KITEM_BUBBLESHIELD) if (mobj->player->kartstuff[k_itemtype] == KITEM_BUBBLESHIELD)
weight += 9*mobj->scale; weight += 9*FRACUNIT;
} }
return weight; return weight;
@ -1321,7 +1321,7 @@ static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against)
static fixed_t K_GetMobjWeight(mobj_t *mobj, mobj_t *against) static fixed_t K_GetMobjWeight(mobj_t *mobj, mobj_t *against)
{ {
fixed_t weight = 5*mobj->scale; fixed_t weight = 5*FRACUNIT;
switch (mobj->type) switch (mobj->type)
{ {
@ -1351,15 +1351,15 @@ static fixed_t K_GetMobjWeight(mobj_t *mobj, mobj_t *against)
case MT_JAWZ_DUD: case MT_JAWZ_DUD:
case MT_JAWZ_SHIELD: case MT_JAWZ_SHIELD:
if (against->player) if (against->player)
weight = K_PlayerWeight(against, NULL) + (3*against->scale); weight = K_PlayerWeight(against, NULL) + (3*FRACUNIT);
else else
weight += 3*mobj->scale; weight += 3*FRACUNIT;
break; break;
default: default:
break; break;
} }
return weight; return FixedMul(weight, mobj->scale);
} }
// This kind of wipeout happens with no rings -- doesn't remove a bumper, has no invulnerability, and is much shorter. // This kind of wipeout happens with no rings -- doesn't remove a bumper, has no invulnerability, and is much shorter.