mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'fastfall-waterski-legends' into 'master'
Allow fastfall out of water run (resolves #902) Closes #902 See merge request KartKrew/Kart!1858
This commit is contained in:
commit
5102ecab56
2 changed files with 16 additions and 0 deletions
|
|
@ -2984,6 +2984,12 @@ boolean K_WaterSkip(mobj_t *mobj)
|
||||||
// Don't allow
|
// Don't allow
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (K_PlayerEBrake(mobj->player))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Allow
|
// Allow
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
10
src/p_mobj.c
10
src/p_mobj.c
|
|
@ -3363,6 +3363,16 @@ boolean P_CanRunOnWater(mobj_t *mobj, ffloor_t *rover)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// E-brake during water-run forces a fastfall.
|
||||||
|
// We disable the ebrake input safety to do this, so we've gotta check it as late as
|
||||||
|
// possible: otherwise, this would cause misinput fastfall or underwater twerking.
|
||||||
|
if (mobj->player != NULL && K_PlayerEBrake(mobj->player))
|
||||||
|
{
|
||||||
|
if (P_IsObjectOnGround(mobj) && !mobj->player->fastfall)
|
||||||
|
mobj->player->pflags &= ~PF_NOFASTFALL;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue