From a57cc79c831a3ddf6b2a7df26703495fc9e0a8ee Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 11 Jan 2022 01:11:50 +0000 Subject: [PATCH] enabled new attachments to be shown even without EDB for all items except LBE gear git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9239 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index abe22e0d..3dcfd4e8 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -1065,7 +1065,7 @@ BOOLEAN UseNASDesc(OBJECTTYPE *pObject){ if(pObject->exists() == FALSE) return FALSE; // silversurfer: We allow it now but only in EDB. - if(guiCurrentScreen == MAP_SCREEN && !UsingEDBSystem() ) //Item[pObject->usItem].usItemClass == IC_LBEGEAR && UsingNewAttachmentSystem()==true && gGameSettings.fOptions[TOPTION_SHOW_LBE_CONTENT]) + if(guiCurrentScreen == MAP_SCREEN && !UsingEDBSystem() && Item[pObject->usItem].usItemClass & IC_LBEGEAR) //Item[pObject->usItem].usItemClass == IC_LBEGEAR && UsingNewAttachmentSystem()==true && gGameSettings.fOptions[TOPTION_SHOW_LBE_CONTENT]) return FALSE; // the map screen can't support NAS and LBEGEAR. return (/*Item[pObject->usItem].usItemClass != IC_LBEGEAR && Item[pObject->usItem].usItemClass != IC_MONEY && */UsingNewAttachmentSystem()==true); }