Merge branch 'sonicitems' into sal-misc

This commit is contained in:
TehRealSalt 2018-09-08 03:24:59 -04:00
commit 9096da926b

View file

@ -3719,9 +3719,9 @@ static void K_KartDrift(player_t *player, boolean onground)
player->kartstuff[k_drift] = 5; player->kartstuff[k_drift] = 5;
if (player->cmd.driftturn > 0) // Inward if (player->cmd.driftturn > 0) // Inward
driftadditive += (player->cmd.driftturn/800)/8; driftadditive += abs(player->cmd.driftturn)/100;
if (player->cmd.driftturn < 0) // Outward if (player->cmd.driftturn < 0) // Outward
driftadditive -= (player->cmd.driftturn/800)/8; driftadditive -= abs(player->cmd.driftturn)/75;
} }
else if (player->kartstuff[k_drift] <= -1) // Drifting to the right else if (player->kartstuff[k_drift] <= -1) // Drifting to the right
{ {
@ -3730,9 +3730,9 @@ static void K_KartDrift(player_t *player, boolean onground)
player->kartstuff[k_drift] = -5; player->kartstuff[k_drift] = -5;
if (player->cmd.driftturn < 0) // Inward if (player->cmd.driftturn < 0) // Inward
driftadditive += (player->cmd.driftturn/800)/4; driftadditive += abs(player->cmd.driftturn)/100;
if (player->cmd.driftturn > 0) // Outward if (player->cmd.driftturn > 0) // Outward
driftadditive -= (player->cmd.driftturn/800)/4; driftadditive -= abs(player->cmd.driftturn)/75;
} }
// This spawns the drift sparks // This spawns the drift sparks