cpp/openttd-patchpack/source Changeset - r197:6b4d4a29186b

Changeset - r197:6b4d4a29186b

Parent rev.

Child rev.

[Not reviewed]

master

0 16 0

darkvater - 20 years ago 2004-09-10 23:20:14
darkvater@openttd.org

(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.

16 files changed with 20 insertions and 20 deletions:

industry_gui.c

lang/american.txt

lang/czech.txt

lang/danish.txt

lang/dutch.txt

lang/english.txt

lang/french.txt

lang/galician.txt

lang/german.txt

lang/hungarian.txt

lang/italian.txt

lang/norwegian.txt

lang/polish.txt

lang/slovak.txt

lang/swedish.txt

main_gui.c

0 comments (0 inline, 0 general)

industry_gui.c

➞

Show inline comments

@@ @@ -494,11 +494,11 @@ static void IndustryDirectoryWndProc(Win @@
 			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);

lang/american.txt

➞

Show inline comments

@@ @@ -788,8 +788,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLA @@
 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

lang/czech.txt

➞

Show inline comments

@@ @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{B @@
 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

lang/danish.txt

➞

Show inline comments

 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

lang/dutch.txt

➞

Show inline comments

@@ @@ -794,8 +794,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{B @@
 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

lang/english.txt

➞

Show inline comments

@@ @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{B @@
 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

lang/french.txt

➞

Show inline comments

@@ @@ -815,8 +815,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{B @@
 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

lang/galician.txt

➞

Show inline comments

@@ @@ -788,8 +788,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLA @@
 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

lang/german.txt

➞

Show inline comments

 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

lang/hungarian.txt

➞

Show inline comments

 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

lang/italian.txt

➞

Show inline comments

 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

lang/norwegian.txt

➞

Show inline comments

 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

lang/polish.txt

➞

Show inline comments

@@ @@ -784,8 +784,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE @@
 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.

lang/slovak.txt

➞

Show inline comments

@@ @@ -786,8 +786,8 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE :{BLA @@
 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

lang/swedish.txt

➞

Show inline comments

 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

main_gui.c

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)