From 5282553a8c97ac80670415f1a655d055cb1e6039 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Thu, 20 Jan 2022 17:48:39 +0000 Subject: [PATCH] Stop being able to change assignments of in transit mercs (by Asdow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9268 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Assignments.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index f190a7cfb..934b6df8f 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -803,7 +803,8 @@ BOOLEAN BasicCanCharacterAssignment( SOLDIERTYPE * pSoldier, BOOLEAN fNotInComba } //shadooow: disable changing assignment on POW mercs to prevent to break them free improperly - if (pSoldier->bAssignment == ASSIGNMENT_POW) + // Asdow: Prevent changing assignment for mercs in transit + if (pSoldier->bAssignment == ASSIGNMENT_POW || pSoldier->bAssignment == IN_TRANSIT) return(FALSE); if ( pSoldier->bAssignment == ASSIGNMENT_MINIEVENT && pSoldier->ubHoursRemainingOnMiniEvent > 0 )