Merge branch 'safer-final-failsafe-2' into 'master'

Allow final failsafe in RESPAWNST_DROP (take 2)

See merge request KartKrew/Kart!2061
This commit is contained in:
AJ Martinez 2024-03-11 01:29:58 +00:00
commit 8fb2ee6392

View file

@ -8826,7 +8826,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
K_RemoveGrowShrink(player);
}
if (player->respawn.state == RESPAWNST_NONE && (player->cmd.buttons & BT_RESPAWN) == BT_RESPAWN)
if (player->respawn.state != RESPAWNST_MOVE && (player->cmd.buttons & BT_RESPAWN) == BT_RESPAWN)
{
player->finalfailsafe++; // Decremented by ringshooter to "freeze" this timer
// Part-way through the auto-respawn timer, you can tap Ring Shooter to respawn early