mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
- added possibility to dismiss a vehicle without passengers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -11604,7 +11604,7 @@ BOOLEAN CanExtendContractForCharSlot( INT8 bCharNumber )
|
||||
Assert( pSoldier->bActive );
|
||||
|
||||
// if a vehicle, in transit, or a POW
|
||||
if( ( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) ||
|
||||
if( /*( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) ||*/
|
||||
( pSoldier->bAssignment == IN_TRANSIT ) ||
|
||||
( pSoldier->bAssignment == ASSIGNMENT_POW ) )
|
||||
{
|
||||
@@ -11612,6 +11612,14 @@ BOOLEAN CanExtendContractForCharSlot( INT8 bCharNumber )
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
// if a vehicle has passengers
|
||||
if ( (pSoldier->uiStatusFlags & SOLDIER_VEHICLE) &&
|
||||
(DoesVehicleHaveAnyPassengers(pSoldier->bVehicleID) ) )
|
||||
{
|
||||
// then restrict contract menu
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
// mercs below OKLIFE, M.E.R.C. mercs, EPCs, and the Robot use the Contract menu so they can be DISMISSED/ABANDONED!
|
||||
|
||||
// everything OK
|
||||
|
||||
Reference in New Issue
Block a user