mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
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.
This commit is contained in:
@@ -15377,7 +15377,10 @@ BOOLEAN CanExtendContractForCharSlot( INT16 bCharNumber )
|
|||||||
|
|
||||||
// if a vehicle, in transit, or a POW
|
// if a vehicle, in transit, or a POW
|
||||||
if( /*( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) ||*/
|
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 ) ||
|
( pSoldier->bAssignment == IN_TRANSIT ) ||
|
||||||
|
#endif
|
||||||
( pSoldier->bAssignment == ASSIGNMENT_POW ) )
|
( pSoldier->bAssignment == ASSIGNMENT_POW ) )
|
||||||
{
|
{
|
||||||
// can't extend contracts at this time
|
// can't extend contracts at this time
|
||||||
|
|||||||
Reference in New Issue
Block a user