thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up guard conditions

Browse source
This commit is contained in:
AJ Martinez 2023-10-13 03:16:54 -07:00
parent 6ae427447c
commit 8fced1890b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -10181,6 +10181,9 @@ boolean K_PlayerGuard(player_t *player)
return true; return true;
} }
if (player->spheres == 0)
return false;
// Ugh. Duplicating a lot of this because while Guard _superficially_ looks like it's // Ugh. Duplicating a lot of this because while Guard _superficially_ looks like it's
// restricted similarly to ebrake, it's actually _really_ bad if we can't guard after item bumps. // restricted similarly to ebrake, it's actually _really_ bad if we can't guard after item bumps.
@ -10201,10 +10204,10 @@ boolean K_PlayerGuard(player_t *player)
&& player->spindashboost == 0 && player->spindashboost == 0
&& player->nocontrol == 0) && player->nocontrol == 0)
{ {
return false; return true;
} }
return (K_PlayerEBrake(player) && player->spheres > 0); return false;
} }
SINT8 K_Sliptiding(player_t *player) SINT8 K_Sliptiding(player_t *player)
@ -11040,6 +11043,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
else else
{ {
player->instaWhipCharge = 0; player->instaWhipCharge = 0;
player->guardCooldown = INSTAWHIP_DROPGUARD;
if (!K_PowerUpRemaining(player, POWERUP_BARRIER)) if (!K_PowerUpRemaining(player, POWERUP_BARRIER))
{ {
player->guardCooldown = INSTAWHIP_COOLDOWN; player->guardCooldown = INSTAWHIP_COOLDOWN;