1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

If the itemlist is huge and one uses New Inventory System, New Attachment System and a lot of MOLLE items, there is a noticable slowdown if inventory is open in tactical. I cleaned up code to ease that somewhat, but the problem will likely persist.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-10-19 21:53:05 +00:00
parent 5dbcf2a1e8
commit 499ff2db06
24 changed files with 674 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map Inventory.cpp
+5 -5
View File
@@ -2054,10 +2054,10 @@ void BuildStashForSelectedSector( INT16 sMapX, INT16 sMapY, INT16 sMapZ )
// was temporay used to get #items in file, now count what actually is added
fNumTotal = 0;
// now run through list and copy reference
for(UINT32 i = 0; i < fWorldItems.size(); i++ )
for(UINT32 i = 0; i < fWorldItems.size(); ++i )
{
// TEST!! If the item exists, and is NOT VALID, report it
if( fWorldItems[i].fExists && fWorldItems[ i ].object.usItem > MAXITEMS )
if( fWorldItems[i].fExists && fWorldItems[ i ].object.usItem > gMAXITEMS_READ )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_BETAVERSION, L"The %d item in the list is NOT valid (ID%d). Please send save. DF 1.", i, fWorldItems[i].object.usItem );
}
@@ -4744,7 +4744,7 @@ void SortSectorInventoryAmmo(bool useBoxes)
while (ammoPresent && loopCount <= 10 )
{
// Start scanning through the entire Sector Inventory pool.
for(UINT32 iInvCounter = 0; iInvCounter < uiOrigInvSize; iInvCounter++)
for(UINT32 iInvCounter = 0; iInvCounter < uiOrigInvSize; ++iInvCounter)
{
// Set values
crateItem = 0;
@@ -4770,7 +4770,7 @@ void SortSectorInventoryAmmo(bool useBoxes)
// as possible into crates.
// Look through all items in the game to try and find an ammocrate that can contain this kind of ammo.
for(int iCrateLoop = 0; iCrateLoop < MAXITEMS; iCrateLoop++)
for ( int iCrateLoop = 0; iCrateLoop < gMAXITEMS_READ; ++iCrateLoop )
{
// Is it the right ammo crate?
if( Item[iCrateLoop].usItemClass == IC_AMMO &&
@@ -4788,7 +4788,7 @@ void SortSectorInventoryAmmo(bool useBoxes)
if(crateItem != 0)
{
// Excellent. Let see if a crate like this already exists in the Sector Inventory.
for(UINT32 iInvCounter2=0; iInvCounter2 < pInventoryPoolList.size(); iInvCounter2++)
for(UINT32 iInvCounter2=0; iInvCounter2 < pInventoryPoolList.size(); ++iInvCounter2)
{
// Non-empty slots please...
if(pInventoryPoolList[iInvCounter2].object.exists() == true)