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

Merged revision(s) 6826-6828 from branches/ja2_source_official_2014:

Browse Source 
- Minor code improvements and cleanup
- Fix from r6775 is no longer necessary.
- Code improvement: Instead of calling inv.size() repeatedly, just call it once and remember that value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-26 12:18:43 +00:00
parent d4aa35a66e
commit d6186aca15
34 changed files with 677 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/mercs Files.cpp
+6 -3
View File
@@ -1622,7 +1622,8 @@ BOOLEAN DisplayMERCMercsInventory(UINT8 ubMercID)
MSYS_DisableRegion(&gMercWeaponboxFasthelpRegion[i]);
}
for(i=0; i<gMercProfiles[ubMercID].inv.size(); i++)
UINT8 invsize = gMercProfiles[ ubMercID ].inv.size();
for(i=0; i<invsize; ++i)
{
usItem = gMercProfiles[ubMercID].inv[ i ];
@@ -1807,7 +1808,8 @@ void MercWeaponKitSelectionUpdate(UINT8 selectedInventory)
gMercProfiles[ubMercID].bMainGunAttractiveness = -1;
gMercProfiles[ubMercID].bArmourAttractiveness = -1;
for ( uiLoop = 0; uiLoop < gMercProfiles[ubMercID].inv.size(); uiLoop++ )
UINT32 invsize = gMercProfiles[ ubMercID ].inv.size();
for ( uiLoop = 0; uiLoop < invsize; ++uiLoop )
{
usItem = gMercProfiles[ubMercID].inv[ uiLoop ];
@@ -1838,7 +1840,8 @@ void MercWeaponKitSelectionUpdate(UINT8 selectedInventory)
else
{
UINT16 tempGearCost = 0;
for ( uiLoop = 0; uiLoop< gMercProfiles[ ubMercID ].inv.size(); uiLoop++ )
UINT32 invsize = gMercProfiles[ ubMercID ].inv.size();
for ( uiLoop = 0; uiLoop< invsize; ++uiLoop )
{
if ( gMercProfiles[ ubMercID ].inv[ uiLoop ] != NOTHING )
{