mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
Don't water-run while in grow
Also there was a typo lmao
This commit is contained in:
parent
a7a572a7ea
commit
58446441fe
3 changed files with 15 additions and 1 deletions
13
src/k_kart.c
13
src/k_kart.c
|
|
@ -2700,6 +2700,19 @@ boolean K_TripwirePass(player_t *player)
|
||||||
return false;
|
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)
|
static fixed_t K_FlameShieldDashVar(INT32 val)
|
||||||
{
|
{
|
||||||
// 1 second = 75% + 50% top speed
|
// 1 second = 75% + 50% top speed
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@ void K_MomentumToFacing(player_t *player);
|
||||||
boolean K_ApplyOffroad(player_t *player);
|
boolean K_ApplyOffroad(player_t *player);
|
||||||
boolean K_SlopeResistance(player_t *player);
|
boolean K_SlopeResistance(player_t *player);
|
||||||
boolean K_TripwirePass(player_t *player);
|
boolean K_TripwirePass(player_t *player);
|
||||||
|
boolean K_WaterRun(player_t *player);
|
||||||
void K_ApplyTripWire(player_t *player, tripwirestate_t state);
|
void K_ApplyTripWire(player_t *player, tripwirestate_t state);
|
||||||
INT16 K_GetSpindashChargeTime(player_t *player);
|
INT16 K_GetSpindashChargeTime(player_t *player);
|
||||||
fixed_t K_GetSpindashChargeSpeed(player_t *player);
|
fixed_t K_GetSpindashChargeSpeed(player_t *player);
|
||||||
|
|
|
||||||
|
|
@ -2957,7 +2957,7 @@ boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
|
||||||
span > player->mo->height &&
|
span > player->mo->height &&
|
||||||
player->speed / 3 > abs(player->mo->momz) &&
|
player->speed / 3 > abs(player->mo->momz) &&
|
||||||
player->speed > K_GetKartSpeed(player, false) &&
|
player->speed > K_GetKartSpeed(player, false) &&
|
||||||
K_TripWirePass(player) &&
|
K_WaterRun(player) &&
|
||||||
(rover->flags & FF_SWIMMABLE);
|
(rover->flags & FF_SWIMMABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue