1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- externalised squad names

Browse Source 
- 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:
Flugente
2013-02-25 22:25:45 +00:00
parent 0a7330d5a4
commit 2cfe4bd7fc
17 changed files with 304 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface.cpp
+18 -4
View File
@@ -367,6 +367,8 @@ SGPPoint OrigFacilityPosition = { 160, 150 }; // HEADROCK HAM 3.6
SGPPoint OrigFacilityAssignmentPosition = { 220,150 }; // HEADROCK HAM 3.6
//SGPPoint OrigTalkToAllPosition = { 160, 150 };
SQUAD_NAMES SquadNames[20];
//extern BOOLEAN fMapExitDueToMessageBox;
// at least one merc was hired at some time
@@ -3871,11 +3873,17 @@ void AddStringsToMoveBox( void )
// add this squad, now add all the grunts in it
if( fSquadIsMoving[ iCount ] )
{
swprintf( sString, L"*%s*", pSquadMenuStrings[iSquadMovingList[ iCount ] ] );
if ( gGameExternalOptions.fUseXMLSquadNames )
swprintf( sString, L"*%s*", SquadNames[ iSquadMovingList[ iCount ] ].squadname );
else
swprintf( sString, L"*%s*", pSquadMenuStrings[iSquadMovingList[ iCount ] ] );
}
else
{
swprintf( sString, L"%s", pSquadMenuStrings[iSquadMovingList[ iCount ] ] );
if ( gGameExternalOptions.fUseXMLSquadNames )
swprintf( sString, L"%s", SquadNames[ iSquadMovingList[ iCount ] ].squadname );
else
swprintf( sString, L"%s", pSquadMenuStrings[iSquadMovingList[ iCount ] ] );
}
AddMonoString(&hStringHandle, sString );
@@ -3962,11 +3970,17 @@ void AddStringsToMoveBox( void )
// add OTHER soldiers (not on duty nor in a vehicle)
if( IsSoldierSelectedForMovement( pSoldierMovingList[ iCount ] ) == TRUE )
{
swprintf( sString, L" *%s ( %s )*", pSoldierMovingList[ iCount ]->name, pAssignmentStrings[ pSoldierMovingList[ iCount ]->bAssignment ] );
if ( gGameExternalOptions.fUseXMLSquadNames )
swprintf( sString, L" *%s ( %s )*", pSoldierMovingList[ iCount ]->name, SquadNames[ pSoldierMovingList[ iCount ]->bAssignment ].squadname );
else
swprintf( sString, L" *%s ( %s )*", pSoldierMovingList[ iCount ]->name, pAssignmentStrings[ pSoldierMovingList[ iCount ]->bAssignment ] );
}
else
{
swprintf( sString, L" %s ( %s )", pSoldierMovingList[ iCount ]->name, pAssignmentStrings[ pSoldierMovingList[ iCount ]->bAssignment ] );
if ( gGameExternalOptions.fUseXMLSquadNames )
swprintf( sString, L" %s ( %s )", pSoldierMovingList[ iCount ]->name, SquadNames[ pSoldierMovingList[ iCount ]->bAssignment ].squadname );
else
swprintf( sString, L" %s ( %s )", pSoldierMovingList[ iCount ]->name, pAssignmentStrings[ pSoldierMovingList[ iCount ]->bAssignment ] );
}
AddMonoString(&hStringHandle, sString );
}