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

Fix: if no squad name is provided in xml, fall back on hardcoded name

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2020-07-15 21:23:53 +00:00
parent e14444f14a
commit ce61a0b85b
15 changed files with 94 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+4 -4
View File
@@ -2849,8 +2849,8 @@ void DrawCharacterInfo(INT16 sCharNumber)
}
else
{
if ( gGameExternalOptions.fUseXMLSquadNames && pSoldier->bAssignment < ON_DUTY )
swprintf( sString, L"%s", SquadNames[ pSoldier->bAssignment ].squadname );
if ( gGameExternalOptions.fUseXMLSquadNames && pSoldier->bAssignment < min(ON_DUTY, gSquadNameVector.size()) )
swprintf( sString, L"%s", gSquadNameVector[pSoldier->bAssignment].c_str() );
else
wcscpy( sString, pAssignmentStrings[ pSoldier->bAssignment ] );
}
@@ -15871,8 +15871,8 @@ void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] )
}
else
{
if ( gGameExternalOptions.fUseXMLSquadNames && pSoldier->bAssignment < ON_DUTY )
swprintf( sString, L" %s", SquadNames[ pSoldier->bAssignment ].squadname );
if ( gGameExternalOptions.fUseXMLSquadNames && pSoldier->bAssignment < min(ON_DUTY, gSquadNameVector.size() ) )
swprintf( sString, L" %s", gSquadNameVector[pSoldier->bAssignment].c_str() );
else
wcscpy(sString, pAssignmentStrings[ pSoldier->bAssignment ] );
}