Merge branch 'fastfall-stops-upward-wind' into 'master'

Do not apply upward wind if fastfalling

Closes #585

See merge request KartKrew/Kart!1390
This commit is contained in:
Oni 2023-08-12 16:27:46 +00:00
commit ef54d9c97a

View file

@ -9329,7 +9329,15 @@ void T_Pusher(pusher_t *p)
thing->momx += xspeed;
thing->momy += yspeed;
thing->momz += zspeed;
// Do not apply upwards wind if the player is
// fastfalling. This could cancel out the increased
// gravity from fastfalling!
if (!(thing->player && thing->player->fastfall && zspeed * P_MobjFlip(thing) > 0))
{
thing->momz += zspeed;
}
if (thing->player)
{
thing->player->cmomx += xspeed;