mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- externalised squad names
- moved Pockets.xml an PocketPopups.xml - requires GameDir >= r1608 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2829,7 +2829,10 @@ void DrawCharacterInfo(INT16 sCharNumber)
|
||||
}
|
||||
else
|
||||
{
|
||||
wcscpy( sString, pAssignmentStrings[ pSoldier->bAssignment ] );
|
||||
if ( gGameExternalOptions.fUseXMLSquadNames )
|
||||
swprintf( sString, L"%s", SquadNames[ pSoldier->bAssignment ].squadname );
|
||||
else
|
||||
wcscpy( sString, pAssignmentStrings[ pSoldier->bAssignment ] );
|
||||
}
|
||||
|
||||
FindFontCenterCoordinates( CHAR_ASSIGN_X, CHAR_ASSIGN1_Y, CHAR_ASSIGN_WID, CHAR_ASSIGN_HEI, sString, CHAR_FONT, &usX, &usY );
|
||||
@@ -15553,7 +15556,10 @@ void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] )
|
||||
}
|
||||
else
|
||||
{
|
||||
wcscpy(sString, pAssignmentStrings[ pSoldier->bAssignment ] );
|
||||
if ( gGameExternalOptions.fUseXMLSquadNames )
|
||||
swprintf( sString, L" %s", SquadNames[ pSoldier->bAssignment ].squadname );
|
||||
else
|
||||
wcscpy(sString, pAssignmentStrings[ pSoldier->bAssignment ] );
|
||||
}
|
||||
// If soldier is working at a facility, add an asterisk.
|
||||
if (pSoldier->sFacilityTypeOperated != -1)
|
||||
|
||||
Reference in New Issue
Block a user