From ee2807ae64f6230d35d8555cd5a3b344af1472d9 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Sat, 26 Apr 2025 00:31:32 +0300 Subject: [PATCH] Default to 1st kit if deciding not to buy gear in UB 1st one is included in the hiring fee --- Laptop/mercs Files.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index e95782c1..a32a7a7c 100644 --- a/Laptop/mercs Files.cpp +++ b/Laptop/mercs Files.cpp @@ -1840,11 +1840,22 @@ void MercWeaponKitSelectionUpdate(UINT8 selectedInventory) void MercHireButtonGearYesNoCallback (UINT8 bExitValue) { //yes, buy gear - if( bExitValue == MSG_BOX_RETURN_YES ) + if ( bExitValue == MSG_BOX_RETURN_YES ) + { fMercBuyEquipment = 1; + } //no, no gear else + { +#ifdef JA2UB + // Switch to the free, first kit + gSelectedMercKit = 0; + MercWeaponKitSelectionUpdate( gSelectedMercKit ); + fMercBuyEquipment = 1; +#else fMercBuyEquipment = 0; +#endif // JA2UB + } MercProcessHireAfterGear(); }