From b997811a5dc34fab5e009182c89cab2bfd3d184d Mon Sep 17 00:00:00 2001
From: Kriplo <Kriplo@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 9 Nov 2013 20:55:11 +0000
Subject: [PATCH] -in previous version committed wrong files :-}

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Interface Items.cpp | 10 +++++-----
 Tactical/Items.cpp           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index fe14d89db..3ff1e0da1 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -2860,7 +2860,7 @@ void HandleAnyMercInSquadHasCompatibleStuff( UINT8 ubSquad, OBJECTTYPE *pObject,
 
 }
 
-BOOLEAN IsMutuallyValidAttachmentOrLaunchable(UINT16 usAttItem, UINT16 usItem)//dnl??? ch76 091113
+BOOLEAN IsMutuallyValidAttachmentOrLaunchable(UINT16 usAttItem, UINT16 usItem)//dnl ch76 091113
 {
 	UINT32 uiLoop = 0;
 	while(Attachment[uiLoop][0] | Launchable[uiLoop][0])
@@ -2958,7 +2958,7 @@ BOOLEAN HandleCompatibleAmmoUIForMapScreen( SOLDIERTYPE *pSoldier, INT32 bInvPos
 				// don't consider for UI purposes
 				continue;
 			}
-#if 0//dnl??? ch76 091113
+#if 0//dnl ch76 091113
 			if ( ValidAttachment( pObject->usItem, pTestObject ) ||
 					 ValidAttachment( pTestObject->usItem, pObject ) ||
 					 ValidLaunchable( pTestObject->usItem, pObject->usItem ) ||
@@ -3068,7 +3068,7 @@ BOOLEAN HandleCompatibleAmmoUIForMapInventory( SOLDIERTYPE *pSoldier, INT32 bInv
 			// don't consider for UI purposes
 			continue;
 		}
-#if 0//dnl??? ch76 091113
+#if 0//dnl ch76 091113
 		if ( ValidAttachment( pObject->usItem, pTestObject ) ||
 				 ValidAttachment( pTestObject->usItem, pObject ) ||
 				 ValidLaunchable( pTestObject->usItem, pObject->usItem ) ||
@@ -5522,7 +5522,7 @@ void UpdateAttachmentTooltips(OBJECTTYPE *pObject, UINT8 ubStatusIndex)
 	std::vector<UINT16>	usAttachmentSlotIndexVector = GetItemSlots(pObject);
 	UINT64		point = GetAvailableAttachmentPoint(pObject, 0); //Madd: Common Attachment Framework
 
-	//dnl??? ch76 081113
+	//dnl ch76 081113
 	std::vector<UINT16> attachedList;
 	for(UINT8 x=0; x<(*pObject)[ubStatusIndex]->attachments.size(); x++)// attached item list rather create here then inside loop to gain performance
 	{
@@ -5625,7 +5625,7 @@ void UpdateAttachmentTooltips(OBJECTTYPE *pObject, UINT8 ubStatusIndex)
 					}
 					else
 					{	//search for attachments/launchables made valid by other attachments
-#if 0//dnl??? ch76 081113
+#if 0//dnl ch76 081113
 						for(UINT8 x=0; x<(*pObject)[ubStatusIndex]->attachments.size(); x++)
 						{
 							OBJECTTYPE* pAttachment2 = (*pObject)[ubStatusIndex]->GetAttachmentAtIndex(x);
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 96f7c8ec4..70d3adcfe 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -2324,7 +2324,7 @@ BOOLEAN ValidItemAttachmentSlot( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN
 	//Do we want to check all attachment slots or just the one in slotcount?
 	if(slotCount == -1){
 		//Loop through slots
-		UINT32 uiSlots = min((*pObj)[subObject]->attachments.size(), usAttachmentSlotIndexVector.size());//dnl??? ch76 091113 ugly fix as AK74 after attach/remove GL will have more attachments then usAttachmentSlotIndexVector which lead to CTD
+		UINT32 uiSlots = min((*pObj)[subObject]->attachments.size(), usAttachmentSlotIndexVector.size());//dnl ch76 091113 ugly fix as AK74 after attach/remove GL will have more attachments then usAttachmentSlotIndexVector which lead to CTD
 		for(UINT8 curSlot = 0; curSlot < uiSlots && !foundValidAttachment; curSlot++){
 			//Any attachment that is already in this slot will go here.
 			OBJECTTYPE * pAttachment;