fixed: KAC masterkey and other items without attachment flag to work

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9110 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-06-27 02:36:46 +00:00
parent 143711f1ac
commit 5e4d587baf
+2 -3
View File
@@ -2295,9 +2295,8 @@ BOOLEAN ValidAttachment( UINT16 usAttachment, OBJECTTYPE * pObj, UINT8 * pubAPCo
return FALSE;
// shadooow: efficiency check, we are passing all kinds of items into this function that are not necessary attachments at all
if (!Item[usAttachment].attachment &&
!Item[usAttachment].hiddenaddon &&
!((Item[usAttachment].usItemClass & IC_GUN) && Item[pObj->usItem].tripwire))
if (!Item[usAttachment].attachment && !Item[usAttachment].attachmentclass && !Item[usAttachment].nasAttachmentClass &&
!Item[usAttachment].hiddenaddon && !((Item[usAttachment].usItemClass & IC_GUN) && Item[pObj->usItem].tripwire))
return FALSE;
if( UsingNewAttachmentSystem() )