From ef30192b29b2dd29f3c1a3375c153214c8f668a7 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Sat, 20 Jun 2026 08:48:12 +0300 Subject: [PATCH] Leave merc equipment to current sector in UB --- Strategic/Merc Contract.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index e215205e..36784ce4 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -904,7 +904,16 @@ BOOLEAN BeginStrategicRemoveMerc( SOLDIERTYPE *pSoldier, BOOLEAN fAddRehireButto else { if (!is_networked) + { +#ifdef JA2UB + // Leave equipment to merc's current sector by default in UB + HandleLeavingOfEquipmentInCurrentSector(pSoldier->ubID); + StrategicRemoveMerc(pSoldier); + pLeaveSoldier = NULL; +#else NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( pSoldier, fAddRehireButton ); +#endif + } else { // WANNE - MP: Skip all the dialog boxes that appear. Just dismiss the merc