From dfc17ea9c67c2e902d1b5d98e2c8d3828c70f152 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 27 Feb 2013 01:04:21 +0000
Subject: [PATCH] Fix: assignment names were incorrect

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/mapscreen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index c16fbf75..1e2b6218 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -15559,7 +15559,7 @@ void GetMapscreenMercAssignmentString( SOLDIERTYPE *pSoldier, CHAR16 sString[] )
 	}
 	else
 	{
-		if ( gGameExternalOptions.fUseXMLSquadNames )
+		if ( gGameExternalOptions.fUseXMLSquadNames && pSoldier->bAssignment < ON_DUTY )
 			swprintf( sString, L" %s", SquadNames[ pSoldier->bAssignment ].squadname );
 		else
 			wcscpy(sString, pAssignmentStrings[ pSoldier->bAssignment ] );