mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Waterskii fixes
Check for if you're at half sonic boom later (order of operations), make sure sonic boom is always assumed to be 200% max to just make the game continue to work
This commit is contained in:
parent
32d03ccb1e
commit
f0df4990ae
1 changed files with 8 additions and 4 deletions
12
src/k_kart.c
12
src/k_kart.c
|
|
@ -3326,6 +3326,7 @@ boolean K_WaterRun(mobj_t *mobj)
|
||||||
case MT_PLAYER:
|
case MT_PLAYER:
|
||||||
{
|
{
|
||||||
fixed_t minspeed = 0;
|
fixed_t minspeed = 0;
|
||||||
|
fixed_t flatspeed = 2 * K_GetKartSpeed(mobj->player, false, false);
|
||||||
|
|
||||||
if (mobj->player == NULL)
|
if (mobj->player == NULL)
|
||||||
{
|
{
|
||||||
|
|
@ -3339,10 +3340,8 @@ boolean K_WaterRun(mobj_t *mobj)
|
||||||
|
|
||||||
minspeed = K_PlayerTripwireSpeedThreshold(mobj->player);
|
minspeed = K_PlayerTripwireSpeedThreshold(mobj->player);
|
||||||
|
|
||||||
if (mobj->player->speed < minspeed / 5) // 40%
|
if (minspeed >= flatspeed)
|
||||||
{
|
minspeed = flatspeed;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mobj->player->invincibilitytimer
|
if (mobj->player->invincibilitytimer
|
||||||
|| mobj->player->sneakertimer
|
|| mobj->player->sneakertimer
|
||||||
|
|
@ -3355,6 +3354,11 @@ boolean K_WaterRun(mobj_t *mobj)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mobj->player->speed < minspeed / 5) // Or if you're at half tripwire speed
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue