thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-07 20:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate water skipping condition into K_WaterSkip

Browse source
This commit is contained in:
James R 2022-09-23 05:25:40 -07:00
parent 7b301452cc
commit 77bc259986
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -3277,6 +3277,17 @@ boolean K_WaterRun(player_t *player)
return false;
}
boolean K_WaterSkip(player_t *player)
{
if (player->speed/3 > abs(player->mo->momz)) // Going more forward than horizontal, so you can skip across the water.
return true;
if (player->speed > 20*mapobjectscale && player->waterskip) // Already skipped once, so you can skip once more!
return true;
return false;
}
static fixed_t K_FlameShieldDashVar(INT32 val)
{
// 1 second = 75% + 50% top speed

1
src/k_kart.h
View file

@ -143,6 +143,7 @@ boolean K_SlopeResistance(player_t *player);
tripwirepass_t K_TripwirePassConditions(player_t *player);
boolean K_TripwirePass(player_t *player);
boolean K_WaterRun(player_t *player);
boolean K_WaterSkip(player_t *player);
void K_ApplyTripWire(player_t *player, tripwirestate_t state);
INT16 K_GetSpindashChargeTime(player_t *player);
fixed_t K_GetSpindashChargeSpeed(player_t *player);

5
src/p_mobj.c
View file

@ -3317,10 +3317,7 @@ void P_MobjCheckWater(mobj_t *mobj)
}
// skipping stone!
if (p && p->waterskip < 2
&& ((p->speed/3 > abs(mobj->momz)) // Going more forward than horizontal, so you can skip across the water.
|| (p->speed > 20*mapobjectscale && p->waterskip)) // Already skipped once, so you can skip once more!
&& (splashValid == true))
if (p && p->waterskip < 2 && K_WaterSkip(p) && (splashValid == true))
{
const fixed_t hop = 5 * mobj->scale;