openttd-mini: src/table/cargo_const.h@a1a609566853 (annotated)

6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	1	/* $Id$ */
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	2
9111 48ce04029fe4 (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. rubidium parents: 8959 diff changeset	3	/** @file cargo_const.h Table of all default cargo types */
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	4
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	5	#define MK(bt, label, c, e, f, g, h, fr, te, ks1, ks2, ks3, ks4, ks5, l, m) \
9750 7114408dd1fa (svn r13885) -Fix [FS#2168]: Var 0x7F is not feature-specific. frosch parents: 9111 diff changeset	6	{bt, label, c, c, e, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, NULL, NULL}
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	7	static const CargoSpec _default_cargo[] = {
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	8	MK( 0, 'PASS', 152, 1, 3185, 0, 24, false, TE_PASSENGERS,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	9	STR_000F_PASSENGERS, STR_002F_PASSENGER, STR_PASSENGERS, STR_QUANTITY_PASSENGERS, STR_ABBREV_PASSENGERS,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	10	SPR_CARGO_PASSENGER, CC_PASSENGERS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	11
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	12	MK( 1, 'COAL', 32, 16, 5916, 7, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	13	STR_0010_COAL, STR_0030_COAL, STR_TONS, STR_QUANTITY_COAL, STR_ABBREV_COAL,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	14	SPR_CARGO_COAL, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	15
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	16	MK( 2, 'MAIL', 15, 4, 4550, 20, 90, false, TE_MAIL,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	17	STR_0011_MAIL, STR_0031_MAIL, STR_BAGS, STR_QUANTITY_MAIL, STR_ABBREV_MAIL,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	18	SPR_CARGO_MAIL, CC_MAIL ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	19
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	20	/* Oil in temperate and arctic */
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	21	MK( 3, 'OIL_', 174, 16, 4437, 25, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	22	STR_0012_OIL, STR_0032_OIL, STR_LITERS, STR_QUANTITY_OIL, STR_ABBREV_OIL,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	23	SPR_CARGO_OIL, CC_LIQUID ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	24
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	25	/* Oil in subtropic */
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	26	MK( 3, 'OIL_', 174, 16, 4892, 25, 255, true, TE_NONE,
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	27	STR_0012_OIL, STR_0032_OIL, STR_LITERS, STR_QUANTITY_OIL, STR_ABBREV_OIL,
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	28	SPR_CARGO_OIL, CC_LIQUID ),
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	29
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	30	MK( 4, 'LVST', 208, 3, 4322, 4, 18, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	31	STR_0013_LIVESTOCK, STR_0033_LIVESTOCK, STR_ITEMS, STR_QUANTITY_LIVESTOCK, STR_ABBREV_LIVESTOCK,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	32	SPR_CARGO_LIVESTOCK, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	33
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	34	MK( 5, 'GOOD', 194, 8, 6144, 5, 28, true, TE_GOODS,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	35	STR_0014_GOODS, STR_0034_GOODS, STR_CRATES, STR_QUANTITY_GOODS, STR_ABBREV_GOODS,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	36	SPR_CARGO_GOODS, CC_EXPRESS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	37
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	38	MK( 6, 'GRAI', 191, 16, 4778, 4, 40, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	39	STR_0015_GRAIN, STR_0035_GRAIN, STR_TONS, STR_QUANTITY_GRAIN, STR_ABBREV_GRAIN,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	40	SPR_CARGO_GRAIN, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	41
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	42	MK( 6, 'WHEA', 191, 16, 4778, 4, 40, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	43	STR_0022_WHEAT, STR_0042_WHEAT, STR_TONS, STR_QUANTITY_WHEAT, STR_ABBREV_WHEAT,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	44	SPR_CARGO_GRAIN, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	45
9987 ee1e22594629 (svn r14144) -Fix (r8826): Incorrect cargo weights peter1138 parents: 9750 diff changeset	46	MK( 6, 'MAIZ', 191, 16, 4322, 4, 40, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	47	STR_001B_MAIZE, STR_003B_MAIZE, STR_TONS, STR_QUANTITY_MAIZE, STR_ABBREV_MAIZE,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	48	SPR_CARGO_GRAIN, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	49
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	50	/* Wood in temperate and arctic */
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	51	MK( 7, 'WOOD', 84, 16, 5005, 15, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	52	STR_0016_WOOD, STR_0036_WOOD, STR_TONS, STR_QUANTITY_WOOD, STR_ABBREV_WOOD,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	53	SPR_CARGO_WOOD, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	54
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	55	/* Wood in subtropic */
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	56	MK( 7, 'WOOD', 84, 16, 7964, 15, 255, true, TE_NONE,
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	57	STR_0016_WOOD, STR_0036_WOOD, STR_TONS, STR_QUANTITY_WOOD, STR_ABBREV_WOOD,
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	58	SPR_CARGO_WOOD, CC_PIECE_GOODS ),
dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	59
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	60	MK( 8, 'IORE', 184, 16, 5120, 9, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	61	STR_0017_IRON_ORE, STR_0037_IRON_ORE, STR_TONS, STR_QUANTITY_IRON_ORE, STR_ABBREV_IRON_ORE,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	62	SPR_CARGO_IRON_ORE, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	63
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	64	MK( 9, 'STEL', 10, 16, 5688, 7, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	65	STR_0018_STEEL, STR_0038_STEEL, STR_TONS, STR_QUANTITY_STEEL, STR_ABBREV_STEEL,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	66	SPR_CARGO_STEEL, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	67
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	68	MK( 10, 'VALU', 202, 2, 7509, 1, 32, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	69	STR_0019_VALUABLES, STR_0039_VALUABLES, STR_BAGS, STR_QUANTITY_VALUABLES, STR_ABBREV_VALUABLES,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	70	SPR_CARGO_VALUES_GOLD, CC_ARMOURED ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	71
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	72	MK( 10, 'GOLD', 202, 8, 5802, 10, 40, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	73	STR_0020_GOLD, STR_0040_GOLD, STR_BAGS, STR_QUANTITY_GOLD, STR_ABBREV_GOLD,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	74	SPR_CARGO_VALUES_GOLD, CC_ARMOURED ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	75
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	76	MK( 10, 'DIAM', 202, 2, 5802, 10, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	77	STR_001D_DIAMONDS, STR_003D_DIAMOND, STR_BAGS, STR_QUANTITY_DIAMONDS, STR_ABBREV_DIAMONDS,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	78	SPR_CARGO_DIAMONDS, CC_ARMOURED ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	79
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	80	MK( 11, 'PAPR', 10, 16, 5461, 7, 60, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	81	STR_001F_PAPER, STR_003F_PAPER, STR_TONS, STR_QUANTITY_PAPER, STR_ABBREV_PAPER,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	82	SPR_CARGO_PAPER, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	83
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	84	MK( 12, 'FOOD', 48, 16, 5688, 0, 30, true, TE_FOOD,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	85	STR_001E_FOOD, STR_003E_FOOD, STR_TONS, STR_QUANTITY_FOOD, STR_ABBREV_FOOD,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	86	SPR_CARGO_FOOD, CC_EXPRESS \| CC_REFRIGERATED),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	87
9987 ee1e22594629 (svn r14144) -Fix (r8826): Incorrect cargo weights peter1138 parents: 9750 diff changeset	88	MK( 13, 'FRUT', 208, 16, 4209, 0, 15, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	89	STR_001C_FRUIT, STR_003C_FRUIT, STR_TONS, STR_QUANTITY_FRUIT, STR_ABBREV_FRUIT,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	90	SPR_CARGO_FRUIT, CC_BULK \| CC_REFRIGERATED),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	91
9987 ee1e22594629 (svn r14144) -Fix (r8826): Incorrect cargo weights peter1138 parents: 9750 diff changeset	92	MK( 14, 'CORE', 184, 16, 4892, 12, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	93	STR_001A_COPPER_ORE, STR_003A_COPPER_ORE, STR_TONS, STR_QUANTITY_COPPER_ORE, STR_ABBREV_COPPER_ORE,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	94	SPR_CARGO_COPPER_ORE, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	95
9987 ee1e22594629 (svn r14144) -Fix (r8826): Incorrect cargo weights peter1138 parents: 9750 diff changeset	96	MK( 15, 'WATR', 10, 16, 4664, 20, 80, true, TE_WATER,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	97	STR_0021_WATER, STR_0041_WATER, STR_LITERS, STR_QUANTITY_WATER, STR_ABBREV_WATER,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	98	SPR_CARGO_WATERCOLA, CC_LIQUID ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	99
9987 ee1e22594629 (svn r14144) -Fix (r8826): Incorrect cargo weights peter1138 parents: 9750 diff changeset	100	MK( 16, 'RUBR', 32, 16, 4437, 2, 20, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	101	STR_0023_RUBBER, STR_0043_RUBBER, STR_LITERS, STR_QUANTITY_RUBBER, STR_ABBREV_RUBBER,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	102	SPR_CARGO_RUBBER, CC_LIQUID ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	103
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	104	MK( 17, 'SUGR', 32, 16, 4437, 20, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	105	STR_0024_SUGAR, STR_0044_SUGAR, STR_TONS, STR_QUANTITY_SUGAR, STR_ABBREV_SUGAR,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	106	SPR_CARGO_SUGAR, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	107
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	108	MK( 18, 'TOYS', 174, 2, 5574, 25, 255, true, TE_NONE,
8708 3942440bba65 (svn r12382) -Fix [FS#1864]: use 'items' unit for batteries, fizzy drinks, toys and bubbles in total cargo tab glx parents: 8298 diff changeset	109	STR_0025_TOYS, STR_0045_TOY, STR_ITEMS, STR_QUANTITY_TOYS, STR_ABBREV_TOYS,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	110	SPR_CARGO_TOYS, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	111
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	112	MK( 19, 'BATT', 208, 4, 4322, 2, 30, true, TE_NONE,
8708 3942440bba65 (svn r12382) -Fix [FS#1864]: use 'items' unit for batteries, fizzy drinks, toys and bubbles in total cargo tab glx parents: 8298 diff changeset	113	STR_002B_BATTERIES, STR_004B_BATTERY, STR_ITEMS, STR_QUANTITY_BATTERIES, STR_ABBREV_BATTERIES,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	114	SPR_CARGO_BATTERIES, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	115
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	116	MK( 20, 'SWET', 194, 5, 6144, 8, 40, true, TE_GOODS,
7878 4ed1ca40b1f6 (svn r11428) -Fix: wrong string used for candy/sweets units_volume glx parents: 6640 diff changeset	117	STR_0026_CANDY, STR_0046_CANDY, STR_BAGS, STR_QUANTITY_SWEETS, STR_ABBREV_SWEETS,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	118	SPR_CARGO_CANDY, CC_EXPRESS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	119
6311 5e4d7deb256b (svn r9236) -Codechange: Add 'town effect' attribute to cargo types. This will be used to specify how the cargo behaves wrt towns, instead of relying on fixed cargo IDs. peter1138 parents: 6091 diff changeset	120	MK( 21, 'TOFF', 191, 16, 4778, 14, 60, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	121	STR_002A_TOFFEE, STR_004A_TOFFEE, STR_TONS, STR_QUANTITY_TOFFEE, STR_ABBREV_TOFFEE,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	122	SPR_CARGO_TOFFEE, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	123
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	124	MK( 22, 'COLA', 84, 16, 4892, 5, 75, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	125	STR_0027_COLA, STR_0047_COLA, STR_LITERS, STR_QUANTITY_COLA, STR_ABBREV_COLA,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	126	SPR_CARGO_WATERCOLA, CC_LIQUID ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	127
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	128	MK( 23, 'CTCD', 184, 16, 5005, 10, 25, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	129	STR_0028_COTTON_CANDY, STR_0048_COTTON_CANDY, STR_TONS, STR_QUANTITY_CANDYFLOSS, STR_ABBREV_CANDYFLOSS,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	130	SPR_CARGO_COTTONCANDY, CC_BULK ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	131
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	132	MK( 24, 'BUBL', 10, 1, 5077, 20, 80, true, TE_NONE,
8708 3942440bba65 (svn r12382) -Fix [FS#1864]: use 'items' unit for batteries, fizzy drinks, toys and bubbles in total cargo tab glx parents: 8298 diff changeset	133	STR_0029_BUBBLES, STR_0049_BUBBLE, STR_ITEMS, STR_QUANTITY_BUBBLES, STR_ABBREV_BUBBLES,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	134	SPR_CARGO_BUBBLES, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	135
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	136	MK( 25, 'PLST', 202, 16, 4664, 30, 255, true, TE_NONE,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	137	STR_002C_PLASTIC, STR_004C_PLASTIC, STR_LITERS, STR_QUANTITY_PLASTIC, STR_ABBREV_PLASTIC,
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	138	SPR_CARGO_PLASTIC, CC_LIQUID ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	139
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	140	MK( 26, 'FZDR', 48, 2, 6250, 30, 50, true, TE_FOOD,
8708 3942440bba65 (svn r12382) -Fix [FS#1864]: use 'items' unit for batteries, fizzy drinks, toys and bubbles in total cargo tab glx parents: 8298 diff changeset	141	STR_002D_FIZZY_DRINKS, STR_004D_FIZZY_DRINK, STR_ITEMS, STR_QUANTITY_FIZZY_DRINKS, STR_ABBREV_FIZZY_DRINKS,
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	142	SPR_CARGO_FIZZYDRINK, CC_PIECE_GOODS ),
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	143
8195 7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	144	/* Void slot in temperate */
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	145	MK( 0xFF, 0, 1, 0, 5688, 0, 30, true, TE_NONE,
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	146	STR_000E, STR_002E, STR_TONS, STR_QUANTITY_NOTHING, STR_ABBREV_NOTHING,
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	147	SPR_ASCII_SPACE, CC_NOAVAILABLE ),
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	148
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	149	/* Void slot in arctic */
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	150	MK( 0xFF, 0, 184, 0, 5120, 9, 255, true, TE_NONE,
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	151	STR_000E, STR_002E, STR_TONS, STR_QUANTITY_NOTHING, STR_ABBREV_NOTHING,
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	152	SPR_ASCII_SPACE, CC_NOAVAILABLE ),
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	153
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	154	};
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	155
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	156
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	157	/* Table of which cargo types are available in each climate, by default */
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	158	static const CargoLabel _default_climate_cargo[NUM_LANDSCAPE][12] = {
8195 7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	159	{ 'PASS', 'COAL', 'MAIL', 'OIL_', 'LVST', 'GOOD', 'GRAI', 'WOOD', 'IORE', 'STEL', 'VALU', 33, },
7f4a17a2d14b (svn r11758) -Fix(ette): Populate 'void' cargo slots (unused slots in temperate and arctic) with default data as per pre-newcargo support. These slots are still disabled by default, but some NewGRFs (erroneously?) expect the default data. peter1138 parents: 7878 diff changeset	160	{ 'PASS', 'COAL', 'MAIL', 'OIL_', 'LVST', 'GOOD', 'WHEA', 'WOOD', 34, 'PAPR', 'GOLD', 'FOOD', },
6640 dac8f508fcaa (svn r9871) -Fix (r8826): Some cargo costs were wrong for different climates. Multiple definitions of the same cargo type are sometimes required. peter1138 parents: 6365 diff changeset	161	{ 'PASS', 'RUBR', 'MAIL', 4, 'FRUT', 'GOOD', 'MAIZ', 11, 'CORE', 'WATR', 'DIAM', 'FOOD', },
6091 c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	162	{ 'PASS', 'SUGR', 'MAIL', 'TOYS', 'BATT', 'SWET', 'TOFF', 'COLA', 'CTCD', 'BUBL', 'PLST', 'FZDR', },
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	163	};
c8827d9ae04a (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: diff changeset	164

author	smatz
	Sat, 13 Dec 2008 16:16:44 +0000
changeset 10417	a1a609566853
parent 9987	ee1e22594629
permissions	-rw-r--r--