From 5bfd19e5a831b7f0eb118fe560616d9c13dd7ff8 Mon Sep 17 00:00:00 2001
From: sun-alf <sun_alf@tut.by>
Date: Thu, 14 Sep 2023 01:03:20 +0300
Subject: [PATCH] [Fix] One of optimizations in (2482234e) commit is not
 suitable for MOLLE stuff in 1.13

It is revealed, MOLLE things in 1.13 are configured in XMLs using both NAS and OAS (old attachment system) methods even if NAS is enabled in New Game Options. Given this, logic of SetAttachmentSlotsFlag() cannot be splitted onto NAS and OAS parts, and both Attachment[] and AttachmentPoints must be checked disregarding the NAS option.
---
 Tactical/Items.cpp | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index dd56f7f7..8212c736 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -5667,36 +5667,31 @@ UINT64 SetAttachmentSlotsFlag(OBJECTTYPE* pObj)
 	if (pObj->exists() == false)
 		return 0;
 
-	if (UsingNewAttachmentSystem())
+	std::pair<std::multimap<UINT16, AttachmentStruct>::iterator, std::multimap<UINT16, AttachmentStruct>::iterator> range;
+	std::multimap<UINT16, AttachmentStruct>::iterator it;
+	range = AttachmentBackmap.equal_range(pObj->usItem);
+	for (it = range.first; it != range.second; it++)
 	{
-		std::pair<std::multimap<UINT16, AttachmentStruct>::iterator, std::multimap<UINT16, AttachmentStruct>::iterator> range;
-		std::multimap<UINT16, AttachmentStruct>::iterator it;
-		range = AttachmentBackmap.equal_range(pObj->usItem);
-		for (it = range.first; it != range.second; it++)
+		UINT16 attachmentId = it->second.attachmentIndex;
+		if (ItemIsLegal(attachmentId, TRUE))
+			uiSlotFlag |= Item[attachmentId].nasAttachmentClass;
+	}
+
+	for (UINT32 i = 0; i < gMAXLAUNCHABLES_READ; i++)
+	{
+		if (Launchable[i][1] == pObj->usItem)
 		{
-			UINT16 attachmentId = it->second.attachmentIndex;
+			UINT16 attachmentId = Launchable[i][0];
 			if (ItemIsLegal(attachmentId, TRUE))
 				uiSlotFlag |= Item[attachmentId].nasAttachmentClass;
 		}
-
-		for (UINT32 i = 0; i < gMAXLAUNCHABLES_READ; i++)
-		{
-			if (Launchable[i][1] == pObj->usItem)
-			{
-				UINT16 attachmentId = Launchable[i][0];
-				if (ItemIsLegal(attachmentId, TRUE))
-					uiSlotFlag |= Item[attachmentId].nasAttachmentClass;
-			}
-		}
 	}
-	else
+
+	UINT64 point = GetAvailableAttachmentPoint(pObj, 0);
+	for (UINT32 itemId = 1; itemId < gMAXITEMS_READ; itemId++)
 	{
-		UINT64 point = GetAvailableAttachmentPoint(pObj, 0);
-		for (UINT32 itemId = 1; itemId < gMAXITEMS_READ; itemId++)
-		{
-			if (ItemIsLegal(itemId, TRUE) && IsAttachmentPointAvailable(point, itemId, TRUE))
-				uiSlotFlag |= Item[itemId].nasAttachmentClass;
-		}
+		if (IsAttachmentPointAvailable(point, itemId, TRUE))
+			uiSlotFlag |= Item[itemId].nasAttachmentClass;
 	}
 
 	return uiSlotFlag;