Merge branch 'no-more-offroad-earthquake' into 'master'

Disable stairjank terrain and offroad rumble at 0 speed (resolves #813)

Closes #813

See merge request KartKrew/Kart!1744
This commit is contained in:
Oni 2023-12-29 09:13:20 +00:00
commit 986152d88d
2 changed files with 2 additions and 2 deletions

View file

@ -614,7 +614,7 @@ void K_ProcessTerrainEffect(mobj_t *mo)
}
// Bumpy floor
if (terrain->flags & TRF_STAIRJANK)
if (terrain->flags & TRF_STAIRJANK && player->speed != 0)
{
/* use a shorter sound if not two tics have passed
* since the last step */

View file

@ -745,7 +745,7 @@ static inline void P_DeviceRumbleTick(void)
low = high = 65536 / (3+player->numsneakers);
}
else if (((player->boostpower < FRACUNIT) || (player->stairjank > 8))
&& P_IsObjectOnGround(player->mo))
&& P_IsObjectOnGround(player->mo) && player->speed != 0)
{
low = high = 65536 / 32;
}