Merge branch 'fix-fang-death' into 'next'

Fix Fang's death sequence

See merge request STJr/SRB2!2388
This commit is contained in:
sphere 2024-03-11 13:02:43 +00:00
commit 3aad3713cb

View file

@ -4189,8 +4189,10 @@ static void P_DoBoss5Death(mobj_t *mo)
if (!P_MobjWasRemoved(pole))
{
P_SetScale(pole, 2*FRACUNIT, true);
pole->angle = mo->tracer->angle;
pole->momx = P_ReturnThrustX(pole, pole->angle, speed);
pole->momy = P_ReturnThrustY(pole, pole->angle, speed);
P_SetTarget(&pole->tracer, P_SpawnMobj(
pole->x, pole->y,
pole->z - 256*FRACUNIT,
@ -4199,7 +4201,7 @@ static void P_DoBoss5Death(mobj_t *mo)
{
pole->tracer->flags |= MF_NOCLIPTHING;
P_SetScale(pole->tracer, 2*FRACUNIT, true);
pole->angle = pole->tracer->angle = mo->tracer->angle;
pole->tracer->angle = mo->tracer->angle;
pole->tracer->momx = pole->momx;
pole->tracer->momy = pole->momy;