Merge branch 'fuck-crazy-turn' into 'master'

Fuck crazy water turning

See merge request KartKrew/Kart!478
This commit is contained in:
James R 2021-12-08 00:37:33 +00:00
commit 0d0cb4d5b1

View file

@ -7578,10 +7578,12 @@ static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
basedrift += (basedrift / greasetics) * player->tiregrease;
}
if (player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))
#if 0
if (player->mo->eflags & MFE_UNDERWATER)
{
countersteer = FixedMul(countersteer, 3*FRACUNIT/2);
}
#endif
return basedrift + (FixedMul(driftadjust * FRACUNIT, countersteer) / FRACUNIT);
}
@ -7685,11 +7687,6 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
turnfixed = FixedMul(turnfixed, FRACUNIT + player->handleboost);
}
if (player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))
{
turnfixed = FixedMul(turnfixed, 3*FRACUNIT/2);
}
// Weight has a small effect on turning
turnfixed = FixedMul(turnfixed, weightadjust);