Move MercSlots zeroing to same loop where MercPtrs are set

One less for loop that way
This commit is contained in:
Asdow
2024-11-13 22:12:37 +02:00
parent 4d740055da
commit f5b1447646
+3 -6
View File
@@ -674,13 +674,15 @@ void ShutdownTacticalEngine( )
BOOLEAN InitOverhead( ) BOOLEAN InitOverhead( )
{ {
UINT32 cnt; UINT32 cnt;
UINT16 cnt2; UINT16 cnt2;
// Set pointers list // Set pointers list
for( cnt = 0; cnt < TOTAL_SOLDIERS; cnt++ ) for( cnt = 0; cnt < TOTAL_SOLDIERS; cnt++ )
{ {
MercPtrs[ cnt ] = &Menptr[ cnt ]; MercPtrs[ cnt ] = &Menptr[ cnt ];
MercPtrs[ cnt ]->bActive = FALSE; MercPtrs[ cnt ]->bActive = FALSE;
// Zero out merc slots!
MercSlots[cnt] = NULL;
} }
memset( &gTacticalStatus, 0, sizeof( TacticalStatusType ) ); memset( &gTacticalStatus, 0, sizeof( TacticalStatusType ) );
UINT8 maxteams; UINT8 maxteams;
@@ -774,11 +776,6 @@ BOOLEAN InitOverhead( )
} }
} }
// Zero out merc slots!
for ( cnt = 0; cnt < TOTAL_SOLDIERS; cnt++ )
{
MercSlots[ cnt ] = NULL;
}
// Set other tactical flags // Set other tactical flags
gTacticalStatus.uiFlags = TURNBASED | TRANSLUCENCY_TYPE; gTacticalStatus.uiFlags = TURNBASED | TRANSLUCENCY_TYPE;