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

disabled changing assignment on POW mercs to prevent to break them free improperly

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-06-21 01:56:37 +00:00
parent 70eda57141
commit 9f0033dac8
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+10
View File
@@ -796,6 +796,10 @@ BOOLEAN BasicCanCharacterAssignment( SOLDIERTYPE * pSoldier, BOOLEAN fNotInComba
return( FALSE ); return( FALSE );
} }
//shadooow: disable changing assignment on POW mercs to prevent to break them free improperly
if (pSoldier->bAssignment == ASSIGNMENT_POW)
return(FALSE);
return( TRUE ); return( TRUE );
} }
@@ -1029,6 +1033,9 @@ BOOLEAN CanCharacterTreatSectorDisease( SOLDIERTYPE *pSoldier )
BOOLEAN CanCharacterFortify( SOLDIERTYPE *pSoldier ) BOOLEAN CanCharacterFortify( SOLDIERTYPE *pSoldier )
{ {
if (pSoldier->bAssignment == ASSIGNMENT_POW)
return(FALSE);
// Flugente: we can't perform most assignments while concealed // Flugente: we can't perform most assignments while concealed
if ( SPY_LOCATION( pSoldier->bAssignment ) ) if ( SPY_LOCATION( pSoldier->bAssignment ) )
return( FALSE ); return( FALSE );
@@ -19914,6 +19921,9 @@ BOOLEAN CanCharacterTrainWorkers( SOLDIERTYPE *pSoldier )
if ( !gGameExternalOptions.fMineRequiresWorkers ) if ( !gGameExternalOptions.fMineRequiresWorkers )
return FALSE; return FALSE;
if (pSoldier->bAssignment == ASSIGNMENT_POW)
return(FALSE);
// Flugente: we can't perform most assignments while concealed // Flugente: we can't perform most assignments while concealed
if ( SPY_LOCATION( pSoldier->bAssignment ) ) if ( SPY_LOCATION( pSoldier->bAssignment ) )
return( FALSE ); return( FALSE );