- Fix: prisoner interrogation was stopped even though it shouldn't

- Fix: prison location was displayed wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-12-09 16:14:24 +00:00
parent c3ac6a5d1f
commit 5335553158
3 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -15273,7 +15273,7 @@ void SOLDIERTYPE::Strip()
// can we process prisoners in this sector?
BOOLEAN SOLDIERTYPE::CanProcessPrisoners()
{
if ( !bInSector || stats.bLife < OKLIFE )
if ( stats.bLife < OKLIFE )
return FALSE;
// Is there a prison in this sector?
@@ -15298,7 +15298,7 @@ BOOLEAN SOLDIERTYPE::CanProcessPrisoners()
// Are there any prisoners in this prison?
if ( !this->bSectorZ )
{
SECTORINFO *pSectorInfo = &( SectorInfo[ SECTOR( gWorldSectorX, gWorldSectorY ) ] );
SECTORINFO *pSectorInfo = &( SectorInfo[ SECTOR( this->sSectorX, this->sSectorY ) ] );
if ( pSectorInfo->uiNumberOfPrisonersOfWar > 0 )
return TRUE;