Disable contract renewal in UB

This commit is contained in:
Asdow
2026-06-20 08:49:56 +03:00
parent db29feed11
commit d4dd5f07df
+5
View File
@@ -12748,6 +12748,10 @@ void HandleShadingOfLinesForContractMenu( void )
SOLDIERTYPE* pSoldier = gCharactersList[ bSelectedContractChar ].usSolID; SOLDIERTYPE* pSoldier = gCharactersList[ bSelectedContractChar ].usSolID;
const bool multipleMercsSelected = (gSelectedSoldiers.size() > 0) ? true : false; const bool multipleMercsSelected = (gSelectedSoldiers.size() > 0) ? true : false;
#ifdef JA2UB
// No contract renewal in UB
const bool atLeastOneAIMmerc = false;
#else
bool atLeastOneAIMmerc = false; bool atLeastOneAIMmerc = false;
if (pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC) if (pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC)
{ {
@@ -12765,6 +12769,7 @@ void HandleShadingOfLinesForContractMenu( void )
} }
} }
} }
#endif // JA2UB
// is guy in AIM? and well enough to talk and make such decisions? // is guy in AIM? and well enough to talk and make such decisions?
if( (atLeastOneAIMmerc) && ( pSoldier->stats.bLife >= OKLIFE ) ) if( (atLeastOneAIMmerc) && ( pSoldier->stats.bLife >= OKLIFE ) )