thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-26 23:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't water-run while in grow

Browse source 
Also there was a typo lmao
This commit is contained in:
James R 2021-12-06 16:14:56 -08:00
parent a7a572a7ea
commit 58446441fe
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_kart.c
View file

@ -2700,6 +2700,19 @@ boolean K_TripwirePass(player_t *player)
return false;
}
boolean K_WaterRun(player_t *player)
{
if (
player->invincibilitytimer ||
player->sneakertimer ||
player->tiregrease ||
player->flamedash ||
player->speed > 2 * K_GetKartSpeed(player, false)
)
return true;
return false;
}
static fixed_t K_FlameShieldDashVar(INT32 val)
{
// 1 second = 75% + 50% top speed

1
src/k_kart.h
View file

@ -108,6 +108,7 @@ void K_MomentumToFacing(player_t *player);
boolean K_ApplyOffroad(player_t *player);
boolean K_SlopeResistance(player_t *player);
boolean K_TripwirePass(player_t *player);
boolean K_WaterRun(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);

2
src/p_mobj.c
View file

@ -2957,7 +2957,7 @@ boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
span > player->mo->height &&
player->speed / 3 > abs(player->mo->momz) &&
player->speed > K_GetKartSpeed(player, false) &&
K_TripWirePass(player) &&
K_WaterRun(player) &&
(rover->flags & FF_SWIMMABLE);
}