src/table/engines.h
author celestar
Mon, 19 Mar 2007 09:33:17 +0000
branchgamebalance
changeset 9894 70d78ac95d6c
parent 6519 367d6f96e23f
child 6303 84c215fc8eb8
permissions -rw-r--r--
(svn r9310) [gamebalance] -Feature: Player performance now influences the wealth level of a town (albeit only on a small scale). This is the first feedback effect that the player has on the local and global economy. Please refrain from using the AI too much for the time being because it'll trash the ratings most likely.
2186
461a2aff3486 (svn r2701) Insert Id tags into all source files
tron
parents: 2171
diff changeset
     1
/* $Id$ */
461a2aff3486 (svn r2701) Insert Id tags into all source files
tron
parents: 2171
diff changeset
     2
376
1a4425a0a953 (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
1a4425a0a953 (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
1a4425a0a953 (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
9095824555e6 (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
60410aa1aa88 (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
60410aa1aa88 (svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents: 4322
diff changeset
     8
 */
2129
9095824555e6 (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
d240b9097139 (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
1a4425a0a953 (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
651c9272ad22 (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
60410aa1aa88 (svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents: 4322
diff changeset
    13
 * @see EngineInfo
60410aa1aa88 (svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents: 4322
diff changeset
    14
 * @param a Introduction date
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    15
 * @param e Bitmask of the climates
5211
651c9272ad22 (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
60410aa1aa88 (svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents: 4322
diff changeset
    17
 */
6021
2193f56f4122 (svn r8321) -Fix
tron
parents: 6014
diff changeset
    18
#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0 }
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    19
2147
42efdf5020d1 (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.
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    21
 * @see MK
4549
60410aa1aa88 (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
651c9272ad22 (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
60410aa1aa88 (svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents: 4322
diff changeset
    24
 */
6021
2193f56f4122 (svn r8321) -Fix
tron
parents: 6014
diff changeset
    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
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
    26
651c9272ad22 (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.
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
    28
 * @see MK
651c9272ad22 (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
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
    30
 */
6021
2193f56f4122 (svn r8321) -Fix
tron
parents: 6014
diff changeset
    31
#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 10, e, 0, 8, 0, 0 }
5211
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
    32
651c9272ad22 (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.
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
    34
 * @see MK
651c9272ad22 (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
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
    36
 */
6021
2193f56f4122 (svn r8321) -Fix
tron
parents: 6014
diff changeset
    37
#define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 20, e, 0, 8, 0, 0 }
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    38
2509
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    39
// Climates
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    40
// T = Temperate
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    41
// A = Arctic
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    42
// S = Sub-Tropic
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    43
// Y = Toyland
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    44
#define T 1
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    45
#define A 2
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    46
#define S 4
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
    47
#define Y 8
d293dda5c375 (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[] = {
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    49
	MK(  1827,  20,  15,  30, T      ), /*   0 Kirby Paul Tank (Steam) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    50
	MK( 12784,  20,  22,  30,   A|S  ), /*   1 MJS 250 (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    51
	MK(  9497,  20,  20,  50,       Y), /*   2 Ploddyphut Choo-Choo */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    52
	MK( 11688,  20,  20,  30,       Y), /*   3 Powernaut Choo-Choo */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    53
	MK( 16802,  20,  20,  30,       Y), /*   4 Mightymover Choo-Choo */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    54
	MK( 18993,  20,  20,  30,       Y), /*   5 Ploddyphut Diesel */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    55
	MK( 20820,  20,  20,  30,       Y), /*   6 Powernaut Diesel */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    56
	MK(  8766,  20,  20,  30,   A|S  ), /*   7 Wills 2-8-0 (Steam) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    57
	MK(  5114,  20,  21,  30, T      ), /*   8 Chaney 'Jubilee' (Steam) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    58
	MK(  5479,  20,  20,  30, T      ), /*   9 Ginzu 'A4' (Steam) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    59
	MK( 12419,  20,  23,  25, T      ), /*  10 SH '8P' (Steam) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    60
	MK( 13149,  20,  12,  30, T      ), /*  11 Manley-Morel DMU (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    61
	MK( 23376,  20,  15,  35, T      ), /*  12 'Dash' (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    62
	MK( 14976,  20,  18,  28, T      ), /*  13 SH/Hendry '25' (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    63
	MK( 14245,  20,  20,  30, T      ), /*  14 UU '37' (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    64
	MK( 15341,  20,  22,  33, T      ), /*  15 Floss '47' (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    65
	MK( 14976,  20,  20,  25,   A|S  ), /*  16 CS 4000 (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    66
	MK( 16437,  20,  20,  30,   A|S  ), /*  17 CS 2400 (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    67
	MK( 18993,  20,  22,  30,   A|S  ), /*  18 Centennial (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    68
	MK( 13880,  20,  22,  30,   A|S  ), /*  19 Kelling 3100 (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    69
	MK( 20454,  20,  22,  30,   A|S  ), /*  20 Turner Turbo (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    70
	MK( 16071,  20,  22,  30,   A|S  ), /*  21 MJS 1000 (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    71
	MK( 20820,  20,  20,  25, T      ), /*  22 SH '125' (Diesel) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    72
	MK( 16437,  20,  23,  30, T      ), /*  23 SH '30' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    73
	MK( 19359,  20,  23,  80, T      ), /*  24 SH '40' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    74
	MK( 23376,  20,  25,  30, T      ), /*  25 'T.I.M.' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    75
	MK( 26298,  20,  25,  50, T      ), /*  26 'AsiaStar' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    76
	MW(  1827,  20,  20,  50, T|A|S|Y), /*  27 Passenger Carriage */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    77
	MW(  1827,  20,  20,  50, T|A|S|Y), /*  28 Mail Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    78
	MW(  1827,  20,  20,  50, T|A    ), /*  29 Coal Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    79
	MW(  1827,  20,  20,  50, T|A|S  ), /*  30 Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    80
	MW(  1827,  20,  20,  50, T|A    ), /*  31 Livestock Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    81
	MW(  1827,  20,  20,  50, T|A|S  ), /*  32 Goods Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    82
	MW(  1827,  20,  20,  50, T|A|S  ), /*  33 Grain Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    83
	MW(  1827,  20,  20,  50, T|A|S  ), /*  34 Wood Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    84
	MW(  1827,  20,  20,  50, T      ), /*  35 Iron Ore Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    85
	MW(  1827,  20,  20,  50, T      ), /*  36 Steel Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    86
	MW(  1827,  20,  20,  50, T|A|S  ), /*  37 Armoured Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    87
	MW(  1827,  20,  20,  50,   A|S  ), /*  38 Food Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    88
	MW(  1827,  20,  20,  50,   A    ), /*  39 Paper Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    89
	MW(  1827,  20,  20,  50,     S  ), /*  40 Copper Ore Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    90
	MW(  1827,  20,  20,  50,     S  ), /*  41 Water Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    91
	MW(  1827,  20,  20,  50,     S  ), /*  42 Fruit Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    92
	MW(  1827,  20,  20,  50,     S  ), /*  43 Rubber Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    93
	MW(  1827,  20,  20,  50,       Y), /*  44 Sugar Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    94
	MW(  1827,  20,  20,  50,       Y), /*  45 Candyfloss Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    95
	MW(  1827,  20,  20,  50,       Y), /*  46 Toffee Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    96
	MW(  1827,  20,  20,  50,       Y), /*  47 Bubble Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    97
	MW(  1827,  20,  20,  50,       Y), /*  48 Cola Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    98
	MW(  1827,  20,  20,  50,       Y), /*  49 Sweet Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
    99
	MW(  1827,  20,  20,  50,       Y), /*  50 Toy Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   100
	MW(  1827,  20,  20,  50,       Y), /*  51 Battery Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   101
	MW(  1827,  20,  20,  50,       Y), /*  52 Fizzy Drink Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   102
	MW(  1827,  20,  20,  50,       Y), /*  53 Plastic Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   103
	MK( 28490,  20,  20,  50, T|A|S  ), /*  54 'X2001' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   104
	MK( 31047,  20,  20,  50, T|A|S  ), /*  55 'Millennium Z1' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   105
	MK( 28855,  20,  20,  50,       Y), /*  56 Wizzowow Z99 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   106
	MW(  1827,  20,  20,  50, T|A|S|Y), /*  57 Passenger Carriage */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   107
	MW(  1827,  20,  20,  50, T|A|S|Y), /*  58 Mail Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   108
	MW(  1827,  20,  20,  50, T|A    ), /*  59 Coal Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   109
	MW(  1827,  20,  20,  50, T|A|S  ), /*  60 Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   110
	MW(  1827,  20,  20,  50, T|A    ), /*  61 Livestock Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   111
	MW(  1827,  20,  20,  50, T|A|S  ), /*  62 Goods Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   112
	MW(  1827,  20,  20,  50, T|A|S  ), /*  63 Grain Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   113
	MW(  1827,  20,  20,  50, T|A|S  ), /*  64 Wood Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   114
	MW(  1827,  20,  20,  50, T      ), /*  65 Iron Ore Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   115
	MW(  1827,  20,  20,  50, T      ), /*  66 Steel Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   116
	MW(  1827,  20,  20,  50, T|A|S  ), /*  67 Armoured Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   117
	MW(  1827,  20,  20,  50,   A|S  ), /*  68 Food Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   118
	MW(  1827,  20,  20,  50,   A    ), /*  69 Paper Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   119
	MW(  1827,  20,  20,  50,     S  ), /*  70 Copper Ore Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   120
	MW(  1827,  20,  20,  50,     S  ), /*  71 Water Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   121
	MW(  1827,  20,  20,  50,     S  ), /*  72 Fruit Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   122
	MW(  1827,  20,  20,  50,     S  ), /*  73 Rubber Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   123
	MW(  1827,  20,  20,  50,       Y), /*  74 Sugar Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   124
	MW(  1827,  20,  20,  50,       Y), /*  75 Candyfloss Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   125
	MW(  1827,  20,  20,  50,       Y), /*  76 Toffee Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   126
	MW(  1827,  20,  20,  50,       Y), /*  77 Bubble Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   127
	MW(  1827,  20,  20,  50,       Y), /*  78 Cola Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   128
	MW(  1827,  20,  20,  50,       Y), /*  79 Sweet Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   129
	MW(  1827,  20,  20,  50,       Y), /*  80 Toy Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   130
	MW(  1827,  20,  20,  50,       Y), /*  81 Battery Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   131
	MW(  1827,  20,  20,  50,       Y), /*  82 Fizzy Drink Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   132
	MW(  1827,  20,  20,  50,       Y), /*  83 Plastic Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   133
	MK( 36525,  20,  20,  50, T|A|S  ), /*  84 Lev1 'Leviathan' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   134
	MK( 39447,  20,  20,  50, T|A|S  ), /*  85 Lev2 'Cyclops' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   135
	MK( 42004,  20,  20,  50, T|A|S  ), /*  86 Lev3 'Pegasus' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   136
	MK( 42735,  20,  20,  50, T|A|S  ), /*  87 Lev4 'Chimaera' (Electric) */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   137
	MK( 36891,  20,  20,  60,       Y), /*  88 Wizzowow Rocketeer */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   138
	MW(  1827,  20,  20,  50, T|A|S|Y), /*  89 Passenger Carriage */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   139
	MW(  1827,  20,  20,  50, T|A|S|Y), /*  90 Mail Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   140
	MW(  1827,  20,  20,  50, T|A    ), /*  91 Coal Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   141
	MW(  1827,  20,  20,  50, T|A|S  ), /*  92 Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   142
	MW(  1827,  20,  20,  50, T|A    ), /*  93 Livestock Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   143
	MW(  1827,  20,  20,  50, T|A|S  ), /*  94 Goods Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   144
	MW(  1827,  20,  20,  50, T|A|S  ), /*  95 Grain Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   145
	MW(  1827,  20,  20,  50, T|A|S  ), /*  96 Wood Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   146
	MW(  1827,  20,  20,  50, T      ), /*  97 Iron Ore Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   147
	MW(  1827,  20,  20,  50, T      ), /*  98 Steel Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   148
	MW(  1827,  20,  20,  50, T|A|S  ), /*  99 Armoured Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   149
	MW(  1827,  20,  20,  50,   A|S  ), /* 100 Food Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   150
	MW(  1827,  20,  20,  50,   A    ), /* 101 Paper Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   151
	MW(  1827,  20,  20,  50,     S  ), /* 102 Copper Ore Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   152
	MW(  1827,  20,  20,  50,     S  ), /* 103 Water Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   153
	MW(  1827,  20,  20,  50,     S  ), /* 104 Fruit Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   154
	MW(  1827,  20,  20,  50,     S  ), /* 105 Rubber Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   155
	MW(  1827,  20,  20,  50,       Y), /* 106 Sugar Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   156
	MW(  1827,  20,  20,  50,       Y), /* 107 Candyfloss Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   157
	MW(  1827,  20,  20,  50,       Y), /* 108 Toffee Hopper */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   158
	MW(  1827,  20,  20,  50,       Y), /* 109 Bubble Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   159
	MW(  1827,  20,  20,  50,       Y), /* 110 Cola Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   160
	MW(  1827,  20,  20,  50,       Y), /* 111 Sweet Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   161
	MW(  1827,  20,  20,  50,       Y), /* 112 Toy Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   162
	MW(  1827,  20,  20,  50,       Y), /* 113 Battery Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   163
	MW(  1827,  20,  20,  50,       Y), /* 114 Fizzy Drink Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   164
	MW(  1827,  20,  20,  50,       Y), /* 115 Plastic Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   165
	MK(  3378,  20,  12,  40, T|A|S  ), /* 116 MPS Regal Bus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   166
	MK( 16071,  20,  15,  30, T|A|S  ), /* 117 Hereford Leopard Bus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   167
	MK( 24107,  20,  15,  40, T|A|S  ), /* 118 Foster Bus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   168
	MK( 32142,  20,  15,  80, T|A|S  ), /* 119 Foster MkII Superbus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   169
	MK(  9132,  20,  15,  40,       Y), /* 120 Ploddyphut MkI Bus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   170
	MK( 18993,  20,  15,  40,       Y), /* 121 Ploddyphut MkII Bus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   171
	MK( 32873,  20,  15,  80,       Y), /* 122 Ploddyphut MkIII Bus */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   172
	MK(  5479,  20,  15,  55, T|A    ), /* 123 Balogh Coal Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   173
	MK( 20089,  20,  15,  55, T|A    ), /* 124 Uhl Coal Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   174
	MK( 33969,  20,  15,  85, T|A    ), /* 125 DW Coal Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   175
	MK(  5479,  20,  15,  55, T|A|S  ), /* 126 MPS Mail Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   176
	MK( 21550,  20,  15,  55, T|A|S  ), /* 127 Reynard Mail Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   177
	MK( 35795,  20,  15,  85, T|A|S  ), /* 128 Perry Mail Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   178
	MK(  5479,  20,  15,  55,       Y), /* 129 MightyMover Mail Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   179
	MK( 21550,  20,  15,  55,       Y), /* 130 Powernaught Mail Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   180
	MK( 35795,  20,  15,  85,       Y), /* 131 Wizzowow Mail Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   181
	MK(  5479,  20,  15,  55, T|A|S  ), /* 132 Witcombe Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   182
	MK( 19359,  20,  15,  55, T|A|S  ), /* 133 Foster Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   183
	MK( 31047,  20,  15,  85, T|A|S  ), /* 134 Perry Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   184
	MK(  5479,  20,  15,  55, T|A    ), /* 135 Talbott Livestock Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   185
	MK( 21915,  20,  15,  55, T|A    ), /* 136 Uhl Livestock Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   186
	MK( 37256,  20,  15,  85, T|A    ), /* 137 Foster Livestock Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   187
	MK(  5479,  20,  15,  55, T|A|S  ), /* 138 Balogh Goods Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   188
	MK( 19724,  20,  15,  55, T|A|S  ), /* 139 Craighead Goods Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   189
	MK( 31047,  20,  15,  85, T|A|S  ), /* 140 Goss Goods Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   190
	MK(  5479,  20,  15,  55, T|A|S  ), /* 141 Hereford Grain Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   191
	MK( 21185,  20,  15,  55, T|A|S  ), /* 142 Thomas Grain Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   192
	MK( 32873,  20,  15,  85, T|A|S  ), /* 143 Goss Grain Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   193
	MK(  5479,  20,  15,  55, T|A|S  ), /* 144 Witcombe Wood Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   194
	MK( 19724,  20,  15,  55, T|A|S  ), /* 145 Foster Wood Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   195
	MK( 35430,  20,  15,  85, T|A|S  ), /* 146 Moreland Wood Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   196
	MK(  5479,  20,  15,  55, T      ), /* 147 MPS Iron Ore Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   197
	MK( 20820,  20,  15,  55, T      ), /* 148 Uhl Iron Ore Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   198
	MK( 33238,  20,  15,  85, T      ), /* 149 Chippy Iron Ore Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   199
	MK(  5479,  20,  15,  55, T      ), /* 150 Balogh Steel Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   200
	MK( 21185,  20,  15,  55, T      ), /* 151 Uhl Steel Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   201
	MK( 31777,  20,  15,  85, T      ), /* 152 Kelling Steel Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   202
	MK(  5479,  20,  15,  55, T|A|S  ), /* 153 Balogh Armoured Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   203
	MK( 22281,  20,  15,  55, T|A|S  ), /* 154 Uhl Armoured Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   204
	MK( 33603,  20,  15,  85, T|A|S  ), /* 155 Foster Armoured Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   205
	MK(  5479,  20,  15,  55,   A|S  ), /* 156 Foster Food Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   206
	MK( 18628,  20,  15,  55,   A|S  ), /* 157 Perry Food Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   207
	MK( 30681,  20,  15,  85,   A|S  ), /* 158 Chippy Food Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   208
	MK(  5479,  20,  15,  55,   A    ), /* 159 Uhl Paper Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   209
	MK( 21185,  20,  15,  55,   A    ), /* 160 Balogh Paper Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   210
	MK( 31777,  20,  15,  85,   A    ), /* 161 MPS Paper Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   211
	MK(  5479,  20,  15,  55,     S  ), /* 162 MPS Copper Ore Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   212
	MK( 20820,  20,  15,  55,     S  ), /* 163 Uhl Copper Ore Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   213
	MK( 33238,  20,  15,  85,     S  ), /* 164 Goss Copper Ore Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   214
	MK(  5479,  20,  15,  55,     S  ), /* 165 Uhl Water Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   215
	MK( 20970,  20,  15,  55,     S  ), /* 166 Balogh Water Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   216
	MK( 33388,  20,  15,  85,     S  ), /* 167 MPS Water Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   217
	MK(  5479,  20,  15,  55,     S  ), /* 168 Balogh Fruit Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   218
	MK( 21335,  20,  15,  55,     S  ), /* 169 Uhl Fruit Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   219
	MK( 33753,  20,  15,  85,     S  ), /* 170 Kelling Fruit Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   220
	MK(  5479,  20,  15,  55,     S  ), /* 171 Balogh Rubber Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   221
	MK( 20604,  20,  15,  55,     S  ), /* 172 Uhl Rubber Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   222
	MK( 33023,  20,  15,  85,     S  ), /* 173 RMT Rubber Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   223
	MK(  5479,  20,  15,  55,       Y), /* 174 MightyMover Sugar Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   224
	MK( 19724,  20,  15,  55,       Y), /* 175 Powernaught Sugar Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   225
	MK( 33238,  20,  15,  85,       Y), /* 176 Wizzowow Sugar Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   226
	MK(  5479,  20,  15,  55,       Y), /* 177 MightyMover Cola Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   227
	MK( 20089,  20,  15,  55,       Y), /* 178 Powernaught Cola Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   228
	MK( 33603,  20,  15,  85,       Y), /* 179 Wizzowow Cola Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   229
	MK(  5479,  20,  15,  55,       Y), /* 180 MightyMover Candyfloss Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   230
	MK( 20454,  20,  15,  55,       Y), /* 181 Powernaught Candyfloss Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   231
	MK( 33969,  20,  15,  85,       Y), /* 182 Wizzowow Candyfloss Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   232
	MK(  5479,  20,  15,  55,       Y), /* 183 MightyMover Toffee Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   233
	MK( 20820,  20,  15,  55,       Y), /* 184 Powernaught Toffee Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   234
	MK( 34334,  20,  15,  85,       Y), /* 185 Wizzowow Toffee Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   235
	MK(  5479,  20,  15,  55,       Y), /* 186 MightyMover Toy Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   236
	MK( 21185,  20,  15,  55,       Y), /* 187 Powernaught Toy Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   237
	MK( 34699,  20,  15,  85,       Y), /* 188 Wizzowow Toy Van */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   238
	MK(  5479,  20,  15,  55,       Y), /* 189 MightyMover Sweet Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   239
	MK( 21550,  20,  15,  55,       Y), /* 190 Powernaught Sweet Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   240
	MK( 35064,  20,  15,  85,       Y), /* 191 Wizzowow Sweet Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   241
	MK(  5479,  20,  15,  55,       Y), /* 192 MightyMover Battery Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   242
	MK( 19874,  20,  15,  55,       Y), /* 193 Powernaught Battery Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   243
	MK( 35430,  20,  15,  85,       Y), /* 194 Wizzowow Battery Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   244
	MK(  5479,  20,  15,  55,       Y), /* 195 MightyMover Fizzy Drink Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   245
	MK( 20239,  20,  15,  55,       Y), /* 196 Powernaught Fizzy Drink Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   246
	MK( 35795,  20,  15,  85,       Y), /* 197 Wizzowow Fizzy Drink Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   247
	MK(  5479,  20,  15,  55,       Y), /* 198 MightyMover Plastic Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   248
	MK( 20604,  20,  15,  55,       Y), /* 199 Powernaught Plastic Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   249
	MK( 32873,  20,  15,  85,       Y), /* 200 Wizzowow Plastic Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   250
	MK(  5479,  20,  15,  55,       Y), /* 201 MightyMover Bubble Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   251
	MK( 20970,  20,  15,  55,       Y), /* 202 Powernaught Bubble Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   252
	MK( 33023,  20,  15,  85,       Y), /* 203 Wizzowow Bubble Truck */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   253
	MS(  2922,   5,  30,  50, T|A|S  ), /* 204 MPS Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   254
	MS( 17167,   5,  30,  90, T|A|S  ), /* 205 CS-Inc. Oil Tanker */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   255
	MS(  2192,   5,  30,  55, T|A|S  ), /* 206 MPS Passenger Ferry */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   256
	MS( 18628,   5,  30,  90, T|A|S  ), /* 207 FFP Passenger Ferry */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   257
	MS( 17257,  10,  25,  90, T|A|S  ), /* 208 Bakewell 300 Hovercraft */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   258
	MS(  9587,   5,  30,  40,       Y), /* 209 Chugger-Chug Passenger Ferry */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   259
	MS( 20544,   5,  30,  90,       Y), /* 210 Shivershake Passenger Ferry */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   260
	MS(  2557,   5,  30,  55, T|A|S  ), /* 211 Yate Cargo ship */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   261
	MS( 19724,   5,  30,  98, T|A|S  ), /* 212 Bakewell Cargo ship */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   262
	MS(  9587,   5,  30,  45,       Y), /* 213 Mightymover Cargo ship */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   263
	MS( 22371,   5,  30,  90,       Y), /* 214 Powernaut Cargo ship */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   264
	MA(  2922,  20,  20,  20, T|A|S  ), /* 215 Sampson U52 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   265
	MA(  9922,  20,  24,  20, T|A|S  ), /* 216 Coleman Count */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   266
	MA( 12659,  20,  18,  20, T|A|S  ), /* 217 FFP Dart */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   267
	MA( 17652,  20,  25,  35, T|A|S  ), /* 218 Yate Haugan */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   268
	MA(  4929,  20,  30,  30, T|A|S  ), /* 219 Bakewell Cotswald LB-3 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   269
	MA( 13695,  20,  23,  25, T|A|S  ), /* 220 Bakewell Luckett LB-8 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   270
	MA( 16341,  20,  26,  30, T|A|S  ), /* 221 Bakewell Luckett LB-9 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   271
	MA( 21395,  20,  25,  30, T|A|S  ), /* 222 Bakewell Luckett LB80 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   272
	MA( 18263,  20,  20,  30, T|A|S  ), /* 223 Bakewell Luckett LB-10 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   273
	MA( 25233,  20,  25,  30, T|A|S  ), /* 224 Bakewell Luckett LB-11 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   274
	MA( 15371,  20,  22,  25, T|A|S  ), /* 225 Yate Aerospace YAC 1-11 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   275
	MA( 15461,  20,  25,  25, T|A|S  ), /* 226 Darwin 100 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   276
	MA( 16952,  20,  22,  25, T|A|S  ), /* 227 Darwin 200 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   277
	MA( 17227,  20,  25,  30, T|A|S  ), /* 228 Darwin 300 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   278
	MA( 22371,  20,  25,  35, T|A|S  ), /* 229 Darwin 400 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   279
	MA( 22341,  20,  25,  30, T|A|S  ), /* 230 Darwin 500 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   280
	MA( 27209,  20,  25,  30, T|A|S  ), /* 231 Darwin 600 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   281
	MA( 17988,  20,  20,  30, T|A|S  ), /* 232 Guru Galaxy */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   282
	MA( 18993,  20,  24,  35, T|A|S  ), /* 233 Airtaxi A21 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   283
	MA( 22401,  20,  24,  30, T|A|S  ), /* 234 Airtaxi A31 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   284
	MA( 24472,  20,  24,  30, T|A|S  ), /* 235 Airtaxi A32 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   285
	MA( 26724,  20,  24,  30, T|A|S  ), /* 236 Airtaxi A33 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   286
	MA( 22005,  20,  25,  30, T|A|S  ), /* 237 Yate Aerospace YAe46 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   287
	MA( 24107,  20,  20,  35, T|A|S  ), /* 238 Dinger 100 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   288
	MA( 29310,  20,  25,  60, T|A|S  ), /* 239 AirTaxi A34-1000 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   289
	MA( 35520,  20,  22,  30, T|A|S  ), /* 240 Yate Z-Shuttle */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   290
	MA( 36981,  20,  22,  30, T|A|S  ), /* 241 Kelling K1 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   291
	MA( 38807,  20,  22,  50, T|A|S  ), /* 242 Kelling K6 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   292
	MA( 42094,  20,  25,  30, T|A|S  ), /* 243 Kelling K7 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   293
	MA( 44651,  20,  23,  30, T|A|S  ), /* 244 Darwin 700 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   294
	MA( 40268,  20,  25,  30, T|A|S  ), /* 245 FFP Hyperdart 2 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   295
	MA( 33693,  20,  25,  50, T|A|S  ), /* 246 Dinger 200 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   296
	MA( 32963,  20,  20,  60, T|A|S  ), /* 247 Dinger 1000 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   297
	MA(  9222,  20,  20,  35,       Y), /* 248 Ploddyphut 100 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   298
	MA( 12874,  20,  20,  35,       Y), /* 249 Ploddyphut 500 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   299
	MA( 16892,  20,  20,  35,       Y), /* 250 Flashbang X1 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   300
	MA( 21275,  20,  20,  99,       Y), /* 251 Juggerplane M1 */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   301
	MA( 23832,  20,  20,  99,       Y), /* 252 Flashbang Wizzer */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   302
	MA( 13575,  20,  20,  40, T|A|S  ), /* 253 Tricario Helicopter */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   303
	MA( 28215,  20,  20,  30, T|A|S  ), /* 254 Guru X2 Helicopter */
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   304
	MK( 13575,  20,  20,  99,       Y), /* 255  */
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   305
};
2509
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
   306
#undef Y
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
   307
#undef S
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
   308
#undef A
d293dda5c375 (svn r3035) Augment the engine table with symbolic names for rail types and climates
tron
parents: 2463
diff changeset
   309
#undef T
5211
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
   310
#undef MK
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
   311
#undef MW
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
   312
#undef MS
651c9272ad22 (svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents: 4549
diff changeset
   313
#undef MA
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   314
2960
d85a1cba9626 (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.
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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)
d85a1cba9626 (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
236a3e5b3c69 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
236a3e5b3c69 (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
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   328
 * @param l railtype
5588
1bcb6b4c01d8 (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
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   330
 */
6074
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   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 }
6119
b47985557d1e (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: 6106
diff changeset
   332
#define M RAILVEH_MULTIHEAD
b47985557d1e (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: 6106
diff changeset
   333
#define W RAILVEH_WAGON
b47985557d1e (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: 6106
diff changeset
   334
#define G RAILVEH_SINGLEHEAD
2960
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   338
6074
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   339
#define R RAILTYPE_RAIL
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   340
#define C RAILTYPE_ELECTRIC
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   341
#define O RAILTYPE_MONO
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   342
#define L RAILTYPE_MAGLEV
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   343
2463
de2605ed3758 (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] = {
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   345
	//   image_index  max_speed (kph)      running_cost_base
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   346
	//   |  flags     |        power (hp)  |  running_cost_class & engclass
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   347
	//   |  |    base_cost     |    weight |  |   capacity
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   348
	//   |  |    |    |        |    |      |  |   |  cargo_type
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   349
	//   |  |    |    |        |    |      |  |   |  |
6119
b47985557d1e (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: 6106
diff changeset
   350
	RVI( 2, G,   7,  64,     300,  47,    50, S,  0, 0              ,  1, R), //   0
b47985557d1e (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: 6106
diff changeset
   351
	RVI(19, G,   8,  80,     600,  65,    65, D,  0, 0              ,  4, R), //   1
b47985557d1e (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: 6106
diff changeset
   352
	RVI( 2, G,  10,  72,     400,  85,    90, S,  0, 0              ,  7, R), //   2
b47985557d1e (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: 6106
diff changeset
   353
	RVI( 0, G,  15,  96,     900, 130,   130, S,  0, 0              , 19, R), //   3
b47985557d1e (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: 6106
diff changeset
   354
	RVI( 1, G,  19, 112,    1000, 140,   145, S,  0, 0              , 20, R), //   4
b47985557d1e (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: 6106
diff changeset
   355
	RVI(12, G,  16, 120,    1400,  95,   125, D,  0, 0              , 30, R), //   5
b47985557d1e (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: 6106
diff changeset
   356
	RVI(14, G,  20, 152,    2000, 120,   135, D,  0, 0              , 31, R), //   6
b47985557d1e (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: 6106
diff changeset
   357
	RVI( 3, G,  14,  88,    1100, 145,   130, S,  0, 0              , 19, R), //   7
b47985557d1e (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: 6106
diff changeset
   358
	RVI( 0, G,  13, 112,    1000, 131,   120, S,  0, 0              , 20, R), //   8
b47985557d1e (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: 6106
diff changeset
   359
	RVI( 1, G,  19, 128,    1200, 162,   140, S,  0, 0              , 21, R), //   9
b47985557d1e (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: 6106
diff changeset
   360
	RVI( 0, G,  22, 144,    1600, 170,   130, S,  0, 0              , 22, R), //  10
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   361
	RVI( 8, M,  11, 112,   600/2,32/2,  85/2, D, 38, CT_PASSENGERS  , 10, R), //  11
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   362
	RVI(10, M,  14, 120,   700/2,38/2,  70/2, D, 40, CT_PASSENGERS  , 11, R), //  12
6119
b47985557d1e (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: 6106
diff changeset
   363
	RVI( 4, G,  15, 128,    1250,  72,    95, D,  0, 0              , 30, R), //  13
b47985557d1e (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: 6106
diff changeset
   364
	RVI( 5, G,  17, 144,    1750, 101,   120, D,  0, 0              , 31, R), //  14
b47985557d1e (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: 6106
diff changeset
   365
	RVI( 4, G,  18, 160,    2580, 112,   140, D,  0, 0              , 32, R), //  15
b47985557d1e (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: 6106
diff changeset
   366
	RVI(14, G,  23,  96,    4000, 150,   135, D,  0, 0              , 33, R), //  16
b47985557d1e (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: 6106
diff changeset
   367
	RVI(12, G,  16, 112,    2400, 120,   105, D,  0, 0              , 34, R), //  17
b47985557d1e (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: 6106
diff changeset
   368
	RVI(13, G,  30, 112,    6600, 207,   155, D,  0, 0              , 35, R), //  18
b47985557d1e (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: 6106
diff changeset
   369
	RVI(15, G,  18, 104,    1500, 110,   105, D,  0, 0              , 29, R), //  19
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   370
	RVI(16, M,  35, 160,  3500/2,95/2, 205/2, D,  0, 0              , 45, R), //  20
6119
b47985557d1e (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: 6106
diff changeset
   371
	RVI(18, G,  21, 104,    2200, 120,   145, D,  0, 0              , 32, R), //  21
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   372
	RVI( 6, M,  20, 200,  4500/2,70/2, 190/2, D,  4, CT_MAIL        , 50, R), //  22
6119
b47985557d1e (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: 6106
diff changeset
   373
	RVI(20, G,  26, 160,    3600,  84,   180, E,  0, 0              , 40, C), //  23
b47985557d1e (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: 6106
diff changeset
   374
	RVI(20, G,  30, 176,    5000,  82,   205, E,  0, 0              , 41, C), //  24
6074
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   375
	RVI(21, M,  40, 240,  7000/2,90/2, 240/2, E,  0, 0              , 51, C), //  25
e70d63ef4d62 (svn r8385) -Fix
tron
parents: 6021
diff changeset
   376
	RVI(23, M,  43, 264,  8000/2,95/2, 250/2, E,  0, 0              , 52, C), //  26
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   377
	RVI(33, W, 247,   0,       0,  25,     0, 0, 40, CT_PASSENGERS  ,  0, R), //  27
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   378
	RVI(35, W, 228,   0,       0,  21,     0, 0, 30, CT_MAIL        ,  0, R), //  28
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   379
	RVI(34, W, 176,   0,       0,  18,     0, 0, 30, CT_COAL        ,  0, R), //  29
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   380
	RVI(36, W, 200,   0,       0,  24,     0, 0, 30, CT_OIL         ,  0, R), //  30
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   381
	RVI(37, W, 192,   0,       0,  20,     0, 0, 25, CT_LIVESTOCK   ,  0, R), //  31
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   382
	RVI(38, W, 190,   0,       0,  21,     0, 0, 25, CT_GOODS       ,  0, R), //  32
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   383
	RVI(39, W, 182,   0,       0,  19,     0, 0, 30, CT_GRAIN       ,  0, R), //  33
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   384
	RVI(40, W, 181,   0,       0,  16,     0, 0, 30, CT_WOOD        ,  0, R), //  34
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   385
	RVI(41, W, 179,   0,       0,  19,     0, 0, 30, CT_IRON_ORE    ,  0, R), //  35
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   386
	RVI(42, W, 196,   0,       0,  18,     0, 0, 20, CT_STEEL       ,  0, R), //  36
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   387
	RVI(43, W, 255,   0,       0,  30,     0, 0, 20, CT_VALUABLES   ,  0, R), //  37
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   388
	RVI(44, W, 191,   0,       0,  22,     0, 0, 25, CT_FOOD        ,  0, R), //  38
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   389
	RVI(45, W, 196,   0,       0,  18,     0, 0, 20, CT_PAPER       ,  0, R), //  39
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   390
	RVI(46, W, 179,   0,       0,  19,     0, 0, 30, CT_COPPER_ORE  ,  0, R), //  40
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   391
	RVI(47, W, 199,   0,       0,  25,     0, 0, 25, CT_WATER       ,  0, R), //  41
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   392
	RVI(48, W, 182,   0,       0,  18,     0, 0, 25, CT_FRUIT       ,  0, R), //  42
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   393
	RVI(49, W, 185,   0,       0,  19,     0, 0, 21, CT_RUBBER      ,  0, R), //  43
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   394
	RVI(50, W, 176,   0,       0,  19,     0, 0, 30, CT_SUGAR       ,  0, R), //  44
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   395
	RVI(51, W, 178,   0,       0,  20,     0, 0, 30, CT_COTTON_CANDY,  0, R), //  45
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   396
	RVI(52, W, 192,   0,       0,  20,     0, 0, 30, CT_TOFFEE      ,  0, R), //  46
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   397
	RVI(53, W, 190,   0,       0,  21,     0, 0, 20, CT_BUBBLES     ,  0, R), //  47
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   398
	RVI(54, W, 182,   0,       0,  24,     0, 0, 25, CT_COLA        ,  0, R), //  48
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   399
	RVI(55, W, 181,   0,       0,  21,     0, 0, 25, CT_CANDY       ,  0, R), //  49
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   400
	RVI(56, W, 183,   0,       0,  21,     0, 0, 20, CT_TOYS        ,  0, R), //  50
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   401
	RVI(57, W, 196,   0,       0,  18,     0, 0, 22, CT_BATTERIES   ,  0, R), //  51
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   402
	RVI(58, W, 193,   0,       0,  18,     0, 0, 25, CT_FIZZY_DRINKS,  0, R), //  52
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   403
	RVI(59, W, 191,   0,       0,  18,     0, 0, 30, CT_PLASTIC     ,  0, R), //  53
6119
b47985557d1e (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: 6106
diff changeset
   404
	RVI(25, G,  52, 304,    9000,  95,   230, E,  0, 0              , 60, O), //  54
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   405
	RVI(26, M,  60, 336, 10000/2,85/2, 240/2, E, 25, CT_PASSENGERS  , 62, O), //  55
6119
b47985557d1e (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: 6106
diff changeset
   406
	RVI(26, G,  53, 320,    5000,  95,   230, E,  0, 0              , 63, O), //  56
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   407
	RVI(60, W, 247,   0,       0,  25,     0, 0, 45, CT_PASSENGERS  ,  0, O), //  57
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   408
	RVI(62, W, 228,   0,       0,  21,     0, 0, 35, CT_MAIL        ,  0, O), //  58
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   409
	RVI(61, W, 176,   0,       0,  18,     0, 0, 35, CT_COAL        ,  0, O), //  59
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   410
	RVI(63, W, 200,   0,       0,  24,     0, 0, 35, CT_OIL         ,  0, O), //  60
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   411
	RVI(64, W, 192,   0,       0,  20,     0, 0, 30, CT_LIVESTOCK   ,  0, O), //  61
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   412
	RVI(65, W, 190,   0,       0,  21,     0, 0, 30, CT_GOODS       ,  0, O), //  62
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   413
	RVI(66, W, 182,   0,       0,  19,     0, 0, 35, CT_GRAIN       ,  0, O), //  63
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   414
	RVI(67, W, 181,   0,       0,  16,     0, 0, 35, CT_WOOD        ,  0, O), //  64
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   415
	RVI(68, W, 179,   0,       0,  19,     0, 0, 35, CT_IRON_ORE    ,  0, O), //  65
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   416
	RVI(69, W, 196,   0,       0,  18,     0, 0, 25, CT_STEEL       ,  0, O), //  66
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   417
	RVI(70, W, 255,   0,       0,  30,     0, 0, 25, CT_VALUABLES   ,  0, O), //  67
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   418
	RVI(71, W, 191,   0,       0,  22,     0, 0, 30, CT_FOOD        ,  0, O), //  68
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   419
	RVI(72, W, 196,   0,       0,  18,     0, 0, 25, CT_PAPER       ,  0, O), //  69
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   420
	RVI(73, W, 179,   0,       0,  19,     0, 0, 35, CT_COPPER_ORE  ,  0, O), //  70
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   421
	RVI(47, W, 199,   0,       0,  25,     0, 0, 30, CT_WATER       ,  0, O), //  71
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   422
	RVI(48, W, 182,   0,       0,  18,     0, 0, 30, CT_FRUIT       ,  0, O), //  72
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   423
	RVI(49, W, 185,   0,       0,  19,     0, 0, 26, CT_RUBBER      ,  0, O), //  73
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   424
	RVI(50, W, 176,   0,       0,  19,     0, 0, 35, CT_SUGAR       ,  0, O), //  74
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   425
	RVI(51, W, 178,   0,       0,  20,     0, 0, 35, CT_COTTON_CANDY,  0, O), //  75
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   426
	RVI(52, W, 192,   0,       0,  20,     0, 0, 35, CT_TOFFEE      ,  0, O), //  76
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   427
	RVI(53, W, 190,   0,       0,  21,     0, 0, 25, CT_BUBBLES     ,  0, O), //  77
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   428
	RVI(54, W, 182,   0,       0,  24,     0, 0, 30, CT_COLA        ,  0, O), //  78
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   429
	RVI(55, W, 181,   0,       0,  21,     0, 0, 30, CT_CANDY       ,  0, O), //  79
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   430
	RVI(56, W, 183,   0,       0,  21,     0, 0, 25, CT_TOYS        ,  0, O), //  80
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   431
	RVI(57, W, 196,   0,       0,  18,     0, 0, 27, CT_BATTERIES   ,  0, O), //  81
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   432
	RVI(58, W, 193,   0,       0,  18,     0, 0, 30, CT_FIZZY_DRINKS,  0, O), //  82
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   433
	RVI(59, W, 191,   0,       0,  18,     0, 0, 35, CT_PLASTIC     ,  0, O), //  83
6119
b47985557d1e (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: 6106
diff changeset
   434
	RVI(28, G,  70, 400,   10000, 105,   250, E,  0, 0              , 70, L), //  84
b47985557d1e (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: 6106
diff changeset
   435
	RVI(29, G,  74, 448,   12000, 120,   253, E,  0, 0              , 71, L), //  85
b47985557d1e (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: 6106
diff changeset
   436
	RVI(30, G,  82, 480,   15000, 130,   254, E,  0, 0              , 72, L), //  86
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   437
	RVI(31, M,  95, 640, 20000/2,150/2,255/2, E,  0, 0              , 73, L), //  87
6119
b47985557d1e (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: 6106
diff changeset
   438
	RVI(28, G,  70, 480,   10000, 120,   250, E,  0, 0              , 74, L), //  88
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   439
	RVI(60, W, 247,   0,       0,  25,     0, 0, 47, CT_PASSENGERS  ,  0, L), //  89
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   440
	RVI(62, W, 228,   0,       0,  21,     0, 0, 37, CT_MAIL        ,  0, L), //  90
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   441
	RVI(61, W, 176,   0,       0,  18,     0, 0, 37, CT_COAL        ,  0, L), //  91
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   442
	RVI(63, W, 200,   0,       0,  24,     0, 0, 37, CT_OIL         ,  0, L), //  92
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   443
	RVI(64, W, 192,   0,       0,  20,     0, 0, 32, CT_LIVESTOCK   ,  0, L), //  93
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   444
	RVI(65, W, 190,   0,       0,  21,     0, 0, 32, CT_GOODS       ,  0, L), //  94
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   445
	RVI(66, W, 182,   0,       0,  19,     0, 0, 37, CT_GRAIN       ,  0, L), //  95
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   446
	RVI(67, W, 181,   0,       0,  16,     0, 0, 37, CT_WOOD        ,  0, L), //  96
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   447
	RVI(68, W, 179,   0,       0,  19,     0, 0, 37, CT_IRON_ORE    ,  0, L), //  97
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   448
	RVI(69, W, 196,   0,       0,  18,     0, 0, 27, CT_STEEL       ,  0, L), //  98
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   449
	RVI(70, W, 255,   0,       0,  30,     0, 0, 27, CT_VALUABLES   ,  0, L), //  99
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   450
	RVI(71, W, 191,   0,       0,  22,     0, 0, 32, CT_FOOD        ,  0, L), // 100
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   451
	RVI(72, W, 196,   0,       0,  18,     0, 0, 27, CT_PAPER       ,  0, L), // 101
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   452
	RVI(73, W, 179,   0,       0,  19,     0, 0, 37, CT_COPPER_ORE  ,  0, L), // 102
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   453
	RVI(47, W, 199,   0,       0,  25,     0, 0, 32, CT_WATER       ,  0, L), // 103
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   454
	RVI(48, W, 182,   0,       0,  18,     0, 0, 32, CT_FRUIT       ,  0, L), // 104
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   455
	RVI(49, W, 185,   0,       0,  19,     0, 0, 28, CT_RUBBER      ,  0, L), // 105
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   456
	RVI(50, W, 176,   0,       0,  19,     0, 0, 37, CT_SUGAR       ,  0, L), // 106
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   457
	RVI(51, W, 178,   0,       0,  20,     0, 0, 37, CT_COTTON_CANDY,  0, L), // 107
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   458
	RVI(52, W, 192,   0,       0,  20,     0, 0, 37, CT_TOFFEE      ,  0, L), // 108
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   459
	RVI(53, W, 190,   0,       0,  21,     0, 0, 27, CT_BUBBLES     ,  0, L), // 109
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   460
	RVI(54, W, 182,   0,       0,  24,     0, 0, 32, CT_COLA        ,  0, L), // 110
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   461
	RVI(55, W, 181,   0,       0,  21,     0, 0, 32, CT_CANDY       ,  0, L), // 111
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   462
	RVI(56, W, 183,   0,       0,  21,     0, 0, 27, CT_TOYS        ,  0, L), // 112
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   463
	RVI(57, W, 196,   0,       0,  18,     0, 0, 29, CT_BATTERIES   ,  0, L), // 113
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   464
	RVI(58, W, 193,   0,       0,  18,     0, 0, 32, CT_FIZZY_DRINKS,  0, L), // 114
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   465
	RVI(59, W, 191,   0,       0,  18,     0, 0, 37, CT_PLASTIC     ,  0, L), // 115
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   466
};
6014
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   467
#undef L
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   468
#undef O
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   469
#undef C
f3f333d167c4 (svn r8314) -Fix
tron
parents: 5838
diff changeset
   470
#undef R
2961
862fcd67b2dc (svn r3523) Undefine helper macros after using them
peter1138
parents: 2960
diff changeset
   471
#undef E
862fcd67b2dc (svn r3523) Undefine helper macros after using them
peter1138
parents: 2960
diff changeset
   472
#undef D
862fcd67b2dc (svn r3523) Undefine helper macros after using them
peter1138
parents: 2960
diff changeset
   473
#undef S
6119
b47985557d1e (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: 6106
diff changeset
   474
#undef G
2521
4450cdf804f6 (svn r3050) Augment the rail vehicle table with symbolic names for dual-head engines and wagons
tron
parents: 2509
diff changeset
   475
#undef W
4450cdf804f6 (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
d85a1cba9626 (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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   478
2960
d85a1cba9626 (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.
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   489
 */
5838
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5726
diff changeset
   490
#define SVI(a, b, c, d, e, f, g, h) { a, b, c, d, e, f, {g}, h }
2463
de2605ed3758 (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
d85a1cba9626 (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
d85a1cba9626 (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          |
d85a1cba9626 (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                |
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   495
	//   |    |    |    |              |    |  |                  |
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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
85a6d56129dd (svn r562) newgrf: Merge most of the road vehicle info to a single
celestar
parents: 114
diff changeset
   507
};
2960
d85a1cba9626 (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
85a6d56129dd (svn r562) newgrf: Merge most of the road vehicle info to a single
celestar
parents: 114
diff changeset
   509
2960
d85a1cba9626 (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.
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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)
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   521
 */
6519
367d6f96e23f (svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents: 6119
diff changeset
   522
#define AVI(a, b, c, d, e, f, g, h, i) { a, b, c, d, {e}, f, (g * 129) / 10, h, i }
6106
0c9b10a8fedf (svn r8429) -Codechange: Add a name for AircraftVehicleInfo subtype helicopter and remove some magic numbers related to the subtype.
Darkvater
parents: 6074
diff changeset
   523
#define H AIR_HELI
4023
b65af90447d2 (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
b65af90447d2 (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
de2605ed3758 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   531
	//    |   |    |  |       |                           |   |    |    |
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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
1a4425a0a953 (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
862fcd67b2dc (svn r3523) Undefine helper macros after using them
peter1138
parents: 2960
diff changeset
   574
#undef J
862fcd67b2dc (svn r3523) Undefine helper macros after using them
peter1138
parents: 2960
diff changeset
   575
#undef P
862fcd67b2dc (svn r3523) Undefine helper macros after using them
peter1138
parents: 2960
diff changeset
   576
#undef H
2960
d85a1cba9626 (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
85a6d56129dd (svn r562) newgrf: Merge most of the road vehicle info to a single
celestar
parents: 114
diff changeset
   578
2960
d85a1cba9626 (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.
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   588
 */
5838
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5726
diff changeset
   589
#define RVI(a, b, c, d, e, f, g) { a, b, c, {d}, e, f, g }
2463
de2605ed3758 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (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
d85a1cba9626 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future.
peter1138
parents: 2840
diff changeset
   594
	//    |    |    |       |                                   |   |  |
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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 */
d85a1cba9626 (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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   683
};
2960
d85a1cba9626 (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
1a4425a0a953 (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
1a4425a0a953 (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 */