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
Strategic/Auto Resolve.cpp
+7 -3
View File
@@ -4256,7 +4256,9 @@ BOOLEAN FireAShot( SOLDIERCELL *pAttacker )
pAttacker->bWeaponSlot = SECONDHANDPOS;
return TRUE;
}
for( UINT32 i = 0; i < pSoldier->inv.size(); i++ )
UINT8 invsize = pSoldier->inv.size();
for( UINT8 i = 0; i < invsize; ++i )
{
pItem = &pSoldier->inv[ i ];
@@ -4297,7 +4299,8 @@ BOOLEAN FireAShot( SOLDIERCELL *pAttacker )
BOOLEAN AttackerHasKnife( SOLDIERCELL *pAttacker )
{
for( UINT32 i = 0; i < pAttacker->pSoldier->inv.size(); i++ )
UINT8 invsize = pAttacker->pSoldier->inv.size();
for( UINT8 i = 0; i < invsize; ++i )
{
if( Item[ pAttacker->pSoldier->inv[ i ].usItem ].usItemClass == IC_BLADE )
{
@@ -4312,7 +4315,8 @@ BOOLEAN AttackerHasKnife( SOLDIERCELL *pAttacker )
BOOLEAN TargetHasLoadedGun( SOLDIERTYPE *pSoldier )
{
OBJECTTYPE *pItem;
for( UINT32 i = 0; i < pSoldier->inv.size(); i++ )
UINT8 invsize = pSoldier->inv.size();
for( UINT8 i = 0; i < invsize; ++i )
{
pItem = &pSoldier->inv[ i ];
if( Item[ pItem->usItem ].usItemClass == IC_GUN )