Merge branch 'double-scaled-ring-burst' into 'master'

Fix ring spill with object scale

Closes #113

See merge request KartKrew/Kart!377
This commit is contained in:
Sal 2021-02-12 13:36:00 -05:00
commit 3f0aa0c18b

View file

@ -2182,10 +2182,7 @@ static void P_FlingBurst
mo->momy = (mo->target->momy/2) + FixedMul(FINESINE(fa>>ANGLETOFINESHIFT), ns);
ns = FixedMul(momz, player->mo->scale);
P_SetObjectMomZ(mo, (mo->target->momz/2) + ns, false);
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->momz *= -1;
mo->momz = (mo->target->momz/2) + ((ns) * P_MobjFlip(mo));
}
/** Spills an injured player's rings.