From dd46dfb10822b55ef424266a54728aed3ef38b2e Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Fri, 22 Nov 2024 15:14:52 +0700
Subject: [PATCH] attempt to fix nextweapon autoswitch issue (#2037)

---
 src/p_pspr.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/p_pspr.c b/src/p_pspr.c
index 65e8084e..3af24371 100644
--- a/src/p_pspr.c
+++ b/src/p_pspr.c
@@ -22,6 +22,7 @@
 #include "d_items.h"
 #include "d_player.h"
 #include "doomstat.h"
+#include "g_nextweapon.h"
 #include "i_printf.h"
 #include "i_video.h" // uncapped
 #include "m_random.h"
@@ -266,6 +267,8 @@ int P_SwitchWeapon(player_t *player)
   int newweapon = currentweapon;
   int i = NUMWEAPONS+1;   // killough 5/2/98
 
+  G_NextWeaponReset();
+
   // [XA] use fixed behavior for mbf21. no need
   // for a discrete compat option for this, as
   // it doesn't impact demo playback (weapon