From a2eaf80830c4b3fc81c9822c9f7907df524d1e43 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 26 Oct 2011 12:26:24 +0000 Subject: [PATCH] - Fixed text problems on money UDB popup git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4746 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 4 ++-- Utils/_ChineseText.cpp | 4 ++-- Utils/_DutchText.cpp | 6 +++--- Utils/_EnglishText.cpp | 6 +++--- Utils/_FrenchText.cpp | 6 +++--- Utils/_GermanText.cpp | 9 +++++---- Utils/_ItalianText.cpp | 4 ++-- Utils/_PolishText.cpp | 6 +++--- Utils/_RussianText.cpp | 4 ++-- Utils/_TaiwaneseText.cpp | 6 +++--- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index fe6e3e3e6..af8d37fed 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -5348,7 +5348,7 @@ void RenderItemDescriptionBox( ) swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemaining ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); - FindFontRightCoordinates( gMoneyStats[ 4 ].sX, gMoneyStats[ 4 ].sY, ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); + FindFontRightCoordinates( gMoneyStats[ 4 ].sX + 50, gMoneyStats[ 4 ].sY, ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); //Display the total amount of money removing @@ -5356,7 +5356,7 @@ void RenderItemDescriptionBox( ) swprintf( pStr, L"%ld", gRemoveMoney.uiMoneyRemoving ); InsertCommasForDollarFigure( pStr ); InsertDollarSignInToString( pStr ); - FindFontRightCoordinates( gMoneyStats[ 5 ].sX, gMoneyStats[ 5 ].sY, ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); + FindFontRightCoordinates( gMoneyStats[ 5 ].sX + 50, gMoneyStats[ 5 ].sY, ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY); mprintf( usX, usY, pStr ); } else diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index a6a8522f4..9b6ff3160 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -2409,9 +2409,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"金额: ", // the amount he wants to separate from the overall balance to get two piles of money L"当前", - L"余额", + L"余额:", L"提取", - L"金额", + L"金额:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 8ca56c187..555ebb36f 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -2407,9 +2407,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"Splitsen:", // the amount he wants to separate from the overall balance to get two piles of money L"Huidig", - L"Saldo", - L"Bedrag naar", - L"Opnemen", + L"Saldo:", + L"Bedrag", + L"naar Opnemen:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 0c6fb4b33..9ed798792 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -2410,9 +2410,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"To Split:", // the amount he wants to separate from the overall balance to get two piles of money L"Current", - L"Balance", - L"Amount to", - L"Withdraw", + L"Balance:", + L"Amount", + L"To Withdraw:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 89cdbc073..db4c42ded 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -2410,9 +2410,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"Partager :", // the amount he wants to separate from the overall balance to get two piles of money L"Actuel", - L"Solde", - L"Montant ", - L"Retirer", + L"Solde :", + L"Montant", + L" Retirer :", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 11b30a410..69cbd5eff 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -2411,13 +2411,14 @@ STR16 gConditionDesc[] = CHAR16 gMoneyStatsDesc[][ 13 ] = { L"Betrag", - L"Verbleibend:", //this is the overall balance + L"verbleibend:", //this is the overall balance L"Betrag", - L"Abheben:", // the amount he wants to separate from the overall balance to get two piles of money + L"teilen:", // the amount he wants to separate from the overall balance to get two piles of money + L"Konto", - L"Saldo", + L"Saldo:", L"Betrag", - L"abheben", + L"abheben:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index c294d57f1..41d0d6e92 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -2402,9 +2402,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"Da separare:", // the amount he wants to separate from the overall balance to get two piles of money L"Bilancio", - L"corrente", + L"corrente:", L"Ammontare", - L"del prelievo", + L"del prelievo:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 0dc0b10ec..0400f69a4 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -2411,9 +2411,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"Wydzieliæ:", // the amount he wants to separate from the overall balance to get two piles of money L"Bie¿¹ce", - L"Saldo", - L"Kwota do", - L"podjêcia", + L"Saldo:", + L"Kwota", + L"do podjêcia:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 6b2d5dee6..d73cff08c 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -2409,9 +2409,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"Отделить:", //the amount he wants to separate from the overall balance to get two piles of money L"Текущий", - L"Баланс", + L"Баланс:", L"Снимаемая", - L"Сумма", + L"Сумма:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index d20a5421d..19d7b3aa1 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -2411,9 +2411,9 @@ CHAR16 gMoneyStatsDesc[][ 13 ] = L"To Split:", // the amount he wants to separate from the overall balance to get two piles of money L"Current", - L"Balance", - L"Amount to", - L"Withdraw", + L"Balance:", + L"Amount", + L"To Withdraw:", }; //The health of various creatures, enemies, characters in the game. The numbers following each are for comment