From 83c47e0c6b4f841c104abdcf8afb5638c818dde5 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 1 May 2012 02:41:11 +0000
Subject: [PATCH] Hide asterisk for attachments when hiddenAttachment tag = 1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Items.cpp | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 31444b613..7d53ced8e 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -2009,21 +2009,42 @@ OBJECTTYPE* FindNonSmokeLaunchableAttachment( OBJECTTYPE * pObj, UINT16 usWeapon
 	return( FindLaunchableAttachment(pObj,usWeapon) );
 }
 
-
 //Simple check to see if the item has any attachments
+//Madd: if there are only hidden attachments this will now return false, so the asterisk won't be display if the hiddenAttachment tag is true
 BOOLEAN ItemHasAttachments( OBJECTTYPE * pObj, SOLDIERTYPE * pSoldier, UINT8 iter )
 {
+	BOOLEAN attachmentHidden = TRUE;
 	if (pObj->exists() == true) {
 		if(pSoldier != NULL){
-			for (iter = 0; iter != pObj->objectStack.size(); ++iter) {
-				if((*pObj)[iter]->AttachmentListSize() > 0){
-					return TRUE;
+			for (iter = 0; iter != pObj->objectStack.size(); ++iter) 
+			{
+				if((*pObj)[iter]->AttachmentListSize() > 0)
+				{
+					for(attachmentList::iterator att = (*pObj)[iter]->attachments.begin(); att != (*pObj)[iter]->attachments.end(); ++att)
+					{
+						if ( att->usItem != 0 && !Item[att->usItem].hiddenattachment )
+						{
+							attachmentHidden = FALSE;
+							break;
+						}
+					}
+					return !attachmentHidden;
 				}
 			}
 		}
-		else{
-			if((*pObj)[iter]->AttachmentListSize() > 0){
-				return TRUE;
+		else
+		{
+			if((*pObj)[iter]->AttachmentListSize() > 0)
+			{
+				for(attachmentList::iterator att = (*pObj)[iter]->attachments.begin(); att != (*pObj)[iter]->attachments.end(); ++att)
+				{
+					if ( att->usItem != 0 && !Item[att->usItem].hiddenattachment )
+					{
+						attachmentHidden = FALSE;
+						break;
+					}
+				}
+				return !attachmentHidden;
 			}
 		}
 	}