mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
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:
@@ -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 )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user