mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
- Fix: assignment not displayed consistently in personnel page
- Fix: bizarre function git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1787,20 +1787,18 @@ INT32 CalcStartDayOfInsurance( SOLDIERTYPE *pSoldier )
|
||||
|
||||
BOOLEAN AreAnyAimMercsOnTeam( )
|
||||
{
|
||||
INT16 sNextMercID = 0;
|
||||
BOOLEAN fIsThereAnyAimMercs = FALSE;
|
||||
SOLDIERTYPE *pSoldier = NULL;
|
||||
|
||||
for( sNextMercID = 0; sNextMercID <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; sNextMercID++ )
|
||||
for( int cnt = 0; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++cnt )
|
||||
{
|
||||
pSoldier = &Menptr[ GetSoldierIDFromMercID( (UINT8) sNextMercID ) ];
|
||||
pSoldier = MercPtrs[cnt];
|
||||
|
||||
//check to see if any of the mercs are AIM mercs
|
||||
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
|
||||
{
|
||||
fIsThereAnyAimMercs = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return( fIsThereAnyAimMercs );
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user