From cbbcbf48c0445747f32aa1c478285f131dea253f Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 14 Nov 2013 18:35:16 +0000 Subject: [PATCH] Various fixes (by Buggler): - Fixed IMP Background hardcoded text: Prev, Next & None. - Fixed unable to proceed to IMP Attribute screen when Merc Background feature is off - Changed 'Ore Type' text to 'Resource' git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6599 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/IMP Background.cpp | 6 +++--- Laptop/IMP Minor Trait.cpp | 20 ++++++++++---------- Utils/_ChineseText.cpp | 3 ++- Utils/_DutchText.cpp | 3 ++- Utils/_EnglishText.cpp | 3 ++- Utils/_FrenchText.cpp | 3 ++- Utils/_GermanText.cpp | 3 ++- Utils/_ItalianText.cpp | 3 ++- Utils/_PolishText.cpp | 3 ++- Utils/_RussianText.cpp | 3 ++- Utils/_TaiwaneseText.cpp | 3 ++- 11 files changed, 31 insertions(+), 22 deletions(-) diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp index 5342abb4..4b0688ec 100644 --- a/Laptop/IMP Background.cpp +++ b/Laptop/IMP Background.cpp @@ -227,7 +227,7 @@ void AddIMPBackgroundButtons() // next button giIMPBackgroundButtonImage[0]= LoadButtonImage( "LAPTOP\\voicearrows.sti" ,-1,1,-1,3,-1 ); - giIMPBackgroundButton[0] = CreateIconAndTextButton( giIMPBackgroundButtonImage[0], pImpButtonText[13], FONT12ARIAL, + giIMPBackgroundButton[0] = CreateIconAndTextButton( giIMPBackgroundButtonImage[0], pImpButtonText[ 13 ], FONT12ARIAL, FONT_WHITE, DEFAULT_SHADOW, FONT_WHITE, DEFAULT_SHADOW, TEXT_CJUSTIFIED, @@ -236,7 +236,7 @@ void AddIMPBackgroundButtons() // previous button giIMPBackgroundButtonImage[ 1 ]= LoadButtonImage( "LAPTOP\\voicearrows.sti" ,-1,0,-1,2,-1 ); - giIMPBackgroundButton[ 1 ] = CreateIconAndTextButton( giIMPBackgroundButtonImage[ 1 ], pImpButtonText[12], FONT12ARIAL, + giIMPBackgroundButton[ 1 ] = CreateIconAndTextButton( giIMPBackgroundButtonImage[ 1 ], pImpButtonText[ 12 ], FONT12ARIAL, FONT_WHITE, DEFAULT_SHADOW, FONT_WHITE, DEFAULT_SHADOW, TEXT_CJUSTIFIED, @@ -395,7 +395,7 @@ void IMPBackgroundDisplaySkills() //draw the text to the screenx if ( uiCnt == IMP_BACKGROUND_NONE ) - DrawTextToScreen( L"None", usPosX, usPosY, 0, IMP_BACKGROUND__FONT, IMP_BACKGROUND__COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); + DrawTextToScreen( pImpButtonText[ 26 ], usPosX, usPosY, 0, IMP_BACKGROUND__FONT, IMP_BACKGROUND__COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); else DrawTextToScreen( zBackground[ background ].szShortName, usPosX, usPosY, 0, IMP_BACKGROUND__FONT, IMP_BACKGROUND__COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED ); diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp index d487eda8..ddc8812c 100644 --- a/Laptop/IMP Minor Trait.cpp +++ b/Laptop/IMP Minor Trait.cpp @@ -494,26 +494,26 @@ void BtnIMPMinorTraitFinishCallback(GUI_BUTTON *btn,INT32 reason) { btn->uiFlags|=(BUTTON_CLICKED_ON); - //if we are just reviewing the page - if( iCurrentProfileMode == IMP__FINISH ) - { - //go back tot he done screen - iCurrentImpPage = IMP_FINISH; - } - // Flugente: setting determines wether we see the background page - else if ( gGameOptions.fBackGround ) + // Flugente: setting determines whether we see the background page + if ( gGameOptions.fBackGround ) { iCurrentImpPage = IMP_BACKGROUND; fButtonPendingFlag = TRUE; } + //if we are just reviewing the page + else if( iCurrentProfileMode == IMP__FINISH ) + { + //go back to the done screen + iCurrentImpPage = IMP_FINISH; + } else { iCurrentImpPage = IMP_MAIN_PAGE; fButtonPendingFlag = TRUE; - /*if( CameBackToMinorTraitPageButNotFinished() ) + if( CameBackToMinorTraitPageButNotFinished() ) { } @@ -521,7 +521,7 @@ void BtnIMPMinorTraitFinishCallback(GUI_BUTTON *btn,INT32 reason) { //We are finished on this page iCurrentProfileMode = IMP__ATTRIBUTES; - }*/ + } } } } diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index e046252e..84eb5fec 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -3370,7 +3370,7 @@ STR16 pwMineStrings[] = L"生产", L"状态", L"生产率", - L"矿石类型", // 10 + L"Resource", // 10 L"矿石类型", // TODO.Translate L"占领度", L"忠诚度", // L"在岗矿工", @@ -3945,6 +3945,7 @@ STR16 pImpButtonText[] = L"分析...", // analyzing your profile results L"完成", L"性格", // Change from "Voice" - SANDRO + L"无", //"None", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 9a8b6bce..e40281a6 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3367,7 +3367,7 @@ STR16 pwMineStrings[] = L"Produceert", L"Status", L"Prod. Tempo", - L"Ertstype", // 10 + L"Resource", // 10 L"Ertstype", // TODO.Translate L"Gezag Dorp", L"Loyaliteit Dorp", // L"Mijnwerkers", @@ -3942,6 +3942,7 @@ STR16 pImpButtonText[] = L"Analyseren", // analyzing your profile results L"OK", L"Character", // Change from "Voice" + L"None", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index e01dac51..e00765fc 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3370,7 +3370,7 @@ STR16 pwMineStrings[] = L"Producing", L"Status", L"Production Rate", - L"Ore Type", // 10 + L"Resource", // 10 L"Town Control", L"Town Loyalty", // L"Working Miners", @@ -3945,6 +3945,7 @@ STR16 pImpButtonText[] = L"Analyzing", // analyzing your profile results L"OK", L"Character", // Change from "Voice" + L"None", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 64a945e5..a4d0657a 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3374,7 +3374,7 @@ STR16 pwMineStrings[] = L"Production", L"État", L"Productivité", - L"Type de minerai", // 10 + L"Resource", // 10 L"Type de minerai", // TODO.Translate L"Contrôle de la ville", L"Loyauté de la ville", // L"Mineurs au travail", @@ -3948,6 +3948,7 @@ STR16 pImpButtonText[] = L"Analyse", // analyzing your profile results L"OK", L"Caractère", // Change from "Voice" + L"Aucune", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 3eb2fc6b..3935c1a4 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3361,7 +3361,7 @@ STR16 pwMineStrings[] = L"Produziert", L"Status", L"Produktionsrate", - L"Erzart", // 10 + L"Resource", // 10 L"Erzart", // TODO.Translate L"Kontrolle über Stadt", L"Loyalität der Stadt", // L"Minenarbeiter", @@ -3896,6 +3896,7 @@ STR16 pImpButtonText[] = L"Analyse wird durchgeführt", // analyzing your profile results L"OK", L"Charakter", // Change from "Voice" + L"Keine", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index d9a442ec..954ac737 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3361,7 +3361,7 @@ STR16 pwMineStrings[] = L"Produci", L"Stato", L"Ammontare produzione", - L"Tipo di minerale", // 10 + L"Resource", // 10 L"Tipo di minerale", // TODO.Translate L"Controllo della città", L"Lealtà della città", // L"Minatori", @@ -3935,6 +3935,7 @@ STR16 pImpButtonText[] = L"Analisi", // analyzing your profile results L"OK", L"Character", // Change from "Voice" + L"Nessuna", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 64ea8b59..d8ce464f 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3377,7 +3377,7 @@ STR16 pwMineStrings[] = L"Produkuje", L"Stan", L"Tempo produkcji", - L"Typ złoża", // 10 + L"Resource", // 10 L"Typ złoża", // TODO.Translate L"Kontrola miasta", L"Lojalność miasta", // L"Górnicy", @@ -3954,6 +3954,7 @@ STR16 pImpButtonText[] = L"Analizuję...", // analyzing your profile results L"OK", L"Postać", // Change from "Voice" + L"Brak", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 4975d3cc..1b4d3bb7 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3368,7 +3368,7 @@ STR16 pwMineStrings[] = L"Идет добыча", L"Статус", L"Уровень добычи", - L"Тип руды", // 10 + L"Resource", // 10 L"Тип руды", // TODO.Translate L"Принадлежность", L"Лояльность", // L"Работ.шахтеры", @@ -3943,6 +3943,7 @@ STR16 pImpButtonText[] = L"Анализ данных", // analyzing your profile results L"Готово", L"Личные качества", // Character + L"Нет", }; STR16 pExtraIMPStrings[] = diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 27724d72..916a734e 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -3372,7 +3372,7 @@ STR16 pwMineStrings[] = L"Producing", L"Status", L"Production Rate", - L"Ore Type", // 10 + L"Resource", // 10 L"Town Control", L"Town Loyalty", // L"Working Miners", @@ -3949,6 +3949,7 @@ STR16 pImpButtonText[] = L"Analyzing", // analyzing your profile results L"OK", L"Character", // Change from "Voice" + L"None", }; STR16 pExtraIMPStrings[] =