mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +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:
+3
-4
@@ -194,9 +194,8 @@ BOOLEAN KeyExistsInKeyRing( SOLDIERTYPE *pSoldier, UINT8 ubKeyID, UINT8 * pubPos
|
||||
|
||||
BOOLEAN KeyExistsInInventory( SOLDIERTYPE *pSoldier, UINT8 ubKeyID )
|
||||
{
|
||||
UINT8 ubLoop;
|
||||
|
||||
for (ubLoop = 0; ubLoop < pSoldier->inv.size(); ubLoop++)
|
||||
UINT8 invsize = pSoldier->inv.size();
|
||||
for (UINT8 ubLoop = 0; ubLoop < invsize; ++ubLoop)
|
||||
{
|
||||
if (Item[pSoldier->inv[ubLoop].usItem].usItemClass == IC_KEY)
|
||||
{
|
||||
@@ -742,7 +741,7 @@ BOOLEAN AttemptToBlowUpLock( SOLDIERTYPE * pSoldier, DOOR * pDoor )
|
||||
}
|
||||
|
||||
// Flugente: flat bonus to using door breaching charges
|
||||
iResult = SkillCheck( pSoldier, PLANTING_BOMB_CHECK, pSoldier->GetBackgroundValue(BG_BONUS_BREACHINGCHARGE) );
|
||||
iResult = SkillCheck( pSoldier, PLANTING_BOMB_CHECK, (INT8)pSoldier->GetBackgroundValue(BG_BONUS_BREACHINGCHARGE) );
|
||||
if (iResult >= -20)
|
||||
{
|
||||
// Do explosive graphic....
|
||||
|
||||
Reference in New Issue
Block a user