mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Improve loading speed of stash (by Moa)
- improved processing of sector stash (opening/closing) - improved loading speed of save games - improved processing of items droped by militia (most noteable after autoresolve) - and some other code related changes see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/325332/FIX_improve_loading_speed_of_s.html#Post325332 Notes: removed some functions, still in code so but renamed to *_OLD() because they are from Sirtech and should be kept as I have read in "§18) If possible, we don't just delete the old code, but comment it out (or #ifdef it out) for reference. We delete it only if it's really necessary." git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -820,7 +820,12 @@ BOOLEAN AddItemsToUnLoadedSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ, INT32 sG
|
||||
WORLDITEM *pWorldItems;
|
||||
UINT32 cnt;
|
||||
UINT32 uiLoop1=0;
|
||||
|
||||
|
||||
if ( uiNumberOfItemsToAdd == 0 && fReplaceEntireFile == FALSE )
|
||||
{
|
||||
//Moa: nothing to do, so get out of here!
|
||||
return( TRUE );
|
||||
}
|
||||
|
||||
if( !GetNumberOfWorldItemsFromTempItemFile( sMapX, sMapY, bMapZ, &uiNumberOfItems, TRUE ) )
|
||||
{
|
||||
@@ -3364,26 +3369,28 @@ void SetNumberOfVisibleWorldItemsInSectorStructureForSector( INT16 sMapX, INT16
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Moa 09/19/13: changed loop upperbound from uiTotalNumberOfRealItems to uiTotalNumberOfItems,
|
||||
// this effectivly removes one entire loop in GetNumberOfActiveWorldItemsFromTempFile and 2 file reads.
|
||||
// also changed type of iCounter from INT32 to UINT32 and for in if-clauses from true to TRUE to get rid of unneccessary casts.
|
||||
void SynchronizeItemTempFileVisbleItemsToSectorInfoVisbleItems( INT16 sMapX, INT16 sMapY, INT8 bMapZ, BOOLEAN fLoadingGame )
|
||||
{
|
||||
UINT32 uiTotalNumberOfItems = 0, uiTotalNumberOfRealItems = 0;
|
||||
UINT32 uiTotalNumberOfItems = 0;//, uiTotalNumberOfRealItems = 0;
|
||||
WORLDITEM * pTotalSectorList = NULL;
|
||||
UINT32 uiItemCount = 0;
|
||||
INT32 iCounter = 0;
|
||||
UINT32 iCounter = 0;
|
||||
BOOLEAN fReturn;
|
||||
|
||||
|
||||
/*
|
||||
// get total number, visable and invisible
|
||||
fReturn = GetNumberOfActiveWorldItemsFromTempFile( sMapX, sMapY, bMapZ, &( uiTotalNumberOfRealItems ) );
|
||||
if (fReturn == false)
|
||||
if (fReturn == TRUE)
|
||||
{
|
||||
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("GetNumberOfActiveWorldItemsFromTempFile failed" ) );
|
||||
Assert( fReturn );
|
||||
}
|
||||
}*/
|
||||
|
||||
fReturn = GetNumberOfWorldItemsFromTempItemFile( sMapX, sMapY, bMapZ, &( uiTotalNumberOfItems ), FALSE );
|
||||
if (fReturn == false)
|
||||
if (fReturn == TRUE)
|
||||
{
|
||||
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("GetNumberOfWorldItemsFromTempItemFile failed" ) );
|
||||
Assert( fReturn );
|
||||
@@ -3399,7 +3406,8 @@ void SynchronizeItemTempFileVisbleItemsToSectorInfoVisbleItems( INT16 sMapX, INT
|
||||
}
|
||||
|
||||
// now run through list and
|
||||
for( iCounter = 0; ( UINT32 )( iCounter )< uiTotalNumberOfRealItems; iCounter++ )
|
||||
//for( iCounter = 0; ( UINT32 )( iCounter )< uiTotalNumberOfRealItems; iCounter++ )
|
||||
for( iCounter = 0; iCounter < uiTotalNumberOfItems; iCounter++ )
|
||||
{
|
||||
// if visible to player, then state fact
|
||||
if( IsMapScreenWorldItemVisibleInMapInventory( &pTotalSectorList[ iCounter ] ) )
|
||||
|
||||
Reference in New Issue
Block a user