Merge branch 'dustdevilfix' into 'next'

Fix pflags not being properly reset when entering dust devil from top

See merge request STJr/SRB2!556
This commit is contained in:
MascaraSnake 2019-12-22 17:35:51 -05:00
commit 154d2033b6

View file

@ -13614,12 +13614,12 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
}
else
{ //Player on the top of the tornado.
P_ResetPlayer(player);
thing->z = dustdevil->z + dustdevil->height;
thrust = 20 * FRACUNIT;
player->powers[pw_nocontrol] = 0;
S_StartSound(thing, sfx_wdjump);
P_SetPlayerMobjState(thing, S_PLAY_FALL);
player->pflags &= ~PF_JUMPED;
}
thing->momz = thrust;