Convert MapScreenCharacterSt::usSolID to SoldierID

This commit is contained in:
Asdow
2024-11-17 01:25:00 +02:00
parent 2918801f75
commit c475f9e4e6
14 changed files with 331 additions and 318 deletions
+6 -6
View File
@@ -357,7 +357,7 @@ void UpdateStrategicDetectionLevel( )
// Run through list of player-characters
while(gCharactersList[ubCounter].fValid)
{
pSoldier = MercPtrs[ gCharactersList[ ubCounter ].usSolID ];
pSoldier = gCharactersList[ ubCounter ].usSolID;
// Is character truly valid?
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) &&
@@ -499,7 +499,7 @@ void UpdateSkyriderCostModifier()
while(gCharactersList[ubCounter].fValid)
{
pSoldier = MercPtrs[ gCharactersList[ ubCounter ].usSolID ];
pSoldier = gCharactersList[ ubCounter ].usSolID;
// Is character truly valid?
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) &&
@@ -562,7 +562,7 @@ void UpdateFacilityUsageCosts( )
while(gCharactersList[ubCounter].fValid)
{
pSoldier = MercPtrs[ gCharactersList[ ubCounter ].usSolID ];
pSoldier = gCharactersList[ ubCounter ].usSolID;
// Is character truly valid?
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) &&
@@ -704,7 +704,7 @@ INT32 MineIncomeModifierFromFacility( UINT8 ubMine )
UINT8 ubCounter = 0;
while (gCharactersList[ubCounter].fValid)
{
pSoldier = MercPtrs[ gCharactersList[ ubCounter ].usSolID ];
pSoldier = gCharactersList[ ubCounter ].usSolID;
// Is character truly valid?
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) &&
@@ -1112,7 +1112,7 @@ void HandleHourlyRisks()
while (gCharactersList[iCounter].fValid)
{
pSoldier = MercPtrs[ gCharactersList[ iCounter ].usSolID ];
pSoldier = gCharactersList[ iCounter ].usSolID;
// Is character truly valid?
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) &&
@@ -1994,7 +1994,7 @@ INT32 GetTotalFacilityHourlyCosts( BOOLEAN fPositive )
// Run through list of player-characters
while(gCharactersList[ubCounter].fValid)
{
pSoldier = MercPtrs[ gCharactersList[ ubCounter ].usSolID ];
pSoldier = gCharactersList[ ubCounter ].usSolID;
// Is character truly valid?
if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) &&