Mercurial > hg > openttd

changeset 17658:f4accf98e617 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22430) -Fix: COAL, RUBR, SUGR and the coalmine used windows palette colours in smallmap/legends etc..
author frosch <frosch@openttd.org>
date Fri, 06 May 2011 22:10:50 +0000
parents c2a2cda37d1b
children 7d78fa10a609
files src/table/build_industry.h src/table/cargo_const.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/table/build_industry.h
+++ b/src/table/build_industry.h
@@ -1197,7 +1197,7 @@
 	   messages : Closure                      production up                      production down   */
 static const IndustrySpec _origin_industry_specs[NEW_INDUSTRYOFFSET] = {
 	MI(_tile_table_coal_mine,                  0, NULL,
-	   210,  0xB3333333,                       2, 3, 0, 0,    8, 8, 0, 0,        215,
+	   210,  0xB3333333,                       2, 3, 0, 0,    8, 8, 0, 0,          1,
 	   IT_POWER_STATION,  IT_INVALID,          IT_INVALID,       CHECK_NOTHING,
 	   CT_COAL,       15, CT_INVALID,       0, 5,
 	   CT_INVALID,   256, CT_INVALID,     256, CT_INVALID,   256,
--- a/src/table/cargo_const.h
+++ b/src/table/cargo_const.h
@@ -18,7 +18,7 @@
 		STR_CARGO_PLURAL_PASSENGERS,     STR_CARGO_SINGULAR_PASSENGER,      STR_PASSENGERS, STR_QUANTITY_PASSENGERS,   STR_ABBREV_PASSENGERS,
 		SPR_CARGO_PASSENGER,     CC_PASSENGERS  ),
 
-	MK(  1, 'COAL',  32, 16, 5916,  7, 255, true,  TE_NONE,
+	MK(  1, 'COAL',   6, 16, 5916,  7, 255, true,  TE_NONE,
 		STR_CARGO_PLURAL_COAL,           STR_CARGO_SINGULAR_COAL,           STR_TONS,       STR_QUANTITY_COAL,         STR_ABBREV_COAL,
 		SPR_CARGO_COAL,          CC_BULK        ),
 
@@ -106,11 +106,11 @@
 		STR_CARGO_PLURAL_WATER,          STR_CARGO_SINGULAR_WATER,          STR_LITERS,     STR_QUANTITY_WATER,        STR_ABBREV_WATER,
 		SPR_CARGO_WATERCOLA,     CC_LIQUID      ),
 
-	MK( 16, 'RUBR',  32, 16, 4437,  2,  20, true,  TE_NONE,
+	MK( 16, 'RUBR',   6, 16, 4437,  2,  20, true,  TE_NONE,
 		STR_CARGO_PLURAL_RUBBER,         STR_CARGO_SINGULAR_RUBBER,         STR_LITERS,     STR_QUANTITY_RUBBER,       STR_ABBREV_RUBBER,
 		SPR_CARGO_RUBBER,        CC_LIQUID      ),
 
-	MK( 17, 'SUGR',  32, 16, 4437, 20, 255, true,  TE_NONE,
+	MK( 17, 'SUGR',   6, 16, 4437, 20, 255, true,  TE_NONE,
 		STR_CARGO_PLURAL_SUGAR,          STR_CARGO_SINGULAR_SUGAR,          STR_TONS,       STR_QUANTITY_SUGAR,        STR_ABBREV_SUGAR,
 		SPR_CARGO_SUGAR,         CC_BULK        ),