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

Merge branch 'acid-cancel-kickstart' into 'master'

Browse source 
Fix Acid Drop irregularities (multi-input, Kickstart, etc)

Closes ring-racers#181

See merge request kart-krew-dev/ring-racers-internal!2894
This commit is contained in:
AJ Martinez 2025-09-26 17:57:04 +00:00
commit a428811884
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/k_kart.c
View file

@ -14075,12 +14075,19 @@ static void K_KartSpindash(player_t *player)
} }
else if (!G_CompatLevel(0x0010)) else if (!G_CompatLevel(0x0010))
{ {
boolean ebrakelasttic = ((player->oldcmd.buttons & BT_EBRAKEMASK) == BT_EBRAKEMASK); UINT16 oldbuttons = player->oldcmd.buttons;
if (player->pflags2 & PF2_STRICTFASTFALL) UINT16 nowbuttons = K_GetKartButtons(player);
ebrakelasttic = (player->oldcmd.buttons & BT_SPINDASH);
if (K_KartKickstart(player))
oldbuttons |= BT_ACCELERATE; // Not strictly correct, but better than nothing.
// Kickstart needs substantial attention if we want this sort of thing to be clean.
boolean ebrakelasttic = ((oldbuttons & BT_EBRAKEMASK) == BT_EBRAKEMASK);
if (player->pflags2 & PF2_STRICTFASTFALL && !(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)