- 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
+6
View File
@@ -5477,6 +5477,9 @@ extern INT32 giReinforcementPool;
// handle processing of prisoners
void HandlePrisonerProcessingInSector( INT16 sMapX, INT16 sMapY, INT8 bZ )
{
if ( !gGameExternalOptions.fAllowPrisonerSystem )
return;
// Is there a prison in this sector?
UINT16 prisonerbaselimit = 0;
for (UINT16 cnt = 0; cnt < NUM_FACILITY_TYPES; ++cnt)
@@ -5698,6 +5701,9 @@ void HandlePrisonerProcessingInSector( INT16 sMapX, INT16 sMapY, INT8 bZ )
// Flugente: prisons can riot if there aren't enough guards around
void HandlePrison( INT16 sMapX, INT16 sMapY, INT8 bZ )
{
if ( !gGameExternalOptions.fAllowPrisonerSystem )
return;
BOOLEAN fBeginRiot = FALSE;
// Is there a prison in this sector?