1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

simplify SOLDIERTYPE::GetDiseaseContactProtection( )

Browse Source
This commit is contained in:
Marco Costa
2024-04-03 22:09:05 -03:00
committed by majcosta
parent 049ec47219
commit dee2415d4a
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+7 -10
View File
@@ -19938,22 +19938,19 @@ FLOAT SOLDIERTYPE::GetDiseaseContactProtection( )
// if we wear special equipment, lower our chances of being infected // if we wear special equipment, lower our chances of being infected
FLOAT bestfacegear = 0.0f; FLOAT bestfacegear = 0.0f;
FLOAT bestprotectivegear = 0.0f; FLOAT bestprotectivegear = 0.0f;
INT8 invsize = (INT8)inv.size( ); // remember inventorysize, so we don't call size() repeatedly for ( const auto &item : inv.get() )
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
{ {
if ( inv[bLoop].exists( ) ) if ( item.exists( ) )
{ {
OBJECTTYPE* pObj = &(inv[bLoop]); if ( item[0]->data.objectStatus >= USABLE )
if ( pObj && (*pObj)[0]->data.objectStatus >= USABLE )
{ {
if ( HasItemFlag( pObj->usItem, DISEASEPROTECTION_1 ) ) if ( HasItemFlag( item.usItem, DISEASEPROTECTION_1 ) )
{ {
bestfacegear = max( bestfacegear, (FLOAT)((*pObj)[0]->data.objectStatus / 100) ); bestfacegear = max( bestfacegear, (FLOAT)(item[0]->data.objectStatus / 100) );
} }
if ( HasItemFlag( pObj->usItem, DISEASEPROTECTION_2 ) ) if ( HasItemFlag( item.usItem, DISEASEPROTECTION_2 ) )
{ {
bestprotectivegear = max( bestprotectivegear, (FLOAT)((*pObj)[0]->data.objectStatus / 100) ); bestprotectivegear = max( bestprotectivegear, (FLOAT)(item[0]->data.objectStatus / 100) );
} }
} }
} }