diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index ba736115..235241aa 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -501,7 +501,7 @@ void DisplayHiredMercs() { UINT16 usPosY; UINT32 uiContractCharge; - CHAR16 sTemp[20]; + CHAR16 sTemp[40]; UINT8 i, usMercID; UINT8 ubFontColor; UINT8 usMercIDStart; @@ -545,7 +545,16 @@ void DisplayHiredMercs() uiContractCharge = 0; //Display Mercs Name - DrawTextToScreen( gMercProfiles[ usMercID ].zName, MERC_AC_FIRST_COLUMN_X+5, usPosY, MERC_AC_FIRST_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, ubFontColor, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED); + if ( gMercProfiles[usMercID].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID ) + { + swprintf( sTemp, MercAccountText[MERC_ACCOUNT_NAME_PLUSGEAR], gMercProfiles[usMercID].zName ); + } + else + { + swprintf( sTemp, L"%s", gMercProfiles[usMercID].zName ); + } + + DrawTextToScreen( sTemp, MERC_AC_FIRST_COLUMN_X + 5, usPosY, MERC_AC_FIRST_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, ubFontColor, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); //Display The # of days the merc has worked since last paid @@ -553,19 +562,21 @@ void DisplayHiredMercs() DrawTextToScreen(sTemp, MERC_AC_SECOND_COLUMN_X, usPosY, MERC_AC_SECOND_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, ubFontColor, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); //Display the mercs rate - #ifdef JA2UB +#ifdef JA2UB swprintf(sTemp, L"$%6d",gMercProfiles[ usMercID ].uiWeeklySalary ); - #else +#else swprintf(sTemp, L"$%6d",gMercProfiles[ usMercID ].sSalary ); - #endif +#endif + DrawTextToScreen(sTemp, MERC_AC_THIRD_COLUMN_X, usPosY, MERC_AC_THIRD_COLUMN_WIDTH, MERC_ACCOUNT_DYNAMIC_TEXT_FONT, ubFontColor, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED); //Display the total charge - #ifdef JA2UB +#ifdef JA2UB uiContractCharge = gMercProfiles[ usMercID ].uiWeeklySalary * gMercProfiles[ usMercID ].iMercMercContractLength; - #else +#else uiContractCharge = gMercProfiles[ usMercID ].sSalary * gMercProfiles[ usMercID ].iMercMercContractLength; - #endif +#endif + //JMich_MMG: If gearkit unpaid for, add its cost if ( gMercProfiles[ usMercID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) { diff --git a/Utils/Text.h b/Utils/Text.h index 56486b58..4def2b49 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -1184,7 +1184,7 @@ enum MERC_ACCOUNT_CHARGE, MERC_ACCOUNT_TOTAL, MERC_ACCOUNT_AUTHORIZE_CONFIRMATION, - MERC_ACCOUNT_NOT_ENOUGH_MONEY, + MERC_ACCOUNT_NAME_PLUSGEAR, TEXT_NUM_MERC_ACCOUNT, }; extern STR16 MercAccountText[]; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 147ece20..49fe3049 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4671,6 +4671,7 @@ STR16 MercAccountText[] = L"索价", L"合计: ", L"你确定要支付%s吗?", + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index ebca6876..da1ebc3b 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4671,6 +4671,7 @@ STR16 MercAccountText[] = L"Prijs", L"Totaal:", L"Weet je zeker de betaling van %s te autoriseren?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 0d5b8521..b350c38b 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4670,6 +4670,7 @@ STR16 MercAccountText[] = L"Charge", L"Total:", L"Are you sure you want to authorize the payment of %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", }; // Merc Account Page buttons diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 799b5eb2..3ddaeba3 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4680,6 +4680,7 @@ STR16 MercAccountText[] = L"Montant", L"Total :", L"Désirez-vous autoriser le versement de %s ?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index a044d9f4..22795844 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4602,6 +4602,7 @@ STR16 MercAccountText[] = L"Belasten", L"Gesamt:", L"Zahlung von %s wirklich genehmigen?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 2e40d5e1..0fc60898 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4662,6 +4662,7 @@ STR16 MercAccountText[] = L"Costo", L"Totale:", L"Conferma il pagamento di %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index c05c2500..c18d89f2 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4681,6 +4681,7 @@ STR16 MercAccountText[] = L"Opłata", L"Razem:", L"Czy na pewno chcesz zatwierdzić płatność: %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 3e18ab1f..41c21667 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4667,6 +4667,7 @@ STR16 MercAccountText[] = L"Стоимость", L"Всего:", L"Вы подтверждаете платеж в размере %s?", //the %s is a string that contains the dollar amount ( ex. "$150" ) + L"%s (+gear)", // TODO.Translate }; // Merc Account Page buttons