From bc8ec35314fdee646f284a6cb1470c2e615136f2 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 19 Mar 2014 11:50:06 +0000 Subject: [PATCH] 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 --- Options Screen.cpp | Bin 129160 -> 64995 bytes SaveLoadScreen.cpp | 9 +++++++++ Tactical/Strategic Exit GUI.cpp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Options Screen.cpp b/Options Screen.cpp index 89e8e52aa4d4879afade4f6ff7b77b89bdee5a5d..5229765f0a5c7767130044018390ccf7934800b3 100644 GIT binary patch literal 64995 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 literal 129160 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 diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp index 82a3226e..820fcee5 100644 --- a/SaveLoadScreen.cpp +++ b/SaveLoadScreen.cpp @@ -117,6 +117,9 @@ UINT16 NUM_SLOT; #define SLG_SAVE_LOAD_BTN_POS_X iScreenWidthOffset + 123 #define SLG_SAVE_LOAD_BTN_POS_Y iScreenHeightOffset + 438 +#define SLG_SAVE_LOAD_PAGE_POS_X SLG_SAVE_LOAD_BTN_POS_X + 195 +#define SLG_SAVE_LOAD_PAGE_POS_Y SLG_SAVE_LOAD_BTN_POS_Y + 10 + #define SLG_DOUBLE_CLICK_DELAY 500 //defines for saved game version status @@ -931,6 +934,7 @@ void ExitSaveLoadScreen() void RenderSaveLoadScreen() { HVOBJECT hPixHandle; + CHAR16 sPage[60]; //if we are going to be instantly leaving the screen, dont draw the numbers if( gfLoadGameUponEntry ) @@ -964,6 +968,11 @@ void RenderSaveLoadScreen() DisplaySaveGameList(); + //Display the option page numbers + swprintf( sPage, L"%d", PAGE_SLOT + 1 ); + DrawTextToScreen( sPage, SLG_SAVE_LOAD_PAGE_POS_X, SLG_SAVE_LOAD_PAGE_POS_Y, 0, OPT_BUTTON_FONT, + OPT_BUTTON_ON_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + InvalidateRegion( 0, 0, SCREEN_WIDTH , SCREEN_HEIGHT ); } diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index e614fa9e..c97d0022 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -278,7 +278,7 @@ BOOLEAN InternalInitSectorExitMenu( UINT8 ubDirection, INT32 sAdditionalData )// } } - if( ubNumMercs == 1 && ubNumEPCs >= 1 ) + if( ubNumMercs == 1 ) { gExitDialog.fSingleMoveOn = FALSE; gExitDialog.fAllMoveOn = TRUE;