openttd-ottdgrfs: src/table/landscape_const.h@335d9bd345b0 (annotated)

2186 461a2aff3486 (svn r2701) Insert Id tags into all source files tron parents: 222 diff changeset	1	/* $Id$ */
461a2aff3486 (svn r2701) Insert Id tags into all source files tron parents: 222 diff changeset	2
3652 698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	3	#include "sprites.h"
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	4
3616 7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	5	typedef struct CargoTypesValues {
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	6	StringID names[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	7	StringID units_volume[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	8	byte weights[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	9	SpriteID sprites[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	10
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	11	uint16 initial_cargo_payment[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	12	byte transit_days_table_1[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	13	byte transit_days_table_2[NUM_CARGO];
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	14	} CargoTypesValues;
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	15
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	16
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	17	static const CargoTypesValues _cargo_types_base_values[4] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	18	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	19	/* normal names */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	20	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	21	STR_000F_PASSENGERS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	22	STR_0010_COAL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	23	STR_0011_MAIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	24	STR_0012_OIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	25	STR_0013_LIVESTOCK,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	26	STR_0014_GOODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	27	STR_0015_GRAIN,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	28	STR_0016_WOOD,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	29	STR_0017_IRON_ORE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	30	STR_0018_STEEL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	31	STR_0019_VALUABLES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	32	STR_000E,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	33	},
3616 7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	34
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	35	{ /* normal units of volume */
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	36	STR_PASSENGERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	37	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	38	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	39	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	40	STR_ITEMS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	41	STR_CRATES,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	42	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	43	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	44	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	45	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	46	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	47	STR_RES_OTHER
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	48	},
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	49
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	50	/* normal weights */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	51	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	52	1, 16, 4, 16, 3, 8, 16, 16, 16, 16, 2, 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	53	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	54
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	55	/* normal sprites */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	56	{
3652 698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	57	SPR_CARGO_PASSENGER, SPR_CARGO_COAL, SPR_CARGO_MAIL, SPR_CARGO_OIL, SPR_CARGO_LIVESTOCK,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	58	SPR_CARGO_GOODS, SPR_CARGO_GRAIN, SPR_CARGO_WOOD, SPR_CARGO_IRON_ORE, SPR_CARGO_STEEL,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	59	SPR_CARGO_VALUES_GOLD, SPR_ASCII_SPACE
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	60	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	61
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	62	/* normal initial cargo payment */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	63	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	3185, 5916, 4550, 4437, 4322, 6144, 4778, 5005, 5120, 5688, 7509, 5688
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	65	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	66
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	67	/* normal transit days table 1 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	68	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	69	0, 7, 20, 25, 4, 5, 4, 15, 9, 7, 1, 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	70	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	71
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	72	/* normal transit days table 2 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	73	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	74	24, 255, 90, 255, 18, 28, 40, 255, 255, 255, 32, 30,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	75	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	76	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	77
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	78	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	79	/* hilly names */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	80	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	81	STR_000F_PASSENGERS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	82	STR_0010_COAL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	83	STR_0011_MAIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	84	STR_0012_OIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	85	STR_0013_LIVESTOCK,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	86	STR_0014_GOODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	87	STR_0022_WHEAT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	88	STR_0016_WOOD,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	89	STR_000E,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	90	STR_001F_PAPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	91	STR_0020_GOLD,
222 b88456001397 (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron) darkvater parents: 0 diff changeset	92	STR_001E_FOOD,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	93	},
3616 7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	94
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	95	{ /* hilly units of volume */
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	96	STR_PASSENGERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	97	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	98	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	99	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	100	STR_ITEMS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	101	STR_CRATES,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	102	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	103	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	104	STR_RES_OTHER,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	105	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	106	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	107	STR_TONS
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	108	},
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	109
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	110	/* hilly weights */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	111	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	112	1, 16, 4, 16, 3, 8, 16, 16, 0, 16, 8, 16
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	113	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	114
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	115	/* hilly sprites */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	116	{
3652 698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	117	SPR_CARGO_PASSENGER, SPR_CARGO_COAL, SPR_CARGO_MAIL, SPR_CARGO_OIL, SPR_CARGO_LIVESTOCK,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	118	SPR_CARGO_GOODS, SPR_CARGO_GRAIN, SPR_CARGO_WOOD, SPR_ASCII_SPACE, SPR_CARGO_PAPER,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	119	SPR_CARGO_VALUES_GOLD, SPR_CARGO_FOOD
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	120	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	121
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	122	/* hilly initial cargo payment */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	123	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	124	3185, 5916, 4550, 4437, 4322, 6144, 4778, 5005, 5120, 5461, 5802, 5688
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	125	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	126
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	127	/* hilly transit days table 1 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	128	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	129	0, 7, 20, 25, 4, 5, 4, 15, 9, 7, 10, 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	130	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	131
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	132	/* hilly transit days table 2 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	133	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	134	24, 255, 90, 255, 18, 28, 40, 255, 255, 60, 40, 30
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	135	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	136	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	137
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	138	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	139	/* desert names */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	140	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	141	STR_000F_PASSENGERS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	142	STR_0023_RUBBER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	143	STR_0011_MAIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	144	STR_0012_OIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	145	STR_001C_FRUIT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	146	STR_0014_GOODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	147	STR_001B_MAIZE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	148	STR_0016_WOOD,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	149	STR_001A_COPPER_ORE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	150	STR_0021_WATER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	151	STR_001D_DIAMONDS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	152	STR_001E_FOOD
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	153	},
3616 7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	154
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	155	{ /* desert units of volume */
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	156	STR_PASSENGERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	157	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	158	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	159	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	160	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	161	STR_CRATES,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	162	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	163	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	164	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	165	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	166	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	167	STR_TONS
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	168	},
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	169
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	170	/* desert weights */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	171	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	172	1, 16, 4, 16, 16, 8, 16, 16, 16, 16, 2, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	174
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	175	/* desert sprites */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	176	{
3652 698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	177	SPR_CARGO_PASSENGER, SPR_CARGO_RUBBER, SPR_CARGO_MAIL, SPR_CARGO_OIL, SPR_CARGO_FRUIT,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	178	SPR_CARGO_GOODS, SPR_CARGO_GRAIN, SPR_CARGO_WOOD, SPR_CARGO_COPPER_ORE, SPR_CARGO_WATERCOLA,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	179	SPR_CARGO_DIAMONDS, SPR_CARGO_FOOD
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	180	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	181
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	182	/* desert initial cargo payment */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	183	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	184	3185, 4437, 4550, 4892, 4209, 6144, 4322, 7964, 4892, 4664, 5802, 5688
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	185	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	186
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	187	/* desert transit days table 1 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	188	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	189	0, 2, 20, 25, 0, 5, 4, 15, 12, 20, 10, 0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	190	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	191
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	192	/* desert transit days table 2 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	193	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	194	24, 20, 90, 255, 15, 28, 40, 255, 255, 80, 255, 30
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	196	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	197
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	198	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	199	/* candy names */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	200	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	201	STR_000F_PASSENGERS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	202	STR_0024_SUGAR,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	203	STR_0011_MAIL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	204	STR_0025_TOYS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	205	STR_002B_BATTERIES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	206	STR_0026_CANDY,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	207	STR_002A_TOFFEE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	208	STR_0027_COLA,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	209	STR_0028_COTTON_CANDY,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	210	STR_0029_BUBBLES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	211	STR_002C_PLASTIC,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	212	STR_002D_FIZZY_DRINKS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	213	},
3616 7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	214
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	215	{ /* candy unitrs of volume */
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	216	STR_PASSENGERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	217	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	218	STR_BAGS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	219	STR_NOTHING,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	220	STR_NOTHING,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	221	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	222	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	223	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	224	STR_TONS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	225	STR_NOTHING,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	226	STR_LITERS,
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	227	STR_NOTHING
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	228	},
7ba7353d6561 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. belugas parents: 3355 diff changeset	229
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	230	/* candy weights */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	231	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	232	1, 16, 4, 2, 4, 5, 16, 16, 16, 1, 16, 2
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	233	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	234
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	235	/* candy sprites */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	236	{
3652 698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	237	SPR_CARGO_PASSENGER, SPR_CARGO_SUGAR, SPR_CARGO_MAIL, SPR_CARGO_TOYS, SPR_CARGO_BATTERIES,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	238	SPR_CARGO_CANDY, SPR_CARGO_TOFFEE, SPR_CARGO_WATERCOLA, SPR_CARGO_COTTONCANDY, SPR_CARGO_BUBBLES,
698a5bedbeea (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values belugas parents: 3616 diff changeset	239	SPR_CARGO_PLASTIC, SPR_CARGO_FIZZYDRINK
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	240	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	242	/* candy initial cargo payment */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	243	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	244	3185, 4437, 4550, 5574, 4322, 6144, 4778, 4892, 5005, 5077, 4664, 6250
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	245	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	246
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	247	/* candy transit days table 1 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	248	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	249	0, 20, 20, 25, 2, 8, 14, 5, 10, 20, 30, 30,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	250	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	251
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	252	/* candy transit days table 2 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	253	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	254	24, 255, 90, 255, 30, 40, 60, 75, 25, 80, 255, 50
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	255	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	256	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	257	};

author	celestar
	Sun, 11 Mar 2007 09:28:58 +0000
branch	custombridgeheads
changeset 5651	335d9bd345b0
parent 5643	3778051e8095
permissions	-rw-r--r--