1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +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
Laptop/personnel.cpp
+9 -1
View File
@@ -37,6 +37,9 @@
#include "Soldier Macros.h"
#include "InterfaceItemImages.h"
#include "Map Screen Interface.h" // added by Flugente
// WDS - make number of mercenaries, etc. be configurable
#define MAX_MERCS_ON_SCREEN 20
@@ -1309,7 +1312,12 @@ void DisplayCharName( INT32 iId, INT32 iSlot )
}
//Display the mercs name
mprintf(sX+iSlot*IMAGE_BOX_WIDTH, CHAR_NAME_Y, sString );
if ( Menptr[iId].bAssignment < ON_DUTY && gGameExternalOptions.fUseXMLSquadNames )
{
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]);