Merge branch 'cancel-acid' into 'master'

Acid cancel

See merge request kart-krew-dev/ring-racers-internal!2818
This commit is contained in:
Oni VelocitOni 2025-09-16 01:10:17 +00:00
commit 42a18a4b9e
2 changed files with 17 additions and 1 deletions

View file

@ -182,7 +182,7 @@ demoghost *ghosts = NULL;
// - 0x0010 (Ring Racers 2.4 staff ghosts part 3 - skinlimit raise. don't say we never did anythin for 'ya)
#define MINDEMOVERSION 0x000E
#define DEMOVERSION 0x0010
#define DEMOVERSION 0x0011
boolean G_CompatLevel(UINT16 level)
{

View file

@ -13971,6 +13971,22 @@ static void K_KartSpindash(player_t *player)
player->transfer = 0;
}
}
else if (!G_CompatLevel(0x0010))
{
boolean ebrakelasttic = ((player->oldcmd.buttons & BT_EBRAKEMASK) == BT_EBRAKEMASK);
if (player->pflags2 & PF2_STRICTFASTFALL)
ebrakelasttic = (player->oldcmd.buttons & BT_SPINDASH);
boolean ebrakenow = K_PressingEBrake(player);
if (player->pflags2 & PF2_STRICTFASTFALL && !(player->cmd.buttons & BT_SPINDASH))
ebrakenow = false;
if (!ebrakelasttic && ebrakenow && player->fastfall && player->transfer)
{
player->transfer = 0;
S_StartSound(player->mo, sfx_s3k7d);
}
}
// Update fastfall.
player->fastfall = player->mo->momz;