1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide asterisk for attachments when hiddenAttachment tag = 1

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2012-05-01 02:41:11 +00:00
parent dbe87b94b1
commit 83c47e0c6b
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+28 -7
View File
@@ -2009,21 +2009,42 @@ OBJECTTYPE* FindNonSmokeLaunchableAttachment( OBJECTTYPE * pObj, UINT16 usWeapon
return( FindLaunchableAttachment(pObj,usWeapon) ); return( FindLaunchableAttachment(pObj,usWeapon) );
} }
//Simple check to see if the item has any attachments //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 ItemHasAttachments( OBJECTTYPE * pObj, SOLDIERTYPE * pSoldier, UINT8 iter )
{ {
BOOLEAN attachmentHidden = TRUE;
if (pObj->exists() == true) { if (pObj->exists() == true) {
if(pSoldier != NULL){ if(pSoldier != NULL){
for (iter = 0; iter != pObj->objectStack.size(); ++iter) { for (iter = 0; iter != pObj->objectStack.size(); ++iter)
if((*pObj)[iter]->AttachmentListSize() > 0){ {
return TRUE; 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{ else
if((*pObj)[iter]->AttachmentListSize() > 0){ {
return TRUE; 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;
} }
} }
} }