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

- Inventory Lag Fix for attachments: Just filter out anything that's not an attachment, thereby skipping over the slow parts (by Madd Mugsy)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-05-11 09:55:22 +00:00
parent b161b73611
commit 1ad5b96931
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Items.cpp
+7 -2
View File
@@ -3067,17 +3067,22 @@ BOOLEAN InternalHandleCompatibleAmmoUI( SOLDIERTYPE *pSoldier, OBJECTTYPE *pTest
pObject = &(pSoldier->inv[ cnt ]); pObject = &(pSoldier->inv[ cnt ]);
// if ( Item[ pObject->usItem ].fFlags & ITEM_HIDDEN_ADDON ) // 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 // don't consider for UI purposes
continue; continue;
} }
if ( (UsingNewAttachmentSystem()==false && ValidAttachment( pObject->usItem, pTestObject )) || /*if ( (UsingNewAttachmentSystem()==false && ValidAttachment( pObject->usItem, pTestObject )) ||
(UsingNewAttachmentSystem()==false && ValidAttachment( pTestObject->usItem, pObject )) || (UsingNewAttachmentSystem()==false && ValidAttachment( pTestObject->usItem, pObject )) ||
(UsingNewAttachmentSystem()==true && ValidItemAttachmentSlot(pTestObject, pObject->usItem, FALSE, FALSE, 0, cnt)) || (UsingNewAttachmentSystem()==true && ValidItemAttachmentSlot(pTestObject, pObject->usItem, FALSE, FALSE, 0, cnt)) ||
(UsingNewAttachmentSystem()==true && ValidItemAttachmentSlot(pObject, pTestObject->usItem, FALSE, FALSE, 0, cnt)) || (UsingNewAttachmentSystem()==true && ValidItemAttachmentSlot(pObject, pTestObject->usItem, FALSE, FALSE, 0, cnt)) ||
ValidLaunchable( pTestObject->usItem, pObject->usItem ) || 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 ) ) ValidLaunchable( pObject->usItem, pTestObject->usItem ) )
{ {
fFoundAttachment = TRUE; fFoundAttachment = TRUE;