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
+3 -2
View File
@@ -1141,7 +1141,8 @@ void ReevaluateItemHatches( SOLDIERTYPE *pSoldier, BOOLEAN fAllValid )
if ( ( gpItemPointer != NULL ) && !fAllValid )
{
// check all inventory positions and mark the ones where cursor item won't fit as invalid
for ( cnt = 0; cnt < pSoldier->inv.size(); cnt++ )
UINT32 invsize = pSoldier->inv.size();
for ( cnt = 0; cnt < invsize; ++cnt )
{
gbInvalidPlacementSlot[ cnt ] = !CanItemFitInPosition( pSoldier, gpItemPointer, (INT8)cnt, FALSE );
@@ -1165,7 +1166,7 @@ void ReevaluateItemHatches( SOLDIERTYPE *pSoldier, BOOLEAN fAllValid )
else
{
// mark all inventory positions as valid
for ( cnt = 0; cnt < NUM_INV_SLOTS; cnt++ )
for ( cnt = 0; cnt < NUM_INV_SLOTS; ++cnt )
{
gbInvalidPlacementSlot[ cnt ] = FALSE;
}