From f7c9f5dfafc9a1ae0c832b6b1447a5e7d1d5b76e Mon Sep 17 00:00:00 2001
From: Ashnal <ashnal52@gmail.com>
Date: Sat, 7 Jun 2025 18:03:56 -0400
Subject: [PATCH] Rebase whoopsies fixups

---
 src/k_kart.c     | 1 +
 src/k_menufunc.c | 4 ++--
 src/p_setup.cpp  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index d133b71db..60bc2a5b0 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -10009,6 +10009,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 		// Extra tripwire leniency for the end of invincibility
 		if (player->invincibilitytimer <= 0) {
 			player->tripwireLeniency = max( player->tripwireLeniency, TICRATE );
+		}
 	}
 
 	if (player->baildrop)
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 4438781cc..64da0fecd 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -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;
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 9a781ac12..b6bdc8c65 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -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))
 					{