diff options
| author | frosch <frosch@openttd.org> | 2011-05-06 22:10:50 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-05-06 22:10:50 +0000 |
| commit | 844dc8646f3d265b6aa7daf562d7eb3a7b7586bf (patch) | |
| tree | 4070a1ca4ae6cba5625beda8ad6db19902bd5ca9 | |
| parent | 5e449b8fae1f5f9941a385a49eb1e958788809c2 (diff) | |
| download | openttd-844dc8646f3d265b6aa7daf562d7eb3a7b7586bf.tar.xz | |
(svn r22430) -Fix: COAL, RUBR, SUGR and the coalmine used windows palette colours in smallmap/legends etc..
| -rw-r--r-- | src/table/build_industry.h | 2 | ||||
| -rw-r--r-- | src/table/cargo_const.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/table/build_industry.h b/src/table/build_industry.h index 940c656e7..bcb6e28ec 100644 --- a/src/table/build_industry.h +++ b/src/table/build_industry.h @@ -1197,7 +1197,7 @@ enum IndustryTypes { 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, diff --git a/src/table/cargo_const.h b/src/table/cargo_const.h index 17c2a7753..acd3fde3b 100644 --- a/src/table/cargo_const.h +++ b/src/table/cargo_const.h @@ -18,7 +18,7 @@ static const CargoSpec _default_cargo[] = { 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 @@ static const CargoSpec _default_cargo[] = { 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 ), |