1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- added possibility to dismiss a vehicle without passengers

Browse Source 
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:
Lesh
2006-12-03 18:15:40 +00:00
parent cb12aacadc
commit 75f70a13e3
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+9 -1
View File
@@ -11604,7 +11604,7 @@ BOOLEAN CanExtendContractForCharSlot( INT8 bCharNumber )
Assert( pSoldier->bActive ); Assert( pSoldier->bActive );
// if a vehicle, in transit, or a POW // if a vehicle, in transit, or a POW
if( ( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) || if( /*( pSoldier->uiStatusFlags & SOLDIER_VEHICLE ) ||*/
( pSoldier->bAssignment == IN_TRANSIT ) || ( pSoldier->bAssignment == IN_TRANSIT ) ||
( pSoldier->bAssignment == ASSIGNMENT_POW ) ) ( pSoldier->bAssignment == ASSIGNMENT_POW ) )
{ {
@@ -11612,6 +11612,14 @@ BOOLEAN CanExtendContractForCharSlot( INT8 bCharNumber )
return (FALSE); 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! // mercs below OKLIFE, M.E.R.C. mercs, EPCs, and the Robot use the Contract menu so they can be DISMISSED/ABANDONED!
// everything OK // everything OK