Merge branch 'master' into battle-tweak

This commit is contained in:
Sally Coolatta 2022-01-05 19:38:45 -05:00
commit 5edf180bd7

View file

@ -416,6 +416,9 @@ void K_ProcessTerrainEffect(mobj_t *mo)
player->pflags |= PF_TRICKDELAY;
K_DoPogoSpring(mo, upwards, 1);
// Reduce speed
speed /= 2;
if (speed < minspeed)
{
speed = minspeed;
@ -1019,7 +1022,7 @@ static void K_TerrainDefaults(terrain_t *terrain)
terrain->splashID = SIZE_MAX;
terrain->footstepID = SIZE_MAX;
terrain->friction = FRACUNIT;
terrain->friction = 0;
terrain->offroad = 0;
terrain->damageType = -1;
terrain->trickPanel = 0;