- Prisoner system can now be correctly turned off.

- improved handcuffing checks

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-12-04 00:57:19 +00:00
parent 6ff06a530e
commit 3bb14a870b
5 changed files with 29 additions and 16 deletions
+2 -2
View File
@@ -899,7 +899,7 @@ INT8 DecideActionGreen(SOLDIERTYPE *pSoldier)
}
// Flugente: if we see one of our buddies in handcuffs, its a clear sign of enemy activity!
if ( pSoldier->bTeam == ENEMY_TEAM )
if ( gGameExternalOptions.fAllowPrisonerSystem && pSoldier->bTeam == ENEMY_TEAM )
{
UINT8 ubPerson = GetClosestFlaggedSoldierID( pSoldier, 10, ENEMY_TEAM, SOLDIER_POW );
@@ -1473,7 +1473,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier)
}
// Flugente: if we see one of our buddies in handcuffs, its a clear sign of enemy activity!
if ( pSoldier->bTeam == ENEMY_TEAM )
if ( gGameExternalOptions.fAllowPrisonerSystem && pSoldier->bTeam == ENEMY_TEAM )
{
UINT8 ubPerson = GetClosestFlaggedSoldierID( pSoldier, 10, ENEMY_TEAM, SOLDIER_POW );