- When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer.

- Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- various prisoner fixes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7327 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/Map Screen Interface.cpp

@@ -349,6 +349,9 @@ SGPRect SnitchToggleDimensions={0,0,80,80};
 SGPPoint SnitchSectorPosition={320,150};
 SGPRect SnitchSectorDimensions={0,0,80,80};
 
+SGPPoint PrisonerPosition = {320, 150};
+SGPRect PrisonerDimensions = {0, 0, 80, 80};
+
 //lal
 SGPPoint MilitiaControlPosition={120,150};
 SGPRect MilitiaControlDimensions={0,0,100,95};
@@ -377,6 +380,8 @@ SGPPoint OrigSnitchPosition={160,150};
 SGPPoint OrigSnitchTogglePosition={320,150};
 SGPPoint OrigSnitchSectorPosition={320,150};
 
+SGPPoint OrigPrisonerPosition = {320, 150};
+
 SQUAD_NAMES	SquadNames[20];
 
 //extern BOOLEAN fMapExitDueToMessageBox;
@@ -939,6 +944,10 @@ void RestoreBackgroundForAssignmentGlowRegionList( void )
 				ForceUpDateOfBox( ghSnitchSectorBox );
 			}
 		}
+		else if ( fShowPrisonerMenu )
+		{
+			ForceUpDateOfBox( ghPrisonerBox );
+		}
 	}
 
 	if( fDisableDueToBattleRoster )
@@ -959,9 +968,6 @@ void RestoreBackgroundForAssignmentGlowRegionList( void )
 		// set old to current
 		iOldAssignmentLine = giAssignHighLine;
 	}
-
-	// leave
-	return;
 }
 
 void RestoreBackgroundForDestinationGlowRegionList( void )
@@ -2336,7 +2342,13 @@ void UpdateMapScreenAssignmentPositions( void )
 		SetBoxPosition( ghFacilityAssignmentBox, pPoint );
 	}
 
-	return;
+	if ( fShowPrisonerMenu )
+	{
+		GetBoxPosition( ghPrisonerBox, &pPoint );
+		pPoint.iY = giBoxY + (GetFontHeight( MAP_SCREEN_FONT ) + 2) * ASSIGN_MENU_FACILITY;
+
+		SetBoxPosition( ghPrisonerBox, pPoint );
+	}
 }