Merge branch 'lunch' into 'next'

Don't apply pw_justlaunched if the player didn't actually launch off a slope

See merge request STJr/SRB2!1447
This commit is contained in:
Lach 2021-05-10 08:37:55 -04:00
commit e1843841bc

View file

@ -774,13 +774,13 @@ void P_SlopeLaunch(mobj_t *mo)
mo->momx = slopemom.x;
mo->momy = slopemom.y;
mo->momz = slopemom.z/2;
if (mo->player)
mo->player->powers[pw_justlaunched] = 1;
}
//CONS_Printf("Launched off of slope.\n");
mo->standingslope = NULL;
if (mo->player)
mo->player->powers[pw_justlaunched] = 1;
}
//