From 3e5e48af294fba7874b7700b759aa6fa57cb51f5 Mon Sep 17 00:00:00 2001 From: lalien Date: Sun, 30 Apr 2006 13:13:21 +0000 Subject: [PATCH] ********************************************************* * 2006/04/30 * * RoWa21 * * Developed in VS 2003 * ********************************************************* Source: - Re-enabled Ironman-Feature in the "Start new game screen" - Added a "Previous" and "Next" button to the merc account screen Data: - Added new data (data\laptop) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@43 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameInitOptionsScreen.cpp | 22 ++- JA2.vcproj | 6 +- Laptop/IMP Begin Screen.cpp | 2 +- Laptop/mercs Account.cpp | 269 +++++++++++++++++++++++++++++++++--- Laptop/mercs Files.cpp | 13 +- Utils/Text.h | 3 + Utils/_DutchText.cpp | 9 ++ Utils/_EnglishText.cpp | 8 ++ Utils/_FrenchText.cpp | 9 ++ Utils/_GermanText.cpp | 9 ++ Utils/_ItalianText.cpp | 9 ++ Utils/_PolishText.cpp | 9 +- Utils/_RussianText.cpp | 9 +- 13 files changed, 333 insertions(+), 44 deletions(-) diff --git a/GameInitOptionsScreen.cpp b/GameInitOptionsScreen.cpp index 2926b28a..113b4e44 100644 --- a/GameInitOptionsScreen.cpp +++ b/GameInitOptionsScreen.cpp @@ -451,7 +451,7 @@ BOOLEAN EnterGIOScreen() ButtonList[ guiBROptionToggles[ GIO_BR_AWESOME ] ]->uiFlags |= BUTTON_CLICKED_ON; break; } -/* + // JA2Gold: iron man buttons usPosY = GIO_IRON_MAN_SETTING_Y - GIO_OFFSET_TO_TOGGLE_BOX_Y; for( cnt=0; cntuiFlags |= BUTTON_CLICKED_ON; else ButtonList[ guiGameSaveToggles[ GIO_CAN_SAVE ] ]->uiFlags |= BUTTON_CLICKED_ON; -*/ + // @@ -567,10 +567,9 @@ BOOLEAN ExitGIOScreen() for( cnt=0; cnt +// WANNE 3 #ifdef PRECOMPILEDHEADERS #include "Laptop All.h" #else @@ -21,9 +21,6 @@ #include "Speck Quotes.h" #endif - - - #define MERC_ACCOUNT_TEXT_FONT FONT14ARIAL #define MERC_ACCOUNT_TEXT_COLOR FONT_MCOLOR_WHITE @@ -37,11 +34,17 @@ #define MERC_AC_ACCOUNT_NUMBER_X LAPTOP_SCREEN_UL_X + 23 #define MERC_AC_ACCOUNT_NUMBER_Y LAPTOP_SCREEN_WEB_UL_Y + 13 -#define MERC_AC_AUTHORIZE_BUTTON_X iScreenWidthOffset + 128 -#define MERC_AC_AUTHORIZE_BUTTON_Y iScreenHeightOffset + 380 +#define MERC_AC_PREV_BUTTON_X iScreenWidthOffset + 128 +#define MERC_AC_PREV_BUTTON_Y iScreenHeightOffset + 380 -#define MERC_AC_CANCEL_BUTTON_X iScreenWidthOffset + 490 -#define MERC_AC_CANCEL_BUTTON_Y MERC_AC_AUTHORIZE_BUTTON_Y +#define MERC_AC_AUTHORIZE_BUTTON_X MERC_AC_PREV_BUTTON_X + 103 + 16 +#define MERC_AC_AUTHORIZE_BUTTON_Y MERC_AC_PREV_BUTTON_Y + +#define MERC_AC_CANCEL_BUTTON_X MERC_AC_AUTHORIZE_BUTTON_X + 103 + 16 +#define MERC_AC_CANCEL_BUTTON_Y MERC_AC_PREV_BUTTON_Y + +#define MERC_AC_NEXT_BUTTON_X MERC_AC_CANCEL_BUTTON_X + 103 + 16 +#define MERC_AC_NEXT_BUTTON_Y MERC_AC_PREV_BUTTON_Y #define MERC_AC_ACCOUNT_NUMBER_TEXT_X MERC_AC_ACCOUNT_NUMBER_X + 5 #define MERC_AC_ACCOUNT_NUMBER_TEXT_Y MERC_AC_ACCOUNT_NUMBER_Y + 12 @@ -62,14 +65,21 @@ #define MERC_AC_FIRST_ROW_Y MERC_AC_ORDER_GRID_Y + 42 #define MERC_AC_ROW_SIZE 16 - +// The maximum number of mercs +#define TOTAL_NUMBER_OF_MERCS 14 +#define MAX_NUMBER_MERCS_ON_PAGE 12 UINT32 guiMercOrderGrid; UINT32 guiAccountNumberGrid; - INT32 giMercTotalContractCharge; +UINT32 guiMercOrderGrid0; +UINT8 iNumberOfHiredMercs; +UINT8 iTotalAccountPages; +UINT8 iCurrentAccountPage; +INT32 guiAccountButtonImage; + BOOLEAN gfMercPlayerDoesntHaveEnoughMoney_DisplayWarning = FALSE; // The Authorize button @@ -82,13 +92,121 @@ INT32 guiMercAuthorizeButtonImage; void BtnMercBackButtonCallback(GUI_BUTTON *btn,INT32 reason); UINT32 guiMercBackBoxButton; +// The Prev button +UINT32 guiAccountPrevButton; +void BtnAccountPrevPageButtonCallback(GUI_BUTTON *btn,INT32 reason); - +// The Next button +UINT32 guiAccountNextButton; +void BtnAccountNextPageButtonCallback(GUI_BUTTON *btn,INT32 reason); void DisplayHiredMercs(); void SettleMercAccounts(); void MercAuthorizePaymentMessageBoxCallBack( UINT8 bExitValue ); +void BtnAccountPrevPageButtonCallback(GUI_BUTTON *btn,INT32 reason) +{ + if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN ) + { + btn->uiFlags |= BUTTON_CLICKED_ON; + InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); + } + if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) + { + if (btn->uiFlags & BUTTON_CLICKED_ON) + { + btn->uiFlags &= (~BUTTON_CLICKED_ON ); + + iCurrentAccountPage--; + + if (iCurrentAccountPage == 0) + { + DisableButton(guiAccountPrevButton); + } + + if (iCurrentAccountPage < iTotalAccountPages - 1) + { + EnableButton(guiAccountNextButton); + } + + RenderMercsAccount(); + + InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); + } + } + if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE) + { + btn->uiFlags &= (~BUTTON_CLICKED_ON ); + InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); + } +} + +void BtnAccountNextPageButtonCallback(GUI_BUTTON *btn,INT32 reason) +{ + if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN ) + { + btn->uiFlags |= BUTTON_CLICKED_ON; + InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); + } + if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) + { + if (btn->uiFlags & BUTTON_CLICKED_ON) + { + btn->uiFlags &= (~BUTTON_CLICKED_ON ); + + iCurrentAccountPage++; + + if (iCurrentAccountPage == iTotalAccountPages - 1) + { + DisableButton(guiAccountNextButton); + } + + if (iCurrentAccountPage > 0) + { + EnableButton(guiAccountPrevButton); + } + + RenderMercsAccount(); + + InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); + } + } + if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE) + { + btn->uiFlags &= (~BUTTON_CLICKED_ON ); + InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY); + } +} + +// WANNE 3 +INT32 GetNumberOfHiredMercs() +{ + UINT8 usMercID; + UINT8 i = 0; + UINT8 count = 0; + UINT32 uiContractCharge; + + giMercTotalContractCharge = 0; + + for (i = 0; i<=TOTAL_NUMBER_OF_MERCS; i++) + { + if( i == MERC_LARRY_ROACHBURN ) + continue; + + usMercID = GetMercIDFromMERCArray( i ); + + // Is the merc hired? + if( IsMercOnTeam( (UINT8)usMercID ) || gMercProfiles[ usMercID ].iMercMercContractLength != 0 ) + { + uiContractCharge = gMercProfiles[ usMercID ].sSalary * gMercProfiles[ usMercID ].iMercMercContractLength; + giMercTotalContractCharge += uiContractCharge; + + count++; + } + } + + return count; +} void GameInitMercsAccount() @@ -98,21 +216,72 @@ void GameInitMercsAccount() BOOLEAN EnterMercsAccount() { + // WANNE 3 - BEGIN + UINT8 mercOverPage = 0; + + iCurrentAccountPage = 0; + + iNumberOfHiredMercs = GetNumberOfHiredMercs(); + + // Can only display MAX_NUMBER_MERCS mercs per page + iTotalAccountPages = iNumberOfHiredMercs / MAX_NUMBER_MERCS_ON_PAGE; + mercOverPage = iNumberOfHiredMercs % MAX_NUMBER_MERCS_ON_PAGE; + + if (mercOverPage > 0) + iTotalAccountPages++; + + if (iTotalAccountPages == 0) + iTotalAccountPages++; + + // WANNE 3 - END + VOBJECT_DESC VObjectDesc; InitMercBackGround(); + // Merce order grid (the last page) // load the Arrow graphic and add it VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE; GetMLGFilename( VObjectDesc.ImageFile, MLG_ORDERGRID ); CHECKF(AddVideoObject(&VObjectDesc, &guiMercOrderGrid)); + // Merce order grid 0 (all other pages) + // load the Arrow graphic and add it + VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE; + FilenameForBPP("LAPTOP\\OrderGrid0.sti", VObjectDesc.ImageFile); + CHECKF(AddVideoObject(&VObjectDesc, &guiMercOrderGrid0)); + // load the Arrow graphic and add it VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE; FilenameForBPP("LAPTOP\\AccountNumber.sti", VObjectDesc.ImageFile); CHECKF(AddVideoObject(&VObjectDesc, &guiAccountNumberGrid)); + guiAccountButtonImage = LoadButtonImage("LAPTOP\\BigButtons.sti", -1,0,-1,1,-1 ); + + // Prev Button + guiAccountPrevButton = CreateIconAndTextButton( guiAccountButtonImage, MercAccountPageText[0], + FONT12ARIAL, + MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW, + MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW, + TEXT_CJUSTIFIED, + MERC_AC_PREV_BUTTON_X, MERC_AC_PREV_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH, + DEFAULT_MOVE_CALLBACK, BtnAccountPrevPageButtonCallback); + SetButtonCursor(guiAccountPrevButton, CURSOR_LAPTOP_SCREEN); + SpecifyDisabledButtonStyle( guiAccountPrevButton, DISABLED_STYLE_SHADED); + + // Next Button + guiAccountNextButton = CreateIconAndTextButton( guiAccountButtonImage, MercAccountPageText[1], + FONT12ARIAL, + MERC_BUTTON_UP_COLOR, DEFAULT_SHADOW, + MERC_BUTTON_DOWN_COLOR, DEFAULT_SHADOW, + TEXT_CJUSTIFIED, + MERC_AC_NEXT_BUTTON_X, MERC_AC_NEXT_BUTTON_Y, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH, + DEFAULT_MOVE_CALLBACK, BtnAccountNextPageButtonCallback); + SetButtonCursor(guiAccountNextButton, CURSOR_LAPTOP_SCREEN); + SpecifyDisabledButtonStyle( guiAccountNextButton, DISABLED_STYLE_SHADED); + + guiMercAuthorizeButtonImage = LoadButtonImage("LAPTOP\\BigButtons.sti", -1,0,-1,1,-1 ); guiMercAuthorizeBoxButton = CreateIconAndTextButton( guiMercAuthorizeButtonImage, MercAccountText[MERC_ACCOUNT_AUTHORIZE], @@ -141,6 +310,14 @@ BOOLEAN EnterMercsAccount() //if true, will display a msgbox telling user that they dont have enough funds gfMercPlayerDoesntHaveEnoughMoney_DisplayWarning = FALSE; + // Disable the prev button, because we are on the first page + DisableButton(guiAccountPrevButton); + + if (iTotalAccountPages == 1) + { + DisableButton(guiAccountNextButton); + } + return( TRUE ); } @@ -153,6 +330,11 @@ void ExitMercsAccount() RemoveButton( guiMercAuthorizeBoxButton ); RemoveButton( guiMercBackBoxButton ); + DeleteVideoObjectFromIndex(guiMercOrderGrid0); + UnloadButtonImage( guiAccountButtonImage ); + RemoveButton ( guiAccountPrevButton ); + RemoveButton ( guiAccountNextButton ); + RemoveMercBackGround(); } @@ -175,7 +357,15 @@ void RenderMercsAccount() DrawMecBackGround(); // Account Number Grid - GetVideoObject(&hPixHandle, guiMercOrderGrid); + if (iCurrentAccountPage == iTotalAccountPages - 1) + { + GetVideoObject(&hPixHandle, guiMercOrderGrid); + } + else + { + GetVideoObject(&hPixHandle, guiMercOrderGrid0); + } + BltVideoObject(FRAME_BUFFER, hPixHandle, 0,MERC_AC_ORDER_GRID_X, MERC_AC_ORDER_GRID_Y, VO_BLT_SRCTRANSPARENCY,NULL); // Merc Order Grid @@ -191,7 +381,11 @@ void RenderMercsAccount() DrawTextToScreen( MercAccountText[MERC_ACCOUNT_DAYS], MERC_AC_SECOND_COLUMN_X, MERC_AC_MERC_TITLE_Y, MERC_AC_SECOND_COLUMN_WIDTH, MERC_ACCOUNT_TEXT_FONT, MERC_ACCOUNT_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); DrawTextToScreen( MercAccountText[MERC_ACCOUNT_RATE], MERC_AC_THIRD_COLUMN_X, MERC_AC_MERC_TITLE_Y, MERC_AC_THIRD_COLUMN_WIDTH, MERC_ACCOUNT_TEXT_FONT, MERC_ACCOUNT_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); DrawTextToScreen( MercAccountText[MERC_ACCOUNT_CHARGE], MERC_AC_FOURTH_COLUMN_X, MERC_AC_MERC_TITLE_Y, MERC_AC_FOURTH_COLUMN_WIDTH, MERC_ACCOUNT_TEXT_FONT, MERC_ACCOUNT_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); - DrawTextToScreen( MercAccountText[MERC_ACCOUNT_TOTAL], MERC_AC_THIRD_COLUMN_X, MERC_AC_TOTAL_COST_Y, MERC_AC_THIRD_COLUMN_WIDTH, MERC_ACCOUNT_TEXT_FONT, MERC_ACCOUNT_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); + + if (iCurrentAccountPage == iTotalAccountPages - 1) + { + DrawTextToScreen( MercAccountText[MERC_ACCOUNT_TOTAL], MERC_AC_THIRD_COLUMN_X, MERC_AC_TOTAL_COST_Y, MERC_AC_THIRD_COLUMN_WIDTH, MERC_ACCOUNT_TEXT_FONT, MERC_ACCOUNT_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); + } DisplayHiredMercs(); @@ -279,13 +473,39 @@ void DisplayHiredMercs() wchar_t sTemp[20]; UINT8 i, usMercID; UINT8 ubFontColor; - - giMercTotalContractCharge = 0; + UINT8 usMercIDStart; + UINT8 usMercIDEnd; + INT16 usCurrentRow = -1; usPosY = MERC_AC_FIRST_ROW_Y + 3; - // WANNE - for(i=0; i<=14; i++) + + // Start + usMercIDStart = iCurrentAccountPage * MAX_NUMBER_MERCS_ON_PAGE; + + // End + if ((usMercIDStart + MAX_NUMBER_MERCS_ON_PAGE) > TOTAL_NUMBER_OF_MERCS) { + usMercIDEnd = TOTAL_NUMBER_OF_MERCS; + } + else + { + usMercIDEnd = usMercIDStart + MAX_NUMBER_MERCS_ON_PAGE; + } + + // At least second page + // This approach is needed, because auf LARRY_ROACHBURN + if (usMercIDStart > 0) + { + usMercIDStart++; + } + + // Loop through all the mercs + for(i=usMercIDStart; i <= TOTAL_NUMBER_OF_MERCS ; i++) + { + // We have no more free rows on the current page + if (usCurrentRow == usMercIDEnd - 1) + break; + //if it larry Roach burn advance. ( cause larry is in twice, a sober larry and a stoned larry ) if( i == MERC_LARRY_ROACHBURN ) continue; @@ -295,6 +515,8 @@ void DisplayHiredMercs() //is the merc on the team, or is owed money if( IsMercOnTeam( (UINT8)usMercID ) || gMercProfiles[ usMercID ].iMercMercContractLength != 0 ) { + usCurrentRow++; + //if the merc is dead, make the color red, else white if( IsMercDead( usMercID ) ) ubFontColor = MERC_ACCOUNT_DEAD_TEXT_COLOR; @@ -320,13 +542,18 @@ void DisplayHiredMercs() swprintf(sTemp, L"$%6d", uiContractCharge ); DrawTextToScreen(sTemp, MERC_AC_FOURTH_COLUMN_X, usPosY, MERC_AC_FOURTH_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, ubFontColor, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); - giMercTotalContractCharge += uiContractCharge; + //giMercTotalContractCharge += uiContractCharge; usPosY += MERC_AC_ROW_SIZE; } } - swprintf(sTemp, L"$%6d", giMercTotalContractCharge ); - DrawTextToScreen(sTemp, MERC_AC_FOURTH_COLUMN_X, MERC_AC_TOTAL_COST_Y, MERC_AC_FOURTH_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, MERC_ACCOUNT_DYNAMIC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); + // Last page + if (iCurrentAccountPage == iTotalAccountPages - 1) + { + // Output total contract + swprintf(sTemp, L"$%6d", giMercTotalContractCharge ); + DrawTextToScreen(sTemp, MERC_AC_FOURTH_COLUMN_X, MERC_AC_TOTAL_COST_Y, MERC_AC_FOURTH_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, MERC_ACCOUNT_DYNAMIC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); + } } @@ -517,7 +744,7 @@ UINT32 CalculateHowMuchPlayerOwesSpeck() // WANNE 2 - for(i=0; i<14; i++) + for(i=0; i #ifdef PRECOMPILEDHEADERS #include "Laptop All.h" #else @@ -58,18 +59,20 @@ #define MERC_FILES_BIO_BOX_X MERC_FILES_PORTRAIT_BOX_X #define MERC_FILES_BIO_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 155 +// OK #define MERC_FILES_PREV_BUTTON_X iScreenWidthOffset + 128 #define MERC_FILES_PREV_BUTTON_Y iScreenHeightOffset + 380 -#define MERC_FILES_NEXT_BUTTON_X iScreenWidthOffset + 490 -#define MERC_FILES_NEXT_BUTTON_Y MERC_FILES_PREV_BUTTON_Y - -#define MERC_FILES_HIRE_BUTTON_X iScreenWidthOffset + 260 +#define MERC_FILES_HIRE_BUTTON_X MERC_FILES_PREV_BUTTON_X + 103 + 16 //iScreenWidthOffset + 260 #define MERC_FILES_HIRE_BUTTON_Y MERC_FILES_PREV_BUTTON_Y -#define MERC_FILES_BACK_BUTTON_X iScreenWidthOffset + 380 +#define MERC_FILES_BACK_BUTTON_X MERC_FILES_HIRE_BUTTON_X + 103 + 16 //iScreenWidthOffset + 380 #define MERC_FILES_BACK_BUTTON_Y MERC_FILES_PREV_BUTTON_Y +// OK +#define MERC_FILES_NEXT_BUTTON_X iScreenWidthOffset + 485 //490 +#define MERC_FILES_NEXT_BUTTON_Y MERC_FILES_PREV_BUTTON_Y + #define MERC_NAME_X MERC_FILES_STATS_BOX_X + 50 #define MERC_NAME_Y MERC_FILES_STATS_BOX_Y + 10 diff --git a/Utils/Text.h b/Utils/Text.h index 2cd56b3b..3d5f0fa3 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -559,6 +559,9 @@ enum }; extern STR16 MercAccountText[]; +// WANNE 3 +extern STR16 MercAccountPageText[]; + //MercFile.c enum diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index e33c5cad..18f9d034 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -2569,6 +2569,15 @@ STR16 MercAccountText[] = L"Weet je zeker de betaling van %s te autoriseren?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Previous", + L"Next", +}; + //For use at the M.E.R.C. web site. Text relating a MERC mercenary diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 55fcd10b..0cb886ea 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -2567,6 +2567,14 @@ STR16 MercAccountText[] = L"Are you sure you want to authorize the payment of %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Previous", + L"Next", +}; //For use at the M.E.R.C. web site. Text relating a MERC mercenary diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 5c7ceac2..66196fb3 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -2558,6 +2558,15 @@ STR16 MercAccountText[] = L"Désirez-vous autoriser le versement de %s ?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Previous", + L"Next", +}; + //For use at the M.E.R.C. web site. Text relating a MERC mercenary diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 16278237..66ab8c99 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -2455,6 +2455,15 @@ STR16 MercAccountText[] = L"Zahlung von %s wirklich genehmigen?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Zurück", + L"Weiter", +}; + //For use at the M.E.R.C. web site. Text relating a MERC mercenary STR16 MercInfo[] = { diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 56f7b701..9845c16a 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -2552,6 +2552,15 @@ STR16 MercAccountText[] = L"Conferma il pagamento di %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Previous", + L"Next", +}; + //For use at the M.E.R.C. web site. Text relating a MERC mercenary diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 6686f801..a782a4d9 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -2553,7 +2553,14 @@ STR16 MercAccountText[] = L"Czy na pewno chcesz zatwierdziæ p³atnoœæ: %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; - +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Previous", + L"Next", +}; //For use at the M.E.R.C. web site. Text relating a MERC mercenary diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index cae3db6a..4273e45d 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -2551,7 +2551,14 @@ STR16 MercAccountText[] = L"Âû óâåðåíû, ÷òî õîòèòå ïîäòâåðäèòü âûïëàòó %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) }; - +// WANNE 3 +// Merc Account Page buttons +STR16 MercAccountPageText[] = +{ + // Text on the buttons on the bottom of the screen + L"Previous", + L"Next", +}; //For use at the M.E.R.C. web site. Text relating a MERC mercenary