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

- 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
+2 -2
View File
@@ -990,7 +990,8 @@ BOOLEAN TurnSoldierIntoCorpse( SOLDIERTYPE *pSoldier, BOOLEAN fRemoveMerc, BOOLE
else
{
// OK, Place what objects this guy was carrying on the ground!
for ( cnt = 0; cnt < pSoldier->inv.size(); ++cnt )
UINT32 invsize = pSoldier->inv.size();
for ( cnt = 0; cnt < invsize; ++cnt )
{
pObj = &( pSoldier->inv[ cnt ] );
@@ -2414,7 +2415,6 @@ void ReduceAmmoDroppedByNonPlayerSoldiers( SOLDIERTYPE *pSoldier, INT32 iInvSlot
Assert( pSoldier );
Assert( ( iInvSlot >= 0 ) && ( iInvSlot < (INT32)pSoldier->inv.size() ) );
// if not a player soldier
if ( pSoldier->bTeam != gbPlayerNum )
{