From c658cdc4ef52cff0756a2de14e7d22ad82684a66 Mon Sep 17 00:00:00 2001
From: ceski <56656010+ceski-1@users.noreply.github.com>
Date: Tue, 1 Oct 2024 21:23:10 -0700
Subject: [PATCH] Prevent unintentional death use reload

---
 src/g_game.c | 4 +++-
 src/p_user.c | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index d1a2d76e6..3485e5637 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -655,7 +655,8 @@ static boolean FilterDeathUseAction(void)
             case death_use_nothing:
                 return true;
             case death_use_reload:
-                if (!demoplayback && !demorecording && !netgame)
+                if (!demoplayback && !demorecording && !netgame
+                    && !activate_death_use_reload)
                 {
                     activate_death_use_reload = true;
                 }
@@ -952,6 +953,7 @@ void G_ClearInput(void)
   I_ResetRelativeMouseState();
   I_ResetAllRumbleChannels();
   WS_Reset();
+  activate_death_use_reload = false;
 }
 
 //
diff --git a/src/p_user.c b/src/p_user.c
index 3ead7f885..b841e821b 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -320,8 +320,6 @@ void P_DeathThink (player_t* player)
 
   if (activate_death_use_reload)
   {
-    activate_death_use_reload = false;
-
     if (savegameslot >= 0)
     {
       char *file = G_SaveGameName(savegameslot);