Merged from revision: 7092

Fixes (by Buggler)
- Fixed possible assertion moving a single-merc squad to another sector when using 'Selected Merc' option in Exit Dialog box by disabling the option for the described scenario
- Added page numbers to option and saveload screen (saveload screen page number are not properly refreshed though)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-03-19 11:50:06 +00:00
parent c9b0c6fc12
commit bc8ec35314
3 changed files with 10 additions and 1 deletions
+1 -1
View File
@@ -278,7 +278,7 @@ BOOLEAN InternalInitSectorExitMenu( UINT8 ubDirection, INT32 sAdditionalData )//
}
}
if( ubNumMercs == 1 && ubNumEPCs >= 1 )
if( ubNumMercs == 1 )
{
gExitDialog.fSingleMoveOn = FALSE;
gExitDialog.fAllMoveOn = TRUE;