From 392ba66df34627c12f5c73734f3fe7dfcd7de228 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sat, 20 Jun 2026 06:52:29 +0300
Subject: [PATCH] Enable dismissing mercs in UB before game start

Jerry Melo complains about too many mercs if player has hired over 6 mercs and refuses to fly. This allows player to dismiss mercs until the pilot is happy.
---
 Strategic/mapscreen.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index e44a7191..040f41d5 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -15377,7 +15377,10 @@ BOOLEAN CanExtendContractForCharSlot( INT16 bCharNumber )
 
 	// if a vehicle, in transit, or a POW
 	if( /*( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) ||*/
+#ifndef JA2UB
+		// Allow contract box in UB before helicopter ride, so mercs can be dismissed if player has hired more than 6 mercs
 			( pSoldier->bAssignment == IN_TRANSIT ) ||
+#endif
 			( pSoldier->bAssignment == ASSIGNMENT_POW ) )
 	{
 		// can't extend contracts at this time