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
Tactical/Soldier Profile.cpp
+7 -4
View File
@@ -882,7 +882,8 @@ BOOLEAN LoadMercProfiles(void)
gMercProfiles[uiLoop].bMainGunAttractiveness = -1;
gMercProfiles[uiLoop].bArmourAttractiveness = -1;
for ( uiLoop2 = 0; uiLoop2 < gMercProfiles[uiLoop].inv.size(); uiLoop2++ )
UINT32 invsize = gMercProfiles[ uiLoop ].inv.size();
for ( uiLoop2 = 0; uiLoop2 < invsize; ++uiLoop2 )
{
usItem = gMercProfiles[uiLoop].inv[ uiLoop2 ];
@@ -933,7 +934,7 @@ BOOLEAN LoadMercProfiles(void)
//with old binary file optional gear prices which got ported into MercProfiles.xml
gMercProfiles[ uiLoop ].usOptionalGearCost = 0;
UINT16 tempGearCost = 0;
for ( uiLoop2 = 0; uiLoop2< gMercProfiles[ uiLoop ].inv.size(); uiLoop2++ )
for ( uiLoop2 = 0; uiLoop2< invsize; ++uiLoop2 )
{
if ( gMercProfiles[ uiLoop ].inv[ uiLoop2 ] != NOTHING )
{
@@ -1771,15 +1772,17 @@ SOLDIERTYPE *ChangeSoldierTeam( SOLDIERTYPE *pSoldier, UINT8 ubTeam )
//if(UsingNewInventorySystem() == true)
{
// Start by direct copy of all BODYPOS items (armor, hands, head and LBE)
for(cnt = 0; cnt < (UINT32)BODYPOSFINAL; cnt++)
for(cnt = 0; cnt < (UINT32)BODYPOSFINAL; ++cnt)
{
pNewSoldier->inv[cnt] = pSoldier->inv[cnt];
}
// Next, direct copy of the gunsling and knife pockets
pNewSoldier->inv[GUNSLINGPOCKPOS] = pSoldier->inv[GUNSLINGPOCKPOS];
pNewSoldier->inv[KNIFEPOCKPOS] = pSoldier->inv[KNIFEPOCKPOS];
// Then, try to autoplace everything else
for(cnt = BIGPOCKSTART; cnt < pNewSoldier->inv.size(); cnt++ )
UINT32 invsize = pNewSoldier->inv.size();
for(cnt = BIGPOCKSTART; cnt < invsize; ++cnt )
{
if(pSoldier->inv[cnt].exists() == true)
{