From 93db0bb728174ac8fe49455d96f9fc432abbe26d Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 12 Jul 2020 16:48:32 +0000
Subject: [PATCH] - Fix: assignment not displayed consistently in personnel
 page - Fix: bizarre function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/insurance Contract.cpp | 10 ++++------
 Laptop/personnel.cpp          | 12 +++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Laptop/insurance Contract.cpp b/Laptop/insurance Contract.cpp
index 563a6ba4..6c6b5ec0 100644
--- a/Laptop/insurance Contract.cpp	
+++ b/Laptop/insurance Contract.cpp	
@@ -1787,20 +1787,18 @@ INT32	CalcStartDayOfInsurance( SOLDIERTYPE *pSoldier )
 
 BOOLEAN AreAnyAimMercsOnTeam( )
 {
-	INT16	sNextMercID = 0;
-	BOOLEAN fIsThereAnyAimMercs = FALSE;
 	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
 		if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
 		{
-			fIsThereAnyAimMercs = TRUE;
+			return TRUE;
 		}
 	}
 
-	return( fIsThereAnyAimMercs );
+	return FALSE;
 }
diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp
index 5ecbddd0..71bf1e0e 100644
--- a/Laptop/personnel.cpp
+++ b/Laptop/personnel.cpp
@@ -1285,14 +1285,12 @@ void DisplayCharName( INT32 iId, INT32 iSlot )
 	}
 
 	//Display the mercs name
-	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 );
+	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
 	FindFontCenterCoordinates(IMAGE_BOX_X-5,0,IMAGE_BOX_WIDTH + 90 , 0,sString,CHAR_NAME_FONT, &sX, &sY );