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

- Fix: assignment not displayed consistently in personnel page

Browse Source 
- 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:
Flugente
2020-07-12 16:48:32 +00:00
parent 0165ba5bed
commit 93db0bb728
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/insurance Contract.cpp
+4 -6
View File
@@ -1787,20 +1787,18 @@ INT32 CalcStartDayOfInsurance( SOLDIERTYPE *pSoldier )
BOOLEAN AreAnyAimMercsOnTeam( ) BOOLEAN AreAnyAimMercsOnTeam( )
{ {
INT16 sNextMercID = 0;
BOOLEAN fIsThereAnyAimMercs = FALSE;
SOLDIERTYPE *pSoldier = NULL; 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 //check to see if any of the mercs are AIM mercs
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
{ {
fIsThereAnyAimMercs = TRUE; return TRUE;
} }
} }
return( fIsThereAnyAimMercs ); return FALSE;
} }
Laptop/personnel.cpp
+5 -7
View File
@@ -1285,14 +1285,12 @@ void DisplayCharName( INT32 iId, INT32 iSlot )
} }
//Display the mercs name //Display the mercs name
if ( Menptr[iId].bAssignment < ON_DUTY && gGameExternalOptions.fUseXMLSquadNames ) mprintf( sX + iSlot*IMAGE_BOX_WIDTH, CHAR_NAME_Y, sString );
{
swprintf( sString, L"%s", SquadNames[ Menptr[iId].bAssignment ].squadname);
}
else
mprintf(sX+iSlot*IMAGE_BOX_WIDTH, CHAR_NAME_Y, sString );
swprintf( sString, L"%s", pPersonnelAssignmentStrings[Menptr[iId].bAssignment]); if ( Menptr[iId].bAssignment < ON_DUTY && gGameExternalOptions.fUseXMLSquadNames )
swprintf( sString, L"%s", SquadNames[ Menptr[iId].bAssignment ].squadname);
else
swprintf( sString, L"%s", pPersonnelAssignmentStrings[Menptr[iId].bAssignment]);
// nick name - assignment // nick name - assignment
FindFontCenterCoordinates(IMAGE_BOX_X-5,0,IMAGE_BOX_WIDTH + 90 , 0,sString,CHAR_NAME_FONT, &sX, &sY ); FindFontCenterCoordinates(IMAGE_BOX_X-5,0,IMAGE_BOX_WIDTH + 90 , 0,sString,CHAR_NAME_FONT, &sX, &sY );