author | miham |
Sat, 17 Feb 2007 21:56:22 +0000 | |
changeset 6060 | f47446db674c |
parent 5868 | 94430141c189 |
child 6193 | 6f20de9e4f1b |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
376
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
3 |
#ifndef ENGINES_H |
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
4 |
#define ENGINES_H |
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
5 |
|
2129
5a1fe83c2b4d
(svn r2639) -Add: Added the vehicle names in table/engines.h so that you know what line represents what vehicle (I hope I didn't mess that up). Added some comments while I'm at it and include the table/ directory in the Doxygen generation
celestar
parents:
1922
diff
changeset
|
6 |
/** @file table/engines.h |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
7 |
* This file contains all the data for vehicles |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
8 |
*/ |
2129
5a1fe83c2b4d
(svn r2639) -Add: Added the vehicle names in table/engines.h so that you know what line represents what vehicle (I hope I didn't mess that up). Added some comments while I'm at it and include the table/ directory in the Doxygen generation
celestar
parents:
1922
diff
changeset
|
9 |
|
2189
5cdc11ffeaa4
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents:
2186
diff
changeset
|
10 |
#include "../sound.h" |
376
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
11 |
|
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
12 |
/** Writes the properties of a train or road vehicle into the EngineInfo struct. |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
13 |
* @see EngineInfo |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
14 |
* @param a Introduction date |
5763 | 15 |
* @param e Bitmask of the climates |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
16 |
* @note the 5 between d and e is the load amount |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
17 |
*/ |
5770 | 18 |
#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0 } |
5763 | 19 |
|
2147
eb6ba42fd216
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2129
diff
changeset
|
20 |
/** Writes the properties of a train carriage into the EngineInfo struct. |
5763 | 21 |
* @see MK |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
22 |
* @note the 0x80 in parameter b sets the "is carriage bit" |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
23 |
* @note the 5 between d and e is the load amount |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4322
diff
changeset
|
24 |
*/ |
5770 | 25 |
#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b | 0x80, 5, e, 0, 8, 0, 0 } |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
26 |
|
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
27 |
/** Writes the properties of a ship into the EngineInfo struct. |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
28 |
* @see MK |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
29 |
* @note the 10 between d and e is the load amount |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
30 |
*/ |
5770 | 31 |
#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 10, e, 0, 8, 0, 0 } |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
32 |
|
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
33 |
/** Writes the properties of an aeroplane into the EngineInfo struct. |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
34 |
* @see MK |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
35 |
* @note the 20 between d and e is the load amount |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
36 |
*/ |
5770 | 37 |
#define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 20, e, 0, 8, 0, 0 } |
0 | 38 |
|
2509
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
39 |
// Climates |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
40 |
// T = Temperate |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
41 |
// A = Arctic |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
42 |
// S = Sub-Tropic |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
43 |
// Y = Toyland |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
44 |
#define T 1 |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
45 |
#define A 2 |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
46 |
#define S 4 |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
47 |
#define Y 8 |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
48 |
const EngineInfo orig_engine_info[] = { |
5763 | 49 |
MK( 1827, 20, 15, 30, T ), /* 0 Kirby Paul Tank (Steam) */ |
50 |
MK( 12784, 20, 22, 30, A|S ), /* 1 MJS 250 (Diesel) */ |
|
51 |
MK( 9497, 20, 20, 50, Y), /* 2 Ploddyphut Choo-Choo */ |
|
52 |
MK( 11688, 20, 20, 30, Y), /* 3 Powernaut Choo-Choo */ |
|
53 |
MK( 16802, 20, 20, 30, Y), /* 4 Mightymover Choo-Choo */ |
|
54 |
MK( 18993, 20, 20, 30, Y), /* 5 Ploddyphut Diesel */ |
|
55 |
MK( 20820, 20, 20, 30, Y), /* 6 Powernaut Diesel */ |
|
56 |
MK( 8766, 20, 20, 30, A|S ), /* 7 Wills 2-8-0 (Steam) */ |
|
57 |
MK( 5114, 20, 21, 30, T ), /* 8 Chaney 'Jubilee' (Steam) */ |
|
58 |
MK( 5479, 20, 20, 30, T ), /* 9 Ginzu 'A4' (Steam) */ |
|
59 |
MK( 12419, 20, 23, 25, T ), /* 10 SH '8P' (Steam) */ |
|
60 |
MK( 13149, 20, 12, 30, T ), /* 11 Manley-Morel DMU (Diesel) */ |
|
61 |
MK( 23376, 20, 15, 35, T ), /* 12 'Dash' (Diesel) */ |
|
62 |
MK( 14976, 20, 18, 28, T ), /* 13 SH/Hendry '25' (Diesel) */ |
|
63 |
MK( 14245, 20, 20, 30, T ), /* 14 UU '37' (Diesel) */ |
|
64 |
MK( 15341, 20, 22, 33, T ), /* 15 Floss '47' (Diesel) */ |
|
65 |
MK( 14976, 20, 20, 25, A|S ), /* 16 CS 4000 (Diesel) */ |
|
66 |
MK( 16437, 20, 20, 30, A|S ), /* 17 CS 2400 (Diesel) */ |
|
67 |
MK( 18993, 20, 22, 30, A|S ), /* 18 Centennial (Diesel) */ |
|
68 |
MK( 13880, 20, 22, 30, A|S ), /* 19 Kelling 3100 (Diesel) */ |
|
69 |
MK( 20454, 20, 22, 30, A|S ), /* 20 Turner Turbo (Diesel) */ |
|
70 |
MK( 16071, 20, 22, 30, A|S ), /* 21 MJS 1000 (Diesel) */ |
|
71 |
MK( 20820, 20, 20, 25, T ), /* 22 SH '125' (Diesel) */ |
|
72 |
MK( 16437, 20, 23, 30, T ), /* 23 SH '30' (Electric) */ |
|
73 |
MK( 19359, 20, 23, 80, T ), /* 24 SH '40' (Electric) */ |
|
74 |
MK( 23376, 20, 25, 30, T ), /* 25 'T.I.M.' (Electric) */ |
|
75 |
MK( 26298, 20, 25, 50, T ), /* 26 'AsiaStar' (Electric) */ |
|
76 |
MW( 1827, 20, 20, 50, T|A|S|Y), /* 27 Passenger Carriage */ |
|
77 |
MW( 1827, 20, 20, 50, T|A|S|Y), /* 28 Mail Van */ |
|
78 |
MW( 1827, 20, 20, 50, T|A ), /* 29 Coal Truck */ |
|
79 |
MW( 1827, 20, 20, 50, T|A|S ), /* 30 Oil Tanker */ |
|
80 |
MW( 1827, 20, 20, 50, T|A ), /* 31 Livestock Van */ |
|
81 |
MW( 1827, 20, 20, 50, T|A|S ), /* 32 Goods Van */ |
|
82 |
MW( 1827, 20, 20, 50, T|A|S ), /* 33 Grain Hopper */ |
|
83 |
MW( 1827, 20, 20, 50, T|A|S ), /* 34 Wood Truck */ |
|
84 |
MW( 1827, 20, 20, 50, T ), /* 35 Iron Ore Hopper */ |
|
85 |
MW( 1827, 20, 20, 50, T ), /* 36 Steel Truck */ |
|
86 |
MW( 1827, 20, 20, 50, T|A|S ), /* 37 Armoured Van */ |
|
87 |
MW( 1827, 20, 20, 50, A|S ), /* 38 Food Van */ |
|
88 |
MW( 1827, 20, 20, 50, A ), /* 39 Paper Truck */ |
|
89 |
MW( 1827, 20, 20, 50, S ), /* 40 Copper Ore Hopper */ |
|
90 |
MW( 1827, 20, 20, 50, S ), /* 41 Water Tanker */ |
|
91 |
MW( 1827, 20, 20, 50, S ), /* 42 Fruit Truck */ |
|
92 |
MW( 1827, 20, 20, 50, S ), /* 43 Rubber Truck */ |
|
93 |
MW( 1827, 20, 20, 50, Y), /* 44 Sugar Truck */ |
|
94 |
MW( 1827, 20, 20, 50, Y), /* 45 Candyfloss Hopper */ |
|
95 |
MW( 1827, 20, 20, 50, Y), /* 46 Toffee Hopper */ |
|
96 |
MW( 1827, 20, 20, 50, Y), /* 47 Bubble Van */ |
|
97 |
MW( 1827, 20, 20, 50, Y), /* 48 Cola Tanker */ |
|
98 |
MW( 1827, 20, 20, 50, Y), /* 49 Sweet Van */ |
|
99 |
MW( 1827, 20, 20, 50, Y), /* 50 Toy Van */ |
|
100 |
MW( 1827, 20, 20, 50, Y), /* 51 Battery Truck */ |
|
101 |
MW( 1827, 20, 20, 50, Y), /* 52 Fizzy Drink Truck */ |
|
102 |
MW( 1827, 20, 20, 50, Y), /* 53 Plastic Truck */ |
|
103 |
MK( 28490, 20, 20, 50, T|A|S ), /* 54 'X2001' (Electric) */ |
|
104 |
MK( 31047, 20, 20, 50, T|A|S ), /* 55 'Millennium Z1' (Electric) */ |
|
105 |
MK( 28855, 20, 20, 50, Y), /* 56 Wizzowow Z99 */ |
|
106 |
MW( 1827, 20, 20, 50, T|A|S|Y), /* 57 Passenger Carriage */ |
|
107 |
MW( 1827, 20, 20, 50, T|A|S|Y), /* 58 Mail Van */ |
|
108 |
MW( 1827, 20, 20, 50, T|A ), /* 59 Coal Truck */ |
|
109 |
MW( 1827, 20, 20, 50, T|A|S ), /* 60 Oil Tanker */ |
|
110 |
MW( 1827, 20, 20, 50, T|A ), /* 61 Livestock Van */ |
|
111 |
MW( 1827, 20, 20, 50, T|A|S ), /* 62 Goods Van */ |
|
112 |
MW( 1827, 20, 20, 50, T|A|S ), /* 63 Grain Hopper */ |
|
113 |
MW( 1827, 20, 20, 50, T|A|S ), /* 64 Wood Truck */ |
|
114 |
MW( 1827, 20, 20, 50, T ), /* 65 Iron Ore Hopper */ |
|
115 |
MW( 1827, 20, 20, 50, T ), /* 66 Steel Truck */ |
|
116 |
MW( 1827, 20, 20, 50, T|A|S ), /* 67 Armoured Van */ |
|
117 |
MW( 1827, 20, 20, 50, A|S ), /* 68 Food Van */ |
|
118 |
MW( 1827, 20, 20, 50, A ), /* 69 Paper Truck */ |
|
119 |
MW( 1827, 20, 20, 50, S ), /* 70 Copper Ore Hopper */ |
|
120 |
MW( 1827, 20, 20, 50, S ), /* 71 Water Tanker */ |
|
121 |
MW( 1827, 20, 20, 50, S ), /* 72 Fruit Truck */ |
|
122 |
MW( 1827, 20, 20, 50, S ), /* 73 Rubber Truck */ |
|
123 |
MW( 1827, 20, 20, 50, Y), /* 74 Sugar Truck */ |
|
124 |
MW( 1827, 20, 20, 50, Y), /* 75 Candyfloss Hopper */ |
|
125 |
MW( 1827, 20, 20, 50, Y), /* 76 Toffee Hopper */ |
|
126 |
MW( 1827, 20, 20, 50, Y), /* 77 Bubble Van */ |
|
127 |
MW( 1827, 20, 20, 50, Y), /* 78 Cola Tanker */ |
|
128 |
MW( 1827, 20, 20, 50, Y), /* 79 Sweet Van */ |
|
129 |
MW( 1827, 20, 20, 50, Y), /* 80 Toy Van */ |
|
130 |
MW( 1827, 20, 20, 50, Y), /* 81 Battery Truck */ |
|
131 |
MW( 1827, 20, 20, 50, Y), /* 82 Fizzy Drink Truck */ |
|
132 |
MW( 1827, 20, 20, 50, Y), /* 83 Plastic Truck */ |
|
133 |
MK( 36525, 20, 20, 50, T|A|S ), /* 84 Lev1 'Leviathan' (Electric) */ |
|
134 |
MK( 39447, 20, 20, 50, T|A|S ), /* 85 Lev2 'Cyclops' (Electric) */ |
|
135 |
MK( 42004, 20, 20, 50, T|A|S ), /* 86 Lev3 'Pegasus' (Electric) */ |
|
136 |
MK( 42735, 20, 20, 50, T|A|S ), /* 87 Lev4 'Chimaera' (Electric) */ |
|
137 |
MK( 36891, 20, 20, 60, Y), /* 88 Wizzowow Rocketeer */ |
|
138 |
MW( 1827, 20, 20, 50, T|A|S|Y), /* 89 Passenger Carriage */ |
|
139 |
MW( 1827, 20, 20, 50, T|A|S|Y), /* 90 Mail Van */ |
|
140 |
MW( 1827, 20, 20, 50, T|A ), /* 91 Coal Truck */ |
|
141 |
MW( 1827, 20, 20, 50, T|A|S ), /* 92 Oil Tanker */ |
|
142 |
MW( 1827, 20, 20, 50, T|A ), /* 93 Livestock Van */ |
|
143 |
MW( 1827, 20, 20, 50, T|A|S ), /* 94 Goods Van */ |
|
144 |
MW( 1827, 20, 20, 50, T|A|S ), /* 95 Grain Hopper */ |
|
145 |
MW( 1827, 20, 20, 50, T|A|S ), /* 96 Wood Truck */ |
|
146 |
MW( 1827, 20, 20, 50, T ), /* 97 Iron Ore Hopper */ |
|
147 |
MW( 1827, 20, 20, 50, T ), /* 98 Steel Truck */ |
|
148 |
MW( 1827, 20, 20, 50, T|A|S ), /* 99 Armoured Van */ |
|
149 |
MW( 1827, 20, 20, 50, A|S ), /* 100 Food Van */ |
|
150 |
MW( 1827, 20, 20, 50, A ), /* 101 Paper Truck */ |
|
151 |
MW( 1827, 20, 20, 50, S ), /* 102 Copper Ore Hopper */ |
|
152 |
MW( 1827, 20, 20, 50, S ), /* 103 Water Tanker */ |
|
153 |
MW( 1827, 20, 20, 50, S ), /* 104 Fruit Truck */ |
|
154 |
MW( 1827, 20, 20, 50, S ), /* 105 Rubber Truck */ |
|
155 |
MW( 1827, 20, 20, 50, Y), /* 106 Sugar Truck */ |
|
156 |
MW( 1827, 20, 20, 50, Y), /* 107 Candyfloss Hopper */ |
|
157 |
MW( 1827, 20, 20, 50, Y), /* 108 Toffee Hopper */ |
|
158 |
MW( 1827, 20, 20, 50, Y), /* 109 Bubble Van */ |
|
159 |
MW( 1827, 20, 20, 50, Y), /* 110 Cola Tanker */ |
|
160 |
MW( 1827, 20, 20, 50, Y), /* 111 Sweet Van */ |
|
161 |
MW( 1827, 20, 20, 50, Y), /* 112 Toy Van */ |
|
162 |
MW( 1827, 20, 20, 50, Y), /* 113 Battery Truck */ |
|
163 |
MW( 1827, 20, 20, 50, Y), /* 114 Fizzy Drink Truck */ |
|
164 |
MW( 1827, 20, 20, 50, Y), /* 115 Plastic Truck */ |
|
165 |
MK( 3378, 20, 12, 40, T|A|S ), /* 116 MPS Regal Bus */ |
|
166 |
MK( 16071, 20, 15, 30, T|A|S ), /* 117 Hereford Leopard Bus */ |
|
167 |
MK( 24107, 20, 15, 40, T|A|S ), /* 118 Foster Bus */ |
|
168 |
MK( 32142, 20, 15, 80, T|A|S ), /* 119 Foster MkII Superbus */ |
|
169 |
MK( 9132, 20, 15, 40, Y), /* 120 Ploddyphut MkI Bus */ |
|
170 |
MK( 18993, 20, 15, 40, Y), /* 121 Ploddyphut MkII Bus */ |
|
171 |
MK( 32873, 20, 15, 80, Y), /* 122 Ploddyphut MkIII Bus */ |
|
172 |
MK( 5479, 20, 15, 55, T|A ), /* 123 Balogh Coal Truck */ |
|
173 |
MK( 20089, 20, 15, 55, T|A ), /* 124 Uhl Coal Truck */ |
|
174 |
MK( 33969, 20, 15, 85, T|A ), /* 125 DW Coal Truck */ |
|
175 |
MK( 5479, 20, 15, 55, T|A|S ), /* 126 MPS Mail Truck */ |
|
176 |
MK( 21550, 20, 15, 55, T|A|S ), /* 127 Reynard Mail Truck */ |
|
177 |
MK( 35795, 20, 15, 85, T|A|S ), /* 128 Perry Mail Truck */ |
|
178 |
MK( 5479, 20, 15, 55, Y), /* 129 MightyMover Mail Truck */ |
|
179 |
MK( 21550, 20, 15, 55, Y), /* 130 Powernaught Mail Truck */ |
|
180 |
MK( 35795, 20, 15, 85, Y), /* 131 Wizzowow Mail Truck */ |
|
181 |
MK( 5479, 20, 15, 55, T|A|S ), /* 132 Witcombe Oil Tanker */ |
|
182 |
MK( 19359, 20, 15, 55, T|A|S ), /* 133 Foster Oil Tanker */ |
|
183 |
MK( 31047, 20, 15, 85, T|A|S ), /* 134 Perry Oil Tanker */ |
|
184 |
MK( 5479, 20, 15, 55, T|A ), /* 135 Talbott Livestock Van */ |
|
185 |
MK( 21915, 20, 15, 55, T|A ), /* 136 Uhl Livestock Van */ |
|
186 |
MK( 37256, 20, 15, 85, T|A ), /* 137 Foster Livestock Van */ |
|
187 |
MK( 5479, 20, 15, 55, T|A|S ), /* 138 Balogh Goods Truck */ |
|
188 |
MK( 19724, 20, 15, 55, T|A|S ), /* 139 Craighead Goods Truck */ |
|
189 |
MK( 31047, 20, 15, 85, T|A|S ), /* 140 Goss Goods Truck */ |
|
190 |
MK( 5479, 20, 15, 55, T|A|S ), /* 141 Hereford Grain Truck */ |
|
191 |
MK( 21185, 20, 15, 55, T|A|S ), /* 142 Thomas Grain Truck */ |
|
192 |
MK( 32873, 20, 15, 85, T|A|S ), /* 143 Goss Grain Truck */ |
|
193 |
MK( 5479, 20, 15, 55, T|A|S ), /* 144 Witcombe Wood Truck */ |
|
194 |
MK( 19724, 20, 15, 55, T|A|S ), /* 145 Foster Wood Truck */ |
|
195 |
MK( 35430, 20, 15, 85, T|A|S ), /* 146 Moreland Wood Truck */ |
|
196 |
MK( 5479, 20, 15, 55, T ), /* 147 MPS Iron Ore Truck */ |
|
197 |
MK( 20820, 20, 15, 55, T ), /* 148 Uhl Iron Ore Truck */ |
|
198 |
MK( 33238, 20, 15, 85, T ), /* 149 Chippy Iron Ore Truck */ |
|
199 |
MK( 5479, 20, 15, 55, T ), /* 150 Balogh Steel Truck */ |
|
200 |
MK( 21185, 20, 15, 55, T ), /* 151 Uhl Steel Truck */ |
|
201 |
MK( 31777, 20, 15, 85, T ), /* 152 Kelling Steel Truck */ |
|
202 |
MK( 5479, 20, 15, 55, T|A|S ), /* 153 Balogh Armoured Truck */ |
|
203 |
MK( 22281, 20, 15, 55, T|A|S ), /* 154 Uhl Armoured Truck */ |
|
204 |
MK( 33603, 20, 15, 85, T|A|S ), /* 155 Foster Armoured Truck */ |
|
205 |
MK( 5479, 20, 15, 55, A|S ), /* 156 Foster Food Van */ |
|
206 |
MK( 18628, 20, 15, 55, A|S ), /* 157 Perry Food Van */ |
|
207 |
MK( 30681, 20, 15, 85, A|S ), /* 158 Chippy Food Van */ |
|
208 |
MK( 5479, 20, 15, 55, A ), /* 159 Uhl Paper Truck */ |
|
209 |
MK( 21185, 20, 15, 55, A ), /* 160 Balogh Paper Truck */ |
|
210 |
MK( 31777, 20, 15, 85, A ), /* 161 MPS Paper Truck */ |
|
211 |
MK( 5479, 20, 15, 55, S ), /* 162 MPS Copper Ore Truck */ |
|
212 |
MK( 20820, 20, 15, 55, S ), /* 163 Uhl Copper Ore Truck */ |
|
213 |
MK( 33238, 20, 15, 85, S ), /* 164 Goss Copper Ore Truck */ |
|
214 |
MK( 5479, 20, 15, 55, S ), /* 165 Uhl Water Tanker */ |
|
215 |
MK( 20970, 20, 15, 55, S ), /* 166 Balogh Water Tanker */ |
|
216 |
MK( 33388, 20, 15, 85, S ), /* 167 MPS Water Tanker */ |
|
217 |
MK( 5479, 20, 15, 55, S ), /* 168 Balogh Fruit Truck */ |
|
218 |
MK( 21335, 20, 15, 55, S ), /* 169 Uhl Fruit Truck */ |
|
219 |
MK( 33753, 20, 15, 85, S ), /* 170 Kelling Fruit Truck */ |
|
220 |
MK( 5479, 20, 15, 55, S ), /* 171 Balogh Rubber Truck */ |
|
221 |
MK( 20604, 20, 15, 55, S ), /* 172 Uhl Rubber Truck */ |
|
222 |
MK( 33023, 20, 15, 85, S ), /* 173 RMT Rubber Truck */ |
|
223 |
MK( 5479, 20, 15, 55, Y), /* 174 MightyMover Sugar Truck */ |
|
224 |
MK( 19724, 20, 15, 55, Y), /* 175 Powernaught Sugar Truck */ |
|
225 |
MK( 33238, 20, 15, 85, Y), /* 176 Wizzowow Sugar Truck */ |
|
226 |
MK( 5479, 20, 15, 55, Y), /* 177 MightyMover Cola Truck */ |
|
227 |
MK( 20089, 20, 15, 55, Y), /* 178 Powernaught Cola Truck */ |
|
228 |
MK( 33603, 20, 15, 85, Y), /* 179 Wizzowow Cola Truck */ |
|
229 |
MK( 5479, 20, 15, 55, Y), /* 180 MightyMover Candyfloss Truck */ |
|
230 |
MK( 20454, 20, 15, 55, Y), /* 181 Powernaught Candyfloss Truck */ |
|
231 |
MK( 33969, 20, 15, 85, Y), /* 182 Wizzowow Candyfloss Truck */ |
|
232 |
MK( 5479, 20, 15, 55, Y), /* 183 MightyMover Toffee Truck */ |
|
233 |
MK( 20820, 20, 15, 55, Y), /* 184 Powernaught Toffee Truck */ |
|
234 |
MK( 34334, 20, 15, 85, Y), /* 185 Wizzowow Toffee Truck */ |
|
235 |
MK( 5479, 20, 15, 55, Y), /* 186 MightyMover Toy Van */ |
|
236 |
MK( 21185, 20, 15, 55, Y), /* 187 Powernaught Toy Van */ |
|
237 |
MK( 34699, 20, 15, 85, Y), /* 188 Wizzowow Toy Van */ |
|
238 |
MK( 5479, 20, 15, 55, Y), /* 189 MightyMover Sweet Truck */ |
|
239 |
MK( 21550, 20, 15, 55, Y), /* 190 Powernaught Sweet Truck */ |
|
240 |
MK( 35064, 20, 15, 85, Y), /* 191 Wizzowow Sweet Truck */ |
|
241 |
MK( 5479, 20, 15, 55, Y), /* 192 MightyMover Battery Truck */ |
|
242 |
MK( 19874, 20, 15, 55, Y), /* 193 Powernaught Battery Truck */ |
|
243 |
MK( 35430, 20, 15, 85, Y), /* 194 Wizzowow Battery Truck */ |
|
244 |
MK( 5479, 20, 15, 55, Y), /* 195 MightyMover Fizzy Drink Truck */ |
|
245 |
MK( 20239, 20, 15, 55, Y), /* 196 Powernaught Fizzy Drink Truck */ |
|
246 |
MK( 35795, 20, 15, 85, Y), /* 197 Wizzowow Fizzy Drink Truck */ |
|
247 |
MK( 5479, 20, 15, 55, Y), /* 198 MightyMover Plastic Truck */ |
|
248 |
MK( 20604, 20, 15, 55, Y), /* 199 Powernaught Plastic Truck */ |
|
249 |
MK( 32873, 20, 15, 85, Y), /* 200 Wizzowow Plastic Truck */ |
|
250 |
MK( 5479, 20, 15, 55, Y), /* 201 MightyMover Bubble Truck */ |
|
251 |
MK( 20970, 20, 15, 55, Y), /* 202 Powernaught Bubble Truck */ |
|
252 |
MK( 33023, 20, 15, 85, Y), /* 203 Wizzowow Bubble Truck */ |
|
253 |
MS( 2922, 5, 30, 50, T|A|S ), /* 204 MPS Oil Tanker */ |
|
254 |
MS( 17167, 5, 30, 90, T|A|S ), /* 205 CS-Inc. Oil Tanker */ |
|
255 |
MS( 2192, 5, 30, 55, T|A|S ), /* 206 MPS Passenger Ferry */ |
|
256 |
MS( 18628, 5, 30, 90, T|A|S ), /* 207 FFP Passenger Ferry */ |
|
257 |
MS( 17257, 10, 25, 90, T|A|S ), /* 208 Bakewell 300 Hovercraft */ |
|
258 |
MS( 9587, 5, 30, 40, Y), /* 209 Chugger-Chug Passenger Ferry */ |
|
259 |
MS( 20544, 5, 30, 90, Y), /* 210 Shivershake Passenger Ferry */ |
|
260 |
MS( 2557, 5, 30, 55, T|A|S ), /* 211 Yate Cargo ship */ |
|
261 |
MS( 19724, 5, 30, 98, T|A|S ), /* 212 Bakewell Cargo ship */ |
|
262 |
MS( 9587, 5, 30, 45, Y), /* 213 Mightymover Cargo ship */ |
|
263 |
MS( 22371, 5, 30, 90, Y), /* 214 Powernaut Cargo ship */ |
|
264 |
MA( 2922, 20, 20, 20, T|A|S ), /* 215 Sampson U52 */ |
|
265 |
MA( 9922, 20, 24, 20, T|A|S ), /* 216 Coleman Count */ |
|
266 |
MA( 12659, 20, 18, 20, T|A|S ), /* 217 FFP Dart */ |
|
267 |
MA( 17652, 20, 25, 35, T|A|S ), /* 218 Yate Haugan */ |
|
268 |
MA( 4929, 20, 30, 30, T|A|S ), /* 219 Bakewell Cotswald LB-3 */ |
|
269 |
MA( 13695, 20, 23, 25, T|A|S ), /* 220 Bakewell Luckett LB-8 */ |
|
270 |
MA( 16341, 20, 26, 30, T|A|S ), /* 221 Bakewell Luckett LB-9 */ |
|
271 |
MA( 21395, 20, 25, 30, T|A|S ), /* 222 Bakewell Luckett LB80 */ |
|
272 |
MA( 18263, 20, 20, 30, T|A|S ), /* 223 Bakewell Luckett LB-10 */ |
|
273 |
MA( 25233, 20, 25, 30, T|A|S ), /* 224 Bakewell Luckett LB-11 */ |
|
274 |
MA( 15371, 20, 22, 25, T|A|S ), /* 225 Yate Aerospace YAC 1-11 */ |
|
275 |
MA( 15461, 20, 25, 25, T|A|S ), /* 226 Darwin 100 */ |
|
276 |
MA( 16952, 20, 22, 25, T|A|S ), /* 227 Darwin 200 */ |
|
277 |
MA( 17227, 20, 25, 30, T|A|S ), /* 228 Darwin 300 */ |
|
278 |
MA( 22371, 20, 25, 35, T|A|S ), /* 229 Darwin 400 */ |
|
279 |
MA( 22341, 20, 25, 30, T|A|S ), /* 230 Darwin 500 */ |
|
280 |
MA( 27209, 20, 25, 30, T|A|S ), /* 231 Darwin 600 */ |
|
281 |
MA( 17988, 20, 20, 30, T|A|S ), /* 232 Guru Galaxy */ |
|
282 |
MA( 18993, 20, 24, 35, T|A|S ), /* 233 Airtaxi A21 */ |
|
283 |
MA( 22401, 20, 24, 30, T|A|S ), /* 234 Airtaxi A31 */ |
|
284 |
MA( 24472, 20, 24, 30, T|A|S ), /* 235 Airtaxi A32 */ |
|
285 |
MA( 26724, 20, 24, 30, T|A|S ), /* 236 Airtaxi A33 */ |
|
286 |
MA( 22005, 20, 25, 30, T|A|S ), /* 237 Yate Aerospace YAe46 */ |
|
287 |
MA( 24107, 20, 20, 35, T|A|S ), /* 238 Dinger 100 */ |
|
288 |
MA( 29310, 20, 25, 60, T|A|S ), /* 239 AirTaxi A34-1000 */ |
|
289 |
MA( 35520, 20, 22, 30, T|A|S ), /* 240 Yate Z-Shuttle */ |
|
290 |
MA( 36981, 20, 22, 30, T|A|S ), /* 241 Kelling K1 */ |
|
291 |
MA( 38807, 20, 22, 50, T|A|S ), /* 242 Kelling K6 */ |
|
292 |
MA( 42094, 20, 25, 30, T|A|S ), /* 243 Kelling K7 */ |
|
293 |
MA( 44651, 20, 23, 30, T|A|S ), /* 244 Darwin 700 */ |
|
294 |
MA( 40268, 20, 25, 30, T|A|S ), /* 245 FFP Hyperdart 2 */ |
|
295 |
MA( 33693, 20, 25, 50, T|A|S ), /* 246 Dinger 200 */ |
|
296 |
MA( 32963, 20, 20, 60, T|A|S ), /* 247 Dinger 1000 */ |
|
297 |
MA( 9222, 20, 20, 35, Y), /* 248 Ploddyphut 100 */ |
|
298 |
MA( 12874, 20, 20, 35, Y), /* 249 Ploddyphut 500 */ |
|
299 |
MA( 16892, 20, 20, 35, Y), /* 250 Flashbang X1 */ |
|
300 |
MA( 21275, 20, 20, 99, Y), /* 251 Juggerplane M1 */ |
|
301 |
MA( 23832, 20, 20, 99, Y), /* 252 Flashbang Wizzer */ |
|
302 |
MA( 13575, 20, 20, 40, T|A|S ), /* 253 Tricario Helicopter */ |
|
303 |
MA( 28215, 20, 20, 30, T|A|S ), /* 254 Guru X2 Helicopter */ |
|
304 |
MK( 13575, 20, 20, 99, Y), /* 255 */ |
|
0 | 305 |
}; |
2509
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
306 |
#undef Y |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
307 |
#undef S |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
308 |
#undef A |
dd48475227dd
(svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents:
2463
diff
changeset
|
309 |
#undef T |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
310 |
#undef MK |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
311 |
#undef MW |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
312 |
#undef MS |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
4549
diff
changeset
|
313 |
#undef MA |
0 | 314 |
|
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
315 |
/** Writes the properties of a rail vehicle into the RailVehicleInfo struct. |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
316 |
* @see RailVehicleInfo |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
317 |
* @param a image_index |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
318 |
* @param b flags |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
319 |
* @param c base_cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
320 |
* @param d max_speed (kph) |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
321 |
* @param e power (hp) |
3022
d4b90d0b5b24
(svn r3602) - Move _railveh_score data to _rail_vehicle_info->ai_rank and remove global variable to return data as we can now access this directly.
peter1138
parents:
3006
diff
changeset
|
322 |
* @param f weight |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
323 |
* @param g running_cost_base |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
324 |
* @param h running_cost_class / engclass |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
325 |
* @param i capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
326 |
* @param j cargo_type |
3022
d4b90d0b5b24
(svn r3602) - Move _railveh_score data to _rail_vehicle_info->ai_rank and remove global variable to return data as we can now access this directly.
peter1138
parents:
3006
diff
changeset
|
327 |
* @param k ai_rank |
5763 | 328 |
* @param l railtype |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5211
diff
changeset
|
329 |
* Tractive effort coefficient by default is the same as TTDPatch, 0.30*256=76 |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
330 |
*/ |
5823 | 331 |
#define RVI(a, b, c, d, e, f, g, h, i, j, k, l) { a, b, c, {l}, d, e, f, g, h, h, i, j, k, 0, 0, 0, 0, 76, 0 } |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
332 |
#define M RAILVEH_MULTIHEAD |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
333 |
#define W RAILVEH_WAGON |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
334 |
#define G RAILVEH_SINGLEHEAD |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
335 |
#define S 0 |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
336 |
#define D 1 |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
337 |
#define E 2 |
5763 | 338 |
|
5823 | 339 |
#define R RAILTYPE_RAIL |
340 |
#define C RAILTYPE_ELECTRIC |
|
341 |
#define O RAILTYPE_MONO |
|
342 |
#define L RAILTYPE_MAGLEV |
|
5763 | 343 |
|
2463
db029c987bc7
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2189
diff
changeset
|
344 |
const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES] = { |
5763 | 345 |
// image_index max_speed (kph) running_cost_base |
346 |
// | flags | power (hp) | running_cost_class & engclass |
|
347 |
// | | base_cost | weight | | capacity |
|
348 |
// | | | | | | | | | cargo_type |
|
349 |
// | | | | | | | | | | |
|
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
350 |
RVI( 2, G, 7, 64, 300, 47, 50, S, 0, 0 , 1, R), // 0 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
351 |
RVI(19, G, 8, 80, 600, 65, 65, D, 0, 0 , 4, R), // 1 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
352 |
RVI( 2, G, 10, 72, 400, 85, 90, S, 0, 0 , 7, R), // 2 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
353 |
RVI( 0, G, 15, 96, 900, 130, 130, S, 0, 0 , 19, R), // 3 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
354 |
RVI( 1, G, 19, 112, 1000, 140, 145, S, 0, 0 , 20, R), // 4 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
355 |
RVI(12, G, 16, 120, 1400, 95, 125, D, 0, 0 , 30, R), // 5 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
356 |
RVI(14, G, 20, 152, 2000, 120, 135, D, 0, 0 , 31, R), // 6 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
357 |
RVI( 3, G, 14, 88, 1100, 145, 130, S, 0, 0 , 19, R), // 7 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
358 |
RVI( 0, G, 13, 112, 1000, 131, 120, S, 0, 0 , 20, R), // 8 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
359 |
RVI( 1, G, 19, 128, 1200, 162, 140, S, 0, 0 , 21, R), // 9 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
360 |
RVI( 0, G, 22, 144, 1600, 170, 130, S, 0, 0 , 22, R), // 10 |
5763 | 361 |
RVI( 8, M, 11, 112, 600/2,32/2, 85/2, D, 38, CT_PASSENGERS , 10, R), // 11 |
362 |
RVI(10, M, 14, 120, 700/2,38/2, 70/2, D, 40, CT_PASSENGERS , 11, R), // 12 |
|
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
363 |
RVI( 4, G, 15, 128, 1250, 72, 95, D, 0, 0 , 30, R), // 13 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
364 |
RVI( 5, G, 17, 144, 1750, 101, 120, D, 0, 0 , 31, R), // 14 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
365 |
RVI( 4, G, 18, 160, 2580, 112, 140, D, 0, 0 , 32, R), // 15 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
366 |
RVI(14, G, 23, 96, 4000, 150, 135, D, 0, 0 , 33, R), // 16 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
367 |
RVI(12, G, 16, 112, 2400, 120, 105, D, 0, 0 , 34, R), // 17 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
368 |
RVI(13, G, 30, 112, 6600, 207, 155, D, 0, 0 , 35, R), // 18 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
369 |
RVI(15, G, 18, 104, 1500, 110, 105, D, 0, 0 , 29, R), // 19 |
5763 | 370 |
RVI(16, M, 35, 160, 3500/2,95/2, 205/2, D, 0, 0 , 45, R), // 20 |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
371 |
RVI(18, G, 21, 104, 2200, 120, 145, D, 0, 0 , 32, R), // 21 |
5763 | 372 |
RVI( 6, M, 20, 200, 4500/2,70/2, 190/2, D, 4, CT_MAIL , 50, R), // 22 |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
373 |
RVI(20, G, 26, 160, 3600, 84, 180, E, 0, 0 , 40, C), // 23 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
374 |
RVI(20, G, 30, 176, 5000, 82, 205, E, 0, 0 , 41, C), // 24 |
5823 | 375 |
RVI(21, M, 40, 240, 7000/2,90/2, 240/2, E, 0, 0 , 51, C), // 25 |
376 |
RVI(23, M, 43, 264, 8000/2,95/2, 250/2, E, 0, 0 , 52, C), // 26 |
|
5763 | 377 |
RVI(33, W, 247, 0, 0, 25, 0, 0, 40, CT_PASSENGERS , 0, R), // 27 |
378 |
RVI(35, W, 228, 0, 0, 21, 0, 0, 30, CT_MAIL , 0, R), // 28 |
|
379 |
RVI(34, W, 176, 0, 0, 18, 0, 0, 30, CT_COAL , 0, R), // 29 |
|
380 |
RVI(36, W, 200, 0, 0, 24, 0, 0, 30, CT_OIL , 0, R), // 30 |
|
381 |
RVI(37, W, 192, 0, 0, 20, 0, 0, 25, CT_LIVESTOCK , 0, R), // 31 |
|
382 |
RVI(38, W, 190, 0, 0, 21, 0, 0, 25, CT_GOODS , 0, R), // 32 |
|
383 |
RVI(39, W, 182, 0, 0, 19, 0, 0, 30, CT_GRAIN , 0, R), // 33 |
|
384 |
RVI(40, W, 181, 0, 0, 16, 0, 0, 30, CT_WOOD , 0, R), // 34 |
|
385 |
RVI(41, W, 179, 0, 0, 19, 0, 0, 30, CT_IRON_ORE , 0, R), // 35 |
|
386 |
RVI(42, W, 196, 0, 0, 18, 0, 0, 20, CT_STEEL , 0, R), // 36 |
|
387 |
RVI(43, W, 255, 0, 0, 30, 0, 0, 20, CT_VALUABLES , 0, R), // 37 |
|
388 |
RVI(44, W, 191, 0, 0, 22, 0, 0, 25, CT_FOOD , 0, R), // 38 |
|
389 |
RVI(45, W, 196, 0, 0, 18, 0, 0, 20, CT_PAPER , 0, R), // 39 |
|
390 |
RVI(46, W, 179, 0, 0, 19, 0, 0, 30, CT_COPPER_ORE , 0, R), // 40 |
|
391 |
RVI(47, W, 199, 0, 0, 25, 0, 0, 25, CT_WATER , 0, R), // 41 |
|
392 |
RVI(48, W, 182, 0, 0, 18, 0, 0, 25, CT_FRUIT , 0, R), // 42 |
|
393 |
RVI(49, W, 185, 0, 0, 19, 0, 0, 21, CT_RUBBER , 0, R), // 43 |
|
394 |
RVI(50, W, 176, 0, 0, 19, 0, 0, 30, CT_SUGAR , 0, R), // 44 |
|
395 |
RVI(51, W, 178, 0, 0, 20, 0, 0, 30, CT_COTTON_CANDY, 0, R), // 45 |
|
396 |
RVI(52, W, 192, 0, 0, 20, 0, 0, 30, CT_TOFFEE , 0, R), // 46 |
|
397 |
RVI(53, W, 190, 0, 0, 21, 0, 0, 20, CT_BUBBLES , 0, R), // 47 |
|
398 |
RVI(54, W, 182, 0, 0, 24, 0, 0, 25, CT_COLA , 0, R), // 48 |
|
399 |
RVI(55, W, 181, 0, 0, 21, 0, 0, 25, CT_CANDY , 0, R), // 49 |
|
400 |
RVI(56, W, 183, 0, 0, 21, 0, 0, 20, CT_TOYS , 0, R), // 50 |
|
401 |
RVI(57, W, 196, 0, 0, 18, 0, 0, 22, CT_BATTERIES , 0, R), // 51 |
|
402 |
RVI(58, W, 193, 0, 0, 18, 0, 0, 25, CT_FIZZY_DRINKS, 0, R), // 52 |
|
403 |
RVI(59, W, 191, 0, 0, 18, 0, 0, 30, CT_PLASTIC , 0, R), // 53 |
|
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
404 |
RVI(25, G, 52, 304, 9000, 95, 230, E, 0, 0 , 60, O), // 54 |
5763 | 405 |
RVI(26, M, 60, 336, 10000/2,85/2, 240/2, E, 25, CT_PASSENGERS , 62, O), // 55 |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
406 |
RVI(26, G, 53, 320, 5000, 95, 230, E, 0, 0 , 63, O), // 56 |
5763 | 407 |
RVI(60, W, 247, 0, 0, 25, 0, 0, 45, CT_PASSENGERS , 0, O), // 57 |
408 |
RVI(62, W, 228, 0, 0, 21, 0, 0, 35, CT_MAIL , 0, O), // 58 |
|
409 |
RVI(61, W, 176, 0, 0, 18, 0, 0, 35, CT_COAL , 0, O), // 59 |
|
410 |
RVI(63, W, 200, 0, 0, 24, 0, 0, 35, CT_OIL , 0, O), // 60 |
|
411 |
RVI(64, W, 192, 0, 0, 20, 0, 0, 30, CT_LIVESTOCK , 0, O), // 61 |
|
412 |
RVI(65, W, 190, 0, 0, 21, 0, 0, 30, CT_GOODS , 0, O), // 62 |
|
413 |
RVI(66, W, 182, 0, 0, 19, 0, 0, 35, CT_GRAIN , 0, O), // 63 |
|
414 |
RVI(67, W, 181, 0, 0, 16, 0, 0, 35, CT_WOOD , 0, O), // 64 |
|
415 |
RVI(68, W, 179, 0, 0, 19, 0, 0, 35, CT_IRON_ORE , 0, O), // 65 |
|
416 |
RVI(69, W, 196, 0, 0, 18, 0, 0, 25, CT_STEEL , 0, O), // 66 |
|
417 |
RVI(70, W, 255, 0, 0, 30, 0, 0, 25, CT_VALUABLES , 0, O), // 67 |
|
418 |
RVI(71, W, 191, 0, 0, 22, 0, 0, 30, CT_FOOD , 0, O), // 68 |
|
419 |
RVI(72, W, 196, 0, 0, 18, 0, 0, 25, CT_PAPER , 0, O), // 69 |
|
420 |
RVI(73, W, 179, 0, 0, 19, 0, 0, 35, CT_COPPER_ORE , 0, O), // 70 |
|
421 |
RVI(47, W, 199, 0, 0, 25, 0, 0, 30, CT_WATER , 0, O), // 71 |
|
422 |
RVI(48, W, 182, 0, 0, 18, 0, 0, 30, CT_FRUIT , 0, O), // 72 |
|
423 |
RVI(49, W, 185, 0, 0, 19, 0, 0, 26, CT_RUBBER , 0, O), // 73 |
|
424 |
RVI(50, W, 176, 0, 0, 19, 0, 0, 35, CT_SUGAR , 0, O), // 74 |
|
425 |
RVI(51, W, 178, 0, 0, 20, 0, 0, 35, CT_COTTON_CANDY, 0, O), // 75 |
|
426 |
RVI(52, W, 192, 0, 0, 20, 0, 0, 35, CT_TOFFEE , 0, O), // 76 |
|
427 |
RVI(53, W, 190, 0, 0, 21, 0, 0, 25, CT_BUBBLES , 0, O), // 77 |
|
428 |
RVI(54, W, 182, 0, 0, 24, 0, 0, 30, CT_COLA , 0, O), // 78 |
|
429 |
RVI(55, W, 181, 0, 0, 21, 0, 0, 30, CT_CANDY , 0, O), // 79 |
|
430 |
RVI(56, W, 183, 0, 0, 21, 0, 0, 25, CT_TOYS , 0, O), // 80 |
|
431 |
RVI(57, W, 196, 0, 0, 18, 0, 0, 27, CT_BATTERIES , 0, O), // 81 |
|
432 |
RVI(58, W, 193, 0, 0, 18, 0, 0, 30, CT_FIZZY_DRINKS, 0, O), // 82 |
|
433 |
RVI(59, W, 191, 0, 0, 18, 0, 0, 35, CT_PLASTIC , 0, O), // 83 |
|
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
434 |
RVI(28, G, 70, 400, 10000, 105, 250, E, 0, 0 , 70, L), // 84 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
435 |
RVI(29, G, 74, 448, 12000, 120, 253, E, 0, 0 , 71, L), // 85 |
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
436 |
RVI(30, G, 82, 480, 15000, 130, 254, E, 0, 0 , 72, L), // 86 |
5763 | 437 |
RVI(31, M, 95, 640, 20000/2,150/2,255/2, E, 0, 0 , 73, L), // 87 |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
438 |
RVI(28, G, 70, 480, 10000, 120, 250, E, 0, 0 , 74, L), // 88 |
5763 | 439 |
RVI(60, W, 247, 0, 0, 25, 0, 0, 47, CT_PASSENGERS , 0, L), // 89 |
440 |
RVI(62, W, 228, 0, 0, 21, 0, 0, 37, CT_MAIL , 0, L), // 90 |
|
441 |
RVI(61, W, 176, 0, 0, 18, 0, 0, 37, CT_COAL , 0, L), // 91 |
|
442 |
RVI(63, W, 200, 0, 0, 24, 0, 0, 37, CT_OIL , 0, L), // 92 |
|
443 |
RVI(64, W, 192, 0, 0, 20, 0, 0, 32, CT_LIVESTOCK , 0, L), // 93 |
|
444 |
RVI(65, W, 190, 0, 0, 21, 0, 0, 32, CT_GOODS , 0, L), // 94 |
|
445 |
RVI(66, W, 182, 0, 0, 19, 0, 0, 37, CT_GRAIN , 0, L), // 95 |
|
446 |
RVI(67, W, 181, 0, 0, 16, 0, 0, 37, CT_WOOD , 0, L), // 96 |
|
447 |
RVI(68, W, 179, 0, 0, 19, 0, 0, 37, CT_IRON_ORE , 0, L), // 97 |
|
448 |
RVI(69, W, 196, 0, 0, 18, 0, 0, 27, CT_STEEL , 0, L), // 98 |
|
449 |
RVI(70, W, 255, 0, 0, 30, 0, 0, 27, CT_VALUABLES , 0, L), // 99 |
|
450 |
RVI(71, W, 191, 0, 0, 22, 0, 0, 32, CT_FOOD , 0, L), // 100 |
|
451 |
RVI(72, W, 196, 0, 0, 18, 0, 0, 27, CT_PAPER , 0, L), // 101 |
|
452 |
RVI(73, W, 179, 0, 0, 19, 0, 0, 37, CT_COPPER_ORE , 0, L), // 102 |
|
453 |
RVI(47, W, 199, 0, 0, 25, 0, 0, 32, CT_WATER , 0, L), // 103 |
|
454 |
RVI(48, W, 182, 0, 0, 18, 0, 0, 32, CT_FRUIT , 0, L), // 104 |
|
455 |
RVI(49, W, 185, 0, 0, 19, 0, 0, 28, CT_RUBBER , 0, L), // 105 |
|
456 |
RVI(50, W, 176, 0, 0, 19, 0, 0, 37, CT_SUGAR , 0, L), // 106 |
|
457 |
RVI(51, W, 178, 0, 0, 20, 0, 0, 37, CT_COTTON_CANDY, 0, L), // 107 |
|
458 |
RVI(52, W, 192, 0, 0, 20, 0, 0, 37, CT_TOFFEE , 0, L), // 108 |
|
459 |
RVI(53, W, 190, 0, 0, 21, 0, 0, 27, CT_BUBBLES , 0, L), // 109 |
|
460 |
RVI(54, W, 182, 0, 0, 24, 0, 0, 32, CT_COLA , 0, L), // 110 |
|
461 |
RVI(55, W, 181, 0, 0, 21, 0, 0, 32, CT_CANDY , 0, L), // 111 |
|
462 |
RVI(56, W, 183, 0, 0, 21, 0, 0, 27, CT_TOYS , 0, L), // 112 |
|
463 |
RVI(57, W, 196, 0, 0, 18, 0, 0, 29, CT_BATTERIES , 0, L), // 113 |
|
464 |
RVI(58, W, 193, 0, 0, 18, 0, 0, 32, CT_FIZZY_DRINKS, 0, L), // 114 |
|
465 |
RVI(59, W, 191, 0, 0, 18, 0, 0, 37, CT_PLASTIC , 0, L), // 115 |
|
0 | 466 |
}; |
5763 | 467 |
#undef L |
468 |
#undef O |
|
469 |
#undef C |
|
470 |
#undef R |
|
2961
f83710dba47c
(svn r3523) Undefine helper macros after using them
peter1138
parents:
2960
diff
changeset
|
471 |
#undef E |
f83710dba47c
(svn r3523) Undefine helper macros after using them
peter1138
parents:
2960
diff
changeset
|
472 |
#undef D |
f83710dba47c
(svn r3523) Undefine helper macros after using them
peter1138
parents:
2960
diff
changeset
|
473 |
#undef S |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5855
diff
changeset
|
474 |
#undef G |
2521
e7eb2535b206
(svn r3050) Augment the rail vehicle table with symbolic names for dual-head engines and wagons
tron
parents:
2509
diff
changeset
|
475 |
#undef W |
e7eb2535b206
(svn r3050) Augment the rail vehicle table with symbolic names for dual-head engines and wagons
tron
parents:
2509
diff
changeset
|
476 |
#undef M |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
477 |
#undef RVI |
0 | 478 |
|
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
479 |
/** Writes the properties of a ship into the ShipVehicleInfo struct. |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
480 |
* @see ShipVehicleInfo |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
481 |
* @param a image_index |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
482 |
* @param b base_cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
483 |
* @param c max_speed |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
484 |
* @param d cargo_type |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
485 |
* @param e cargo_amount |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
486 |
* @param f running_cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
487 |
* @param g sound effect |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
488 |
* @param h refittable |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
489 |
*/ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5475
diff
changeset
|
490 |
#define SVI(a, b, c, d, e, f, g, h) { a, b, c, d, e, f, {g}, h } |
2463
db029c987bc7
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2189
diff
changeset
|
491 |
const ShipVehicleInfo orig_ship_vehicle_info[NUM_SHIP_ENGINES] = { |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
492 |
// image_index cargo_type cargo_amount refittable |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
493 |
// | base_cost | | running_cost | |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
494 |
// | | max_speed | | sfx | |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
495 |
// | | | | | | | | |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
496 |
SVI( 1, 160, 48, CT_OIL, 220, 140, SND_06_SHIP_HORN, 0 ), /* 0 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
497 |
SVI( 1, 176, 80, CT_OIL, 350, 125, SND_06_SHIP_HORN, 0 ), /* 1 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
498 |
SVI( 2, 96, 64, CT_PASSENGERS, 100, 90, SND_07_FERRY_HORN, 0 ), /* 2 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
499 |
SVI( 2, 112, 128, CT_PASSENGERS, 130, 80, SND_07_FERRY_HORN, 0 ), /* 3 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
500 |
SVI( 3, 148, 224, CT_PASSENGERS, 100, 190, SND_07_FERRY_HORN, 0 ), /* 4 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
501 |
SVI( 2, 96, 64, CT_PASSENGERS, 100, 90, SND_07_FERRY_HORN, 0 ), /* 5 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
502 |
SVI( 2, 112, 128, CT_PASSENGERS, 130, 80, SND_07_FERRY_HORN, 0 ), /* 6 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
503 |
SVI( 0, 128, 48, CT_GOODS, 160, 150, SND_06_SHIP_HORN, 1 ), /* 7 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
504 |
SVI( 0, 144, 80, CT_GOODS, 190, 113, SND_06_SHIP_HORN, 1 ), /* 8 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
505 |
SVI( 0, 128, 48, CT_GOODS, 160, 150, SND_06_SHIP_HORN, 1 ), /* 9 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
506 |
SVI( 0, 144, 80, CT_GOODS, 190, 113, SND_06_SHIP_HORN, 1 ), /* 10 */ |
374
0309a855fc66
(svn r562) newgrf: Merge most of the road vehicle info to a single
celestar
parents:
114
diff
changeset
|
507 |
}; |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
508 |
#undef SVI |
374
0309a855fc66
(svn r562) newgrf: Merge most of the road vehicle info to a single
celestar
parents:
114
diff
changeset
|
509 |
|
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
510 |
/** Writes the properties of an aircraft into the AircraftVehicleInfo struct. |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
511 |
* @see AircraftVehicleInfo |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
512 |
* @param a image_index |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
513 |
* @param b base_cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
514 |
* @param c running_Cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
515 |
* @param d subtype (bit 0 - plane, bit 1 - large plane) |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
516 |
* @param e sound effect |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
517 |
* @param f acceleration |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
518 |
* @param g max_speed |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
519 |
* @param h mail_capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
520 |
* @param i passenger_capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
521 |
*/ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5475
diff
changeset
|
522 |
#define AVI(a, b, c, d, e, f, g, h, i) { a, b, c, d, {e}, f, g, h, i } |
5855
6f273e99a57a
(svn r8429) -Codechange: Add a name for AircraftVehicleInfo subtype helicopter and remove some magic numbers related to the subtype.
Darkvater
parents:
5823
diff
changeset
|
523 |
#define H AIR_HELI |
4023
5d84c056a2b1
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
3997
diff
changeset
|
524 |
#define P AIR_CTOL |
5d84c056a2b1
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
3997
diff
changeset
|
525 |
#define J AIR_CTOL | AIR_FAST |
2463
db029c987bc7
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2189
diff
changeset
|
526 |
const AircraftVehicleInfo orig_aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES] = { |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
527 |
// image_index sfx acceleration |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
528 |
// | base_cost | | max_speed |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
529 |
// | | running_cost | | mail_capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
530 |
// | | | subtype | | | | passenger_capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
531 |
// | | | | | | | | | |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
532 |
AVI( 1, 14, 85, P, SND_08_PLANE_TAKE_OFF, 18, 37, 4, 25 ), /* 0 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
533 |
AVI( 0, 15, 100, P, SND_08_PLANE_TAKE_OFF, 20, 37, 8, 65 ), /* 1 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
534 |
AVI( 2, 16, 130, J, SND_09_JET, 35, 74, 10, 90 ), /* 2 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
535 |
AVI( 8, 75, 250, J, SND_3B_JET_OVERHEAD, 50, 181, 20, 100 ), /* 3 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
536 |
AVI( 5, 15, 98, P, SND_08_PLANE_TAKE_OFF, 20, 37, 6, 30 ), /* 4 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
537 |
AVI( 6, 18, 240, J, SND_09_JET, 40, 74, 30, 200 ), /* 5 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
538 |
AVI( 2, 17, 150, P, SND_09_JET, 35, 74, 15, 100 ), /* 6 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
539 |
AVI( 2, 18, 245, J, SND_09_JET, 40, 74, 30, 150 ), /* 7 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
540 |
AVI( 3, 19, 192, J, SND_09_JET, 40, 74, 40, 220 ), /* 8 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
541 |
AVI( 3, 20, 190, J, SND_09_JET, 40, 74, 25, 230 ), /* 9 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
542 |
AVI( 2, 16, 135, J, SND_09_JET, 35, 74, 10, 95 ), /* 10 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
543 |
AVI( 2, 18, 240, J, SND_09_JET, 40, 74, 35, 170 ), /* 11 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
544 |
AVI( 4, 17, 155, J, SND_09_JET, 40, 74, 15, 110 ), /* 12 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
545 |
AVI( 7, 30, 253, J, SND_3D_ANOTHER_JET_OVERHEAD, 40, 74, 50, 300 ), /* 13 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
546 |
AVI( 4, 18, 210, J, SND_09_JET, 40, 74, 25, 200 ), /* 14 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
547 |
AVI( 4, 19, 220, J, SND_09_JET, 40, 74, 25, 240 ), /* 15 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
548 |
AVI( 4, 27, 230, J, SND_09_JET, 40, 74, 40, 260 ), /* 16 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
549 |
AVI( 3, 25, 225, J, SND_09_JET, 40, 74, 35, 240 ), /* 17 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
550 |
AVI( 4, 20, 235, J, SND_09_JET, 40, 74, 30, 260 ), /* 18 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
551 |
AVI( 4, 19, 220, J, SND_09_JET, 40, 74, 25, 210 ), /* 19 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
552 |
AVI( 4, 18, 170, J, SND_09_JET, 40, 74, 20, 160 ), /* 20 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
553 |
AVI( 4, 26, 210, J, SND_09_JET, 40, 74, 20, 220 ), /* 21 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
554 |
AVI( 6, 16, 125, P, SND_09_JET, 50, 74, 10, 80 ), /* 22 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
555 |
AVI( 2, 17, 145, P, SND_09_JET, 40, 74, 10, 85 ), /* 23 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
556 |
AVI( 11, 16, 130, J, SND_09_JET, 40, 74, 10, 75 ), /* 24 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
557 |
AVI( 10, 16, 149, J, SND_09_JET, 40, 74, 10, 85 ), /* 25 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
558 |
AVI( 15, 17, 170, J, SND_09_JET, 40, 74, 18, 65 ), /* 26 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
559 |
AVI( 12, 18, 210, J, SND_09_JET, 40, 74, 25, 110 ), /* 27 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
560 |
AVI( 13, 20, 230, J, SND_09_JET, 40, 74, 60, 180 ), /* 28 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
561 |
AVI( 14, 21, 220, J, SND_09_JET, 40, 74, 65, 150 ), /* 29 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
562 |
AVI( 16, 19, 160, J, SND_09_JET, 40, 181, 45, 85 ), /* 30 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
563 |
AVI( 17, 24, 248, J, SND_3D_ANOTHER_JET_OVERHEAD, 40, 74, 80, 400 ), /* 31 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
564 |
AVI( 18, 80, 251, J, SND_3B_JET_OVERHEAD, 50, 181, 45, 130 ), /* 32 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
565 |
AVI( 20, 13, 85, P, SND_45_PLANE_CRASHING, 18, 37, 5, 25 ), /* 33 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
566 |
AVI( 21, 18, 100, P, SND_46_PLANE_ENGINE_SPUTTERING, 20, 37, 9, 60 ), /* 34 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
567 |
AVI( 22, 25, 140, P, SND_09_JET, 40, 74, 12, 90 ), /* 35 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
568 |
AVI( 23, 32, 220, J, SND_3D_ANOTHER_JET_OVERHEAD, 40, 74, 40, 200 ), /* 36 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
569 |
AVI( 24, 80, 255, J, SND_3B_JET_OVERHEAD, 50, 181, 30, 100 ), /* 37 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
570 |
AVI( 9, 15, 81, H, SND_09_JET, 20, 25, 15, 40 ), /* 38 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
571 |
AVI( 19, 17, 77, H, SND_09_JET, 20, 40, 20, 55 ), /* 39 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
572 |
AVI( 25, 15, 80, H, SND_09_JET, 20, 25, 10, 40 ), /* 40 */ |
376
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
573 |
}; |
2961
f83710dba47c
(svn r3523) Undefine helper macros after using them
peter1138
parents:
2960
diff
changeset
|
574 |
#undef J |
f83710dba47c
(svn r3523) Undefine helper macros after using them
peter1138
parents:
2960
diff
changeset
|
575 |
#undef P |
f83710dba47c
(svn r3523) Undefine helper macros after using them
peter1138
parents:
2960
diff
changeset
|
576 |
#undef H |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
577 |
#undef AVI |
374
0309a855fc66
(svn r562) newgrf: Merge most of the road vehicle info to a single
celestar
parents:
114
diff
changeset
|
578 |
|
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
579 |
/** Writes the properties of a road vehicle into the RoadVehicleInfo struct. |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
580 |
* @see RoadVehicleInfo |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
581 |
* @param a image_index |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
582 |
* @param b base_cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
583 |
* @param c running_cost |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
584 |
* @param d sound effect |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
585 |
* @param e max_speed |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
586 |
* @param f capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
587 |
* @param g cargo_type |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
588 |
*/ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5475
diff
changeset
|
589 |
#define RVI(a, b, c, d, e, f, g) { a, b, c, {d}, e, f, g } |
2463
db029c987bc7
(svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data.
peter1138
parents:
2189
diff
changeset
|
590 |
const RoadVehicleInfo orig_road_vehicle_info[NUM_ROAD_ENGINES] = { |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
591 |
// image_index sfx max_speed |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
592 |
// | base_cost | | capacity |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
593 |
// | | running_cost | | cargo_type |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
594 |
// | | | | | | | |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
595 |
RVI( 0, 120, 91, SND_19_BUS_START_PULL_AWAY, 112, 31, CT_PASSENGERS ), /* 0 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
596 |
RVI( 17, 140, 128, SND_1C_TRUCK_START_2, 176, 35, CT_PASSENGERS ), /* 1 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
597 |
RVI( 17, 150, 178, SND_1B_TRUCK_START, 224, 37, CT_PASSENGERS ), /* 2 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
598 |
RVI( 34, 160, 240, SND_1B_TRUCK_START, 255, 40, CT_PASSENGERS ), /* 3 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
599 |
RVI( 51, 120, 91, SND_3C_COMEDY_CAR, 112, 30, CT_PASSENGERS ), /* 4 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
600 |
RVI( 51, 140, 171, SND_3E_COMEDY_CAR_2, 192, 35, CT_PASSENGERS ), /* 5 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
601 |
RVI( 51, 160, 240, SND_3C_COMEDY_CAR, 240, 38, CT_PASSENGERS ), /* 6 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
602 |
RVI( 1, 108, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_COAL ), /* 7 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
603 |
RVI( 18, 128, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_COAL ), /* 8 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
604 |
RVI( 35, 138, 240, SND_19_BUS_START_PULL_AWAY, 224, 28, CT_COAL ), /* 9 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
605 |
RVI( 2, 115, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_MAIL ), /* 10 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
606 |
RVI( 19, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 28, CT_MAIL ), /* 11 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
607 |
RVI( 36, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 30, CT_MAIL ), /* 12 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
608 |
RVI( 57, 115, 90, SND_3E_COMEDY_CAR_2, 96, 22, CT_MAIL ), /* 13 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
609 |
RVI( 57, 135, 168, SND_3C_COMEDY_CAR, 176, 28, CT_MAIL ), /* 14 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
610 |
RVI( 57, 145, 240, SND_3E_COMEDY_CAR_2, 224, 30, CT_MAIL ), /* 15 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
611 |
RVI( 3, 110, 90, SND_19_BUS_START_PULL_AWAY, 96, 21, CT_OIL ), /* 16 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
612 |
RVI( 20, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_OIL ), /* 17 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
613 |
RVI( 37, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_OIL ), /* 18 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
614 |
RVI( 4, 105, 90, SND_19_BUS_START_PULL_AWAY, 96, 14, CT_LIVESTOCK ), /* 19 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
615 |
RVI( 21, 130, 168, SND_19_BUS_START_PULL_AWAY, 176, 16, CT_LIVESTOCK ), /* 20 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
616 |
RVI( 38, 140, 240, SND_19_BUS_START_PULL_AWAY, 224, 18, CT_LIVESTOCK ), /* 21 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
617 |
RVI( 5, 107, 90, SND_19_BUS_START_PULL_AWAY, 96, 14, CT_GOODS ), /* 22 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
618 |
RVI( 22, 130, 168, SND_19_BUS_START_PULL_AWAY, 176, 16, CT_GOODS ), /* 23 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
619 |
RVI( 39, 140, 240, SND_19_BUS_START_PULL_AWAY, 224, 18, CT_GOODS ), /* 24 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
620 |
RVI( 6, 114, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_GRAIN ), /* 25 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
621 |
RVI( 23, 133, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_GRAIN ), /* 26 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
622 |
RVI( 40, 143, 240, SND_19_BUS_START_PULL_AWAY, 224, 30, CT_GRAIN ), /* 27 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
623 |
RVI( 7, 118, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_WOOD ), /* 28 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
624 |
RVI( 24, 137, 168, SND_19_BUS_START_PULL_AWAY, 176, 22, CT_WOOD ), /* 29 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
625 |
RVI( 41, 147, 240, SND_19_BUS_START_PULL_AWAY, 224, 24, CT_WOOD ), /* 30 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
626 |
RVI( 8, 121, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_IRON_ORE ), /* 31 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
627 |
RVI( 25, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_IRON_ORE ), /* 32 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
628 |
RVI( 42, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_IRON_ORE ), /* 33 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
629 |
RVI( 9, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 15, CT_STEEL ), /* 34 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
630 |
RVI( 26, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 18, CT_STEEL ), /* 35 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
631 |
RVI( 43, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 20, CT_STEEL ), /* 36 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
632 |
RVI( 10, 145, 90, SND_19_BUS_START_PULL_AWAY, 96, 12, CT_VALUABLES ), /* 37 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
633 |
RVI( 27, 170, 168, SND_19_BUS_START_PULL_AWAY, 176, 15, CT_VALUABLES ), /* 38 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
634 |
RVI( 44, 180, 240, SND_19_BUS_START_PULL_AWAY, 224, 16, CT_VALUABLES ), /* 39 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
635 |
RVI( 11, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 17, CT_FOOD ), /* 40 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
636 |
RVI( 28, 134, 168, SND_19_BUS_START_PULL_AWAY, 176, 20, CT_FOOD ), /* 41 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
637 |
RVI( 45, 144, 240, SND_19_BUS_START_PULL_AWAY, 224, 22, CT_FOOD ), /* 42 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
638 |
RVI( 12, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 15, CT_PAPER ), /* 43 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
639 |
RVI( 29, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 18, CT_PAPER ), /* 44 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
640 |
RVI( 46, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 20, CT_PAPER ), /* 45 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
641 |
RVI( 13, 121, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_COPPER_ORE ), /* 46 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
642 |
RVI( 30, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_COPPER_ORE ), /* 47 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
643 |
RVI( 47, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_COPPER_ORE ), /* 48 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
644 |
RVI( 14, 111, 90, SND_19_BUS_START_PULL_AWAY, 96, 21, CT_WATER ), /* 49 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
645 |
RVI( 31, 141, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_WATER ), /* 50 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
646 |
RVI( 48, 151, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_WATER ), /* 51 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
647 |
RVI( 15, 118, 90, SND_19_BUS_START_PULL_AWAY, 96, 18, CT_FRUIT ), /* 52 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
648 |
RVI( 32, 148, 168, SND_19_BUS_START_PULL_AWAY, 176, 20, CT_FRUIT ), /* 53 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
649 |
RVI( 49, 158, 240, SND_19_BUS_START_PULL_AWAY, 224, 23, CT_FRUIT ), /* 54 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
650 |
RVI( 16, 117, 90, SND_19_BUS_START_PULL_AWAY, 96, 17, CT_RUBBER ), /* 55 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
651 |
RVI( 33, 147, 168, SND_19_BUS_START_PULL_AWAY, 176, 19, CT_RUBBER ), /* 56 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
652 |
RVI( 50, 157, 240, SND_19_BUS_START_PULL_AWAY, 224, 22, CT_RUBBER ), /* 57 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
653 |
RVI( 52, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_SUGAR ), /* 58 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
654 |
RVI( 52, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_SUGAR ), /* 59 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
655 |
RVI( 52, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_SUGAR ), /* 60 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
656 |
RVI( 53, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_COLA ), /* 61 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
657 |
RVI( 53, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_COLA ), /* 62 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
658 |
RVI( 53, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_COLA ), /* 63 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
659 |
RVI( 54, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_COTTON_CANDY ), /* 64 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
660 |
RVI( 54, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_COTTON_CANDY ), /* 65 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
661 |
RVI( 54, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_COTTON_CANDY ), /* 66 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
662 |
RVI( 55, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_TOFFEE ), /* 67 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
663 |
RVI( 55, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_TOFFEE ), /* 68 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
664 |
RVI( 55, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_TOFFEE ), /* 69 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
665 |
RVI( 56, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_TOYS ), /* 70 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
666 |
RVI( 56, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_TOYS ), /* 71 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
667 |
RVI( 56, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_TOYS ), /* 72 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
668 |
RVI( 58, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_CANDY ), /* 73 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
669 |
RVI( 58, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_CANDY ), /* 74 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
670 |
RVI( 58, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_CANDY ), /* 75 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
671 |
RVI( 59, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_BATTERIES ), /* 76 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
672 |
RVI( 59, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_BATTERIES ), /* 77 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
673 |
RVI( 59, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_BATTERIES ), /* 78 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
674 |
RVI( 60, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_FIZZY_DRINKS ), /* 79 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
675 |
RVI( 60, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_FIZZY_DRINKS ), /* 80 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
676 |
RVI( 60, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_FIZZY_DRINKS ), /* 81 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
677 |
RVI( 61, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_PLASTIC ), /* 82 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
678 |
RVI( 61, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_PLASTIC ), /* 83 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
679 |
RVI( 61, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_PLASTIC ), /* 84 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
680 |
RVI( 62, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_BUBBLES ), /* 85 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
681 |
RVI( 62, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_BUBBLES ), /* 86 */ |
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
682 |
RVI( 62, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_BUBBLES ), /* 87 */ |
0 | 683 |
}; |
2960
b51397e5b207
(svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents:
2840
diff
changeset
|
684 |
#undef RVI |
376
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
685 |
|
6ffd7911bf39
(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.
darkvater
parents:
374
diff
changeset
|
686 |
#endif /* ENGINES_H */ |