mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
Fix acid cancel oldbutton check
This commit is contained in:
parent
766f34d4f5
commit
65cf6edb93
1 changed files with 6 additions and 5 deletions
11
src/k_kart.c
11
src/k_kart.c
|
|
@ -14076,17 +14076,18 @@ static void K_KartSpindash(player_t *player)
|
||||||
else if (!G_CompatLevel(0x0010))
|
else if (!G_CompatLevel(0x0010))
|
||||||
{
|
{
|
||||||
UINT16 oldbuttons = player->oldcmd.buttons;
|
UINT16 oldbuttons = player->oldcmd.buttons;
|
||||||
|
UINT16 nowbuttons = K_GetKartButtons(player);
|
||||||
|
|
||||||
if (K_KartKickstart(player))
|
if (K_KartKickstart(player))
|
||||||
oldbuttons |= BT_ACCELERATE; // Not strictly correct, but better than nothing.
|
oldbuttons |= BT_ACCELERATE; // Not strictly correct, but better than nothing.
|
||||||
// Kickstart needs substrantial attention if we want this sort of thing to be clean.
|
// Kickstart needs substantial attention if we want this sort of thing to be clean.
|
||||||
|
|
||||||
boolean ebrakelasttic = (oldbuttons == BT_EBRAKEMASK);
|
boolean ebrakelasttic = !!(oldbuttons & BT_EBRAKEMASK);
|
||||||
if (player->pflags2 & PF2_STRICTFASTFALL)
|
if (player->pflags2 & PF2_STRICTFASTFALL && !(oldbuttons & BT_SPINDASH))
|
||||||
ebrakelasttic = (oldbuttons & BT_SPINDASH);
|
ebrakelasttic = false;
|
||||||
|
|
||||||
boolean ebrakenow = K_PressingEBrake(player);
|
boolean ebrakenow = K_PressingEBrake(player);
|
||||||
if (player->pflags2 & PF2_STRICTFASTFALL && !(player->cmd.buttons & BT_SPINDASH))
|
if (player->pflags2 & PF2_STRICTFASTFALL && !(nowbuttons & BT_SPINDASH))
|
||||||
ebrakenow = false;
|
ebrakenow = false;
|
||||||
|
|
||||||
if (!ebrakelasttic && ebrakenow && player->fastfall && player->transfer)
|
if (!ebrakelasttic && ebrakenow && player->fastfall && player->transfer)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue