From 6650f70c934333e8a171cf51adaf0adc2d8b2f03 Mon Sep 17 00:00:00 2001
From: kitty624 <58940527+kitty624@users.noreply.github.com>
Date: Mon, 15 Apr 2024 01:08:41 +0200
Subject: [PATCH] Update AimMembers.cpp

reworking r9343

- this resulted in player being forced to choose features to allways see all possible merc gear sets

- loosing whole gearsets to avoid a few items is too much

- in some item-mods that even could result in some mercs not having any

- therefore deleted
---
 Laptop/AimMembers.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp
index d0f0561f7..aa0450337 100644
--- a/Laptop/AimMembers.cpp
+++ b/Laptop/AimMembers.cpp
@@ -5633,28 +5633,15 @@ void EnableWeaponKitSelectionButtons()
 	{
 		if ( !(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) || gGameExternalOptions.fGearKitsAlwaysAvailable )
 		{
-			bool bShow;
-			INT16 usItem;
 			for(int i=0; i<NUM_MERCSTARTINGGEAR_KITS; ++i)
 			{
-				bShow = false;
 				for(int j=INV_START_POS; j<NUM_INV_SLOTS; ++j)
 				{
-					usItem = gMercProfileGear[gbCurrentSoldier][i].inv[j];
-					if(usItem != NONE)
+					if(gMercProfileGear[gbCurrentSoldier][i].inv[j] != NONE)
 					{
-						bShow = true;
-						//shadooow: if any of the item in kit is limited to specific system and this system isn't enabled then disable the whole kit from selection
-						if (((Item[usItem].usLimitedToSystem & FOOD_SYSTEM_FLAG) && !UsingFoodSystem()) || ((Item[usItem].usLimitedToSystem & DISEASE_SYSTEM_FLAG) && !gGameExternalOptions.fDisease))
-						{
-							bShow = false;
-							break;
-						}
-					}					
-				}
-				if (bShow)
-				{
-					ShowButton(giWeaponboxSelectionButton[i]);
+						ShowButton( giWeaponboxSelectionButton[i] );
+						break;
+					}
 				}
 			}
 		}