Rebase whoopsies fixups

This commit is contained in:
Ashnal 2025-06-07 18:03:56 -04:00
parent 590227a135
commit f7c9f5dfaf
3 changed files with 4 additions and 3 deletions

View file

@ -10010,6 +10010,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->invincibilitytimer <= 0) {
player->tripwireLeniency = max( player->tripwireLeniency, TICRATE );
}
}
if (player->baildrop)
{

View file

@ -465,8 +465,8 @@ boolean M_Responder(event_t *ev)
// Special mid-game input behaviours
if (Playing() && !demo.playback)
{
// Quick Retry (Y in modeattacking)
if (modeattacking && G_PlayerInputDown(0, gc_bail, splitscreen + 1) == true)
// Quick Retry (Z in modeattacking)
if (modeattacking && G_PlayerInputDown(0, gc_vote, splitscreen + 1) == true)
{
M_TryAgain(0);
return true;

View file

@ -8698,7 +8698,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
if (G_IsModeAttackRetrying() && !demo.playback)
{
nowtime = lastwipetic;
while (G_PlayerInputDown(0, gc_respawn, splitscreen + 1) == true)
while (G_PlayerInputDown(0, gc_vote, splitscreen + 1) == true)
{
while (!((nowtime = I_GetTime()) - lastwipetic))
{