From db6da100e18a0353041db6f8063aaf58e1519a14 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sat, 26 Apr 2025 00:22:24 +0300
Subject: [PATCH] Reset selected gear kit when browsing mercs

---
 Laptop/mercs Files.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp
index 3e41ad50..4ef50fd5 100644
--- a/Laptop/mercs Files.cpp	
+++ b/Laptop/mercs Files.cpp	
@@ -1847,6 +1847,10 @@ void MercProcessHireAfterGear()
 
 void NextMercMember()
 {
+	// Reset selected kit, cannot assume next merc has more than 1 kit
+	gSelectedMercKit = 0;
+	MercWeaponKitSelectionUpdate( gSelectedMercKit );
+
 	if (gfKeyState [ CTRL ])
 		gubCurMercIndex = LaptopSaveInfo.gubLastMercIndex;
 	else if (gfKeyState [ SHIFT ])
@@ -1877,6 +1881,10 @@ void NextMercMember()
 
 void PrevMercMember()
 {
+	// Reset selected kit, cannot assume next merc has more than 1 kit
+	gSelectedMercKit = 0;
+	MercWeaponKitSelectionUpdate( gSelectedMercKit );
+
 	if (gfKeyState [ CTRL ])
 		gubCurMercIndex = 0;
 	else if (gfKeyState [ SHIFT ])