From 5e4d587baf9ca19916a9c80b294f39cf6c5f521e Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sun, 27 Jun 2021 02:36:46 +0000 Subject: [PATCH] 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 --- Tactical/Items.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 636de6a3e..ded638d9f 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -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() )