vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Offroad spark fix & sink

This commit is contained in:
Sally Cochenour 2019-02-02 00:58:51 -05:00
parent 34b027e8ba
commit 6a14d79cf0
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/k_kart.c
View File

@ -1637,10 +1637,8 @@ static void K_GetKartBoostPower(player_t *player)
&& player->kartstuff[k_offroad] >= 0)
boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT);
if (player->kartstuff[k_itemtype] == KITEM_KITCHENSINK)
boostpower = max((TICRATE/2), (5*TICRATE)-(player->kartstuff[k_bananadrag]/2))*boostpower/(5*TICRATE);
else if (player->kartstuff[k_bananadrag] > TICRATE)
boostpower = 4*boostpower/5;
if (player->kartstuff[k_bananadrag] > TICRATE)
boostpower = (4*boostpower)/5;
// Banana drag/offroad dust
if (boostpower < FRACUNIT
@ -4716,9 +4714,9 @@ static void K_KartDrift(player_t *player, boolean onground)
}
// Disable drift-sparks until you're going fast enough
if (player->kartstuff[k_getsparks] == 0)
if (player->kartstuff[k_getsparks] == 0 || player->kartstuff[k_offroad])
driftadditive = 0;
if (player->speed > minspeed*2 && !player->kartstuff[k_offroad])
if (player->speed > minspeed*2)
player->kartstuff[k_getsparks] = 1;
// This spawns the drift sparks

4
src/p_mobj.c
View File

@ -1408,10 +1408,8 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
case MT_JAWZ:
case MT_JAWZ_DUD:
case MT_SSMINE:
gravityadd = (5*gravityadd)/2;
break;
case MT_SINK:
gravityadd = (5*gravityadd); // Double gravity
gravityadd = (5*gravityadd)/2;
break;
case MT_SIGN:
gravityadd /= 8;