thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also prevent fastfall on ebrake ground-to-air

Browse source
This commit is contained in:
AJ Martinez 2023-05-26 06:47:22 -07:00
parent 1871cad1d9
commit c7bae4a06b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -108,7 +108,7 @@ typedef enum
PF_SHRINKACTIVE = 1<<29, // "Shrink me" cheat is in effect. (Can't be disabled mid-race) PF_SHRINKACTIVE = 1<<29, // "Shrink me" cheat is in effect. (Can't be disabled mid-race)
PF_VOID = 1<<30, // Removed from reality! When leaving hitlag, reenable visibility+collision and kill speed. PF_VOID = 1<<30, // Removed from reality! When leaving hitlag, reenable visibility+collision and kill speed.
PF_FASTFALLBOUNCED = 1<<31, // Just bounced from a fastfall. Ignore fastfall attempts until input's lifted. PF_NOFASTFALL = 1<<31, // Has already done ebrake/fastfall behavior for this input. Fastfalling needs a new input to prevent unwanted bounces on unexpected airtime.
// up to 1<<31 is free // up to 1<<31 is free
} pflags_t; } pflags_t;

7
src/k_kart.c
View file

@ -10095,7 +10095,7 @@ static void K_KartSpindash(player_t *player)
if (K_PlayerEBrake(player) == false) if (K_PlayerEBrake(player) == false)
{ {
player->spindash = 0; player->spindash = 0;
player->pflags &= ~PF_FASTFALLBOUNCED; player->pflags &= ~PF_NOFASTFALL;
return; return;
} }
@ -10107,7 +10107,7 @@ static void K_KartSpindash(player_t *player)
} }
else if (onGround == false) else if (onGround == false)
{ {
if (player->pflags & PF_FASTFALLBOUNCED) if (player->pflags & PF_NOFASTFALL)
return; return;
// Update fastfall. // Update fastfall.
player->fastfall = player->mo->momz; player->fastfall = player->mo->momz;
@ -10127,6 +10127,8 @@ static void K_KartSpindash(player_t *player)
return; return;
} }
player->pflags |= PF_NOFASTFALL;
if (player->speed == 0 && player->steering != 0 && leveltime % 8 == 0) if (player->speed == 0 && player->steering != 0 && leveltime % 8 == 0)
{ {
// Rubber burn turn sfx // Rubber burn turn sfx
@ -10231,7 +10233,6 @@ boolean K_FastFallBounce(player_t *player)
player->fastfall = 0; player->fastfall = 0;
player->fastfallBase = 0; player->fastfallBase = 0;
player->pflags |= PF_FASTFALLBOUNCED;
return true; return true;
} }