From 1ad5b96931c965c8a427c874ff7e7177976b72e9 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 11 May 2012 09:55:22 +0000 Subject: [PATCH] - Inventory Lag Fix for attachments: Just filter out anything that's not an attachment, thereby skipping over the slow parts (by Madd Mugsy) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5269 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 3f05cada..04b4dcd4 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -3067,17 +3067,22 @@ BOOLEAN InternalHandleCompatibleAmmoUI( SOLDIERTYPE *pSoldier, OBJECTTYPE *pTest pObject = &(pSoldier->inv[ cnt ]); // if ( Item[ pObject->usItem ].fFlags & ITEM_HIDDEN_ADDON ) - if ( Item[ pObject->usItem ].hiddenaddon ) +// if ( Item[ pObject->usItem ].hiddenaddon ) + if ( Item[ pObject->usItem ].hiddenaddon || (!Item[pObject->usItem].attachment && !Item[pTestObject->usItem].attachment) ) { // don't consider for UI purposes continue; } - if ( (UsingNewAttachmentSystem()==false && ValidAttachment( pObject->usItem, pTestObject )) || + /*if ( (UsingNewAttachmentSystem()==false && ValidAttachment( pObject->usItem, pTestObject )) || (UsingNewAttachmentSystem()==false && ValidAttachment( pTestObject->usItem, pObject )) || (UsingNewAttachmentSystem()==true && ValidItemAttachmentSlot(pTestObject, pObject->usItem, FALSE, FALSE, 0, cnt)) || (UsingNewAttachmentSystem()==true && ValidItemAttachmentSlot(pObject, pTestObject->usItem, FALSE, FALSE, 0, cnt)) || ValidLaunchable( pTestObject->usItem, pObject->usItem ) || + ValidLaunchable( pObject->usItem, pTestObject->usItem ) )*/ + if ( (ValidAttachment( pObject->usItem, pTestObject )) || + (ValidAttachment( pTestObject->usItem, pObject )) || + ValidLaunchable( pTestObject->usItem, pObject->usItem ) || ValidLaunchable( pObject->usItem, pTestObject->usItem ) ) { fFoundAttachment = TRUE;