Merge branch 'orbinaut-waterski-new' into 'master'

orbinaut waterski is now based on owner waterski at the time of throw

See merge request kart-krew-dev/ring-racers-internal!2940
This commit is contained in:
Ashnal 2025-10-16 02:53:18 +00:00
commit 3b0e3ec75c

View file

@ -325,10 +325,9 @@ void Obj_OrbinautThrown(mobj_t *th, fixed_t finalSpeed, fixed_t dir)
{
th->color = orbinaut_owner(th)->player->skincolor;
const mobj_t *owner = orbinaut_owner(th);
const ffloor_t *rover = P_IsObjectFlipped(owner) ? owner->ceilingrover : owner->floorrover;
const boolean ownerwaterrun = K_WaterRun(orbinaut_owner(th));
if (dir >= 0 && rover && (rover->fofflags & FOF_SWIMMABLE))
if (dir >= 0 && ownerwaterrun)
{
// The owner can run on water, so we should too!
orbinaut_flags(th) |= ORBI_WATERSKI;