diff --git a/industry_gui.c b/industry_gui.c index cef336042d..3e05c79d0b 100644 --- a/industry_gui.c +++ b/industry_gui.c @@ -494,11 +494,11 @@ static void IndustryDirectoryWndProc(Window *w, WindowEvent *e) SET_DPARAM16(0, i->town->index); SET_DPARAM16(1, i->type + STR_4802_COAL_MINE); if (i->produced_cargo[0] != 0xFF) { - SET_DPARAM16(3, i->total_production[0] * 100 >> 8); + SET_DPARAM16(3, i->total_production[0]); SET_DPARAM16(2, _cargoc.names_long_s[i->produced_cargo[0]] + ((i->total_production[0]!=1)<<5)); if (i->produced_cargo[1] != 0xFF) { - SET_DPARAM16(5, i->total_production[1] * 100 >> 8); + SET_DPARAM16(5, i->total_production[1]); SET_DPARAM16(4, _cargoc.names_long_s[i->produced_cargo[1]] + ((i->total_production[1]!=1)<<5)); SET_DPARAM16(6, i->pct_transported[0] * 100 >> 8); SET_DPARAM16(7, i->pct_transported[1] * 100 >> 8); diff --git a/lang/american.txt b/lang/american.txt index daad5cca8b..b658b67b4d 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -788,8 +788,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Select 'toyland' landscape style STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Fund construction of new industry ############ range for menu starts +STR_INDUSTRY_DIR :Industry Directory STR_0313_FUND_NEW_INDUSTRY :Fund new industry -STR_INDUSTRY_DIR :Industry Directory ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Fund new industry diff --git a/lang/czech.txt b/lang/czech.txt index c16ef8b4f6..e6df459e0b 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Zeme hracek STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Investovat do nového prumyslu ############ range for menu starts +STR_INDUSTRY_DIR :Seznam prumyslu STR_0313_FUND_NEW_INDUSTRY :Investovat do prumyslu -STR_INDUSTRY_DIR :Seznam prumyslu ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Investovat do prumyslu diff --git a/lang/danish.txt b/lang/danish.txt index af7214a779..1162a70b35 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -809,8 +809,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Select 'leget STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Betal for bygningen af nye industrier ############ range for menu starts +STR_INDUSTRY_DIR :Industrioversigt STR_0313_FUND_NEW_INDUSTRY :Opfřr en ny industri -STR_INDUSTRY_DIR :Industrioversigt ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Opfřr ny industri diff --git a/lang/dutch.txt b/lang/dutch.txt index 2188b415cd..5fc92ae280 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -794,8 +794,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Kies 'speelgoedland' STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Betaal plaatsing van nieuwe industrie ############ range for menu starts -STR_0313_FUND_NEW_INDUSTRY :Betaal nieuwe industrie -STR_INDUSTRY_DIR :Industrielijst +STR_INDUSTRY_DIR :Industrielijst +STR_0313_FUND_NEW_INDUSTRY :Subsidieer nieuwe industrie ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Betaal nieuwe industrie diff --git a/lang/english.txt b/lang/english.txt index 2eb4f451f6..5169f2d8fd 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Select 'toyland' landscape style STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Fund construction of new industry ############ range for menu starts +STR_INDUSTRY_DIR :Industry Directory STR_0313_FUND_NEW_INDUSTRY :Fund new industry -STR_INDUSTRY_DIR :Industry Directory ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Fund new industry diff --git a/lang/french.txt b/lang/french.txt index 8e9b067c1d..79065a85f9 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Selectionner l'environnement 'Jouet STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Financer la construction de nouvelles industries ############ range for menu starts +STR_INDUSTRY_DIR :Annuaire des industries STR_0313_FUND_NEW_INDUSTRY :Financer une nouvelle industrie -STR_INDUSTRY_DIR :Annuaire des industries ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Financer une nouvelle industrie diff --git a/lang/galician.txt b/lang/galician.txt index d5718d71da..c40d7245b1 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -788,8 +788,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Selecciona-lo estilo da paisaxe 'Xogu STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Fundar unha nova industria ############ range for menu starts +STR_INDUSTRY_DIR :Directorio de Industrias STR_0313_FUND_NEW_INDUSTRY :Fundar unha nova industria -STR_INDUSTRY_DIR :Directorio de Industrias ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Fundar unha nova industria diff --git a/lang/german.txt b/lang/german.txt index cb1e851c3e..34a5051f04 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}'fantastische' Landschaft ausw STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Errichtung und Finanzierung einer neuen Industrie ############ range for menu starts +STR_INDUSTRY_DIR :Industrieverzeichnis STR_0313_FUND_NEW_INDUSTRY :Neue Industrie finanzieren -STR_INDUSTRY_DIR :Industrieverzeichnis ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Neue Industrie finanzieren diff --git a/lang/hungarian.txt b/lang/hungarian.txt index 58138322ad..241f3c5ed2 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}J STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Gazdasági épület építése ############ range for menu starts +STR_INDUSTRY_DIR :Gazdasági épületek listája STR_0313_FUND_NEW_INDUSTRY :Új gazdasági épület építése -STR_INDUSTRY_DIR :Gazdasági épületek listája ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Új gazdasági épület diff --git a/lang/italian.txt b/lang/italian.txt index e6e3e2deee..e526911e46 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -787,8 +787,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Seleziona paesaggio 'Citt STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Finanzia la costruzione di nuove industrie ############ range for menu starts +STR_INDUSTRY_DIR :Elenco Industrie STR_0313_FUND_NEW_INDUSTRY :Finanzia nuove industrie -STR_INDUSTRY_DIR :Elenco Industrie ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Finanzia nuove industrie diff --git a/lang/norwegian.txt b/lang/norwegian.txt index 0de30fb3af..d7e5e7e685 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -785,8 +785,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Velg leket STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Finansier byggingen av ny industri ############ range for menu starts +STR_INDUSTRY_DIR :Industri oversikt STR_0313_FUND_NEW_INDUSTRY :Finansier ny industri -STR_INDUSTRY_DIR :Industri oversikt ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Finansier ny industri diff --git a/lang/polish.txt b/lang/polish.txt index 793bb22d4c..6934bf28e3 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -784,8 +784,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Wybierz krajobraz 'Zabawkowy' STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Ufunduj budowe nowego przedsieb. ############ range for menu starts -STR_0313_FUND_NEW_INDUSTRY :Ufunduj nowe przedsieb. STR_INDUSTRY_DIR :Katalog fabryk +STR_0313_FUND_NEW_INDUSTRY :Ufunduj nowe przedsieb. ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Ufundowanie nowego przedsieb. diff --git a/lang/slovak.txt b/lang/slovak.txt index 89e11858c9..1e2c981e33 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -786,8 +786,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}Vyber 'detsky' styl uzemia STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Financovat vystavbu noveho priemyslu ############ range for menu starts +STR_INDUSTRY_DIR :Zoznam priemyslu STR_0313_FUND_NEW_INDUSTRY :Financovat novy priemysel -STR_INDUSTRY_DIR :Zoznam priemyslu ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Financovat novy priemysel diff --git a/lang/swedish.txt b/lang/swedish.txt index 036fee6f30..17b95ee554 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -787,8 +787,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLACK}V STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Bekosta byggnation av ny industri ############ range for menu starts +STR_INDUSTRY_DIR :Industriförteckning STR_0313_FUND_NEW_INDUSTRY :Bekosta ny industri -STR_INDUSTRY_DIR :Industriförteckning ############ range ends here STR_0314_FUND_NEW_INDUSTRY :{WHITE}Bekosta ny industri diff --git a/main_gui.c b/main_gui.c index a281b31539..9f9933e6ed 100644 --- a/main_gui.c +++ b/main_gui.c @@ -213,8 +213,8 @@ void MenuClickLeague(int index) void MenuClickIndustry(int index) { switch(index) { - case 0: ShowBuildIndustryWindow(); break; - case 1: ShowIndustryDirectory(); break; + case 0: ShowIndustryDirectory(); break; + case 1: ShowBuildIndustryWindow(); break; } } @@ -658,7 +658,7 @@ static void ToolbarLeagueClick(Window *w) static void ToolbarIndustryClick(Window *w) { - PopupMainToolbMenu(w, 280, 12, STR_0313_FUND_NEW_INDUSTRY, 2); + PopupMainToolbMenu(w, 280, 12, STR_INDUSTRY_DIR, 2); } static void ToolbarTrainClick(Window *w)