(svn r198) -Fix: [1020269] Different production? Wrong production amount was showed in the industry list window
-Fix: Show industry list is now the first dropdown item. Second is Fund Industry.
--- a/industry_gui.c Fri Sep 10 22:43:40 2004 +0000
+++ b/industry_gui.c Fri Sep 10 23:20:14 2004 +0000
@@ -494,11 +494,11 @@
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);
--- a/lang/american.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/american.txt Fri Sep 10 23:20:14 2004 +0000
@@ -788,8 +788,8 @@
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
--- a/lang/czech.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/czech.txt Fri Sep 10 23:20:14 2004 +0000
@@ -815,8 +815,8 @@
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
--- a/lang/danish.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/danish.txt Fri Sep 10 23:20:14 2004 +0000
@@ -809,8 +809,8 @@
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
--- a/lang/dutch.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/dutch.txt Fri Sep 10 23:20:14 2004 +0000
@@ -794,8 +794,8 @@
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
--- a/lang/english.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/english.txt Fri Sep 10 23:20:14 2004 +0000
@@ -815,8 +815,8 @@
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
--- a/lang/french.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/french.txt Fri Sep 10 23:20:14 2004 +0000
@@ -815,8 +815,8 @@
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
--- a/lang/galician.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/galician.txt Fri Sep 10 23:20:14 2004 +0000
@@ -788,8 +788,8 @@
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
--- a/lang/german.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/german.txt Fri Sep 10 23:20:14 2004 +0000
@@ -815,8 +815,8 @@
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
--- a/lang/hungarian.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/hungarian.txt Fri Sep 10 23:20:14 2004 +0000
@@ -815,8 +815,8 @@
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
--- a/lang/italian.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/italian.txt Fri Sep 10 23:20:14 2004 +0000
@@ -787,8 +787,8 @@
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
--- a/lang/norwegian.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/norwegian.txt Fri Sep 10 23:20:14 2004 +0000
@@ -785,8 +785,8 @@
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
--- a/lang/polish.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/polish.txt Fri Sep 10 23:20:14 2004 +0000
@@ -784,8 +784,8 @@
STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Ufunduj budowe nowego przedsieb.
############ range for menu starts
+STR_INDUSTRY_DIR :Katalog fabryk
STR_0313_FUND_NEW_INDUSTRY :Ufunduj nowe przedsieb.
-STR_INDUSTRY_DIR :Katalog fabryk
############ range ends here
STR_0314_FUND_NEW_INDUSTRY :{WHITE}Ufundowanie nowego przedsieb.
--- a/lang/slovak.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/slovak.txt Fri Sep 10 23:20:14 2004 +0000
@@ -786,8 +786,8 @@
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
--- a/lang/swedish.txt Fri Sep 10 22:43:40 2004 +0000
+++ b/lang/swedish.txt Fri Sep 10 23:20:14 2004 +0000
@@ -787,8 +787,8 @@
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
--- a/main_gui.c Fri Sep 10 22:43:40 2004 +0000
+++ b/main_gui.c Fri Sep 10 23:20:14 2004 +0000
@@ -213,8 +213,8 @@
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 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)