mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
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:
commit
3f0aa0c18b
1 changed files with 1 additions and 4 deletions
|
|
@ -2182,10 +2182,7 @@ static void P_FlingBurst
|
||||||
mo->momy = (mo->target->momy/2) + FixedMul(FINESINE(fa>>ANGLETOFINESHIFT), ns);
|
mo->momy = (mo->target->momy/2) + FixedMul(FINESINE(fa>>ANGLETOFINESHIFT), ns);
|
||||||
|
|
||||||
ns = FixedMul(momz, player->mo->scale);
|
ns = FixedMul(momz, player->mo->scale);
|
||||||
P_SetObjectMomZ(mo, (mo->target->momz/2) + ns, false);
|
mo->momz = (mo->target->momz/2) + ((ns) * P_MobjFlip(mo));
|
||||||
|
|
||||||
if (player->mo->eflags & MFE_VERTICALFLIP)
|
|
||||||
mo->momz *= -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Spills an injured player's rings.
|
/** Spills an injured player's rings.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue