Merge branch 'pterabyte-mash' into 'next'

CR_PTERABYTE tweaks (Closes #304)

Closes #304

See merge request STJr/SRB2!1380
This commit is contained in:
sphere 2021-12-24 13:29:13 +00:00
commit 2615528f45

View file

@ -12744,12 +12744,12 @@ void P_PlayerAfterThink(player_t *player)
if (!ptera->movefactor)
goto dropoff;
if (ptera->cusval >= 50)
if (ptera->cusval >= 30)
{
player->powers[pw_carry] = CR_NONE;
P_SetTarget(&player->mo->tracer, NULL);
P_KillMobj(ptera, player->mo, player->mo, 0);
player->mo->momz = 9*FRACUNIT;
P_SetObjectMomZ(player->mo, 12*FRACUNIT, false);
player->pflags |= PF_APPLYAUTOBRAKE|PF_JUMPED|PF_THOKKED;
P_SetMobjState(player->mo, S_PLAY_ROLL);
break;