(svn r565) -newgrf: fixed double work of RoadVehicleInfo[]; added AircraftVehicleInfo[] as well. table/engines.h is now the same as in the _map branch.

2 files changed, 423 insertions, 350 deletions

diff --git a/engine.h b/engine.h
index de5f72227..928e5fcd7 100644
--- a/engine.h
+++ b/engine.h
@@ -14,7 +14,7 @@ typedef struct RailVehicleInfo {
 	byte cargo_type;
 } RailVehicleInfo;
 
-typedef struct RoadVehicleInfo {
+typedef struct ShipVehicleInfo {
 	byte image_index;
 	byte base_cost;
 	uint16 max_speed;
@@ -22,19 +22,30 @@ typedef struct RoadVehicleInfo {
 	uint16 capacity;
 	byte running_cost;
 	byte sfx;
-} RoadVehicleInfo;
+	byte refittable;
+} ShipVehicleInfo;
 
-typedef struct ShipVehicleInfo {
+typedef struct AircraftVehicleInfo {
 	byte image_index;
 	byte base_cost;
-	uint16 max_speed;
-	byte cargo_type;
-	uint16 capacity;
 	byte running_cost;
+	byte subtype;
 	byte sfx;
-	byte refittable;
-} ShipVehicleInfo;
+	byte acceleration;
+	byte max_speed;
+	byte mail_capacity;
+	uint16 passanger_capacity;
+} AircraftVehicleInfo;
 
+typedef struct RoadVehicleInfo {
+	byte image_index;
+	byte base_cost;
+	byte running_cost;
+	byte sfx;
+	byte max_speed;
+	byte capacity;
+	byte cargo_type;
+} RoadVehicleInfo;
 
 typedef struct EngineInfo {
 	uint16 base_intro;
@@ -133,21 +144,27 @@ enum {
 	NUM_ROAD_ENGINES = 88,
 	NUM_SHIP_ENGINES = 11,
 	NUM_AIRCRAFT_ENGINES = 41,
-	TOTAL_NUM_ENGINES = NUM_NORMAL_RAIL_ENGINES+NUM_MONORAIL_ENGINES+NUM_MAGLEV_ENGINES+NUM_ROAD_ENGINES+NUM_SHIP_ENGINES+NUM_AIRCRAFT_ENGINES,
+	TOTAL_NUM_ENGINES = NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES + NUM_AIRCRAFT_ENGINES,
 	AIRCRAFT_ENGINES_INDEX = NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES,
 	SHIP_ENGINES_INDEX = NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES,
 	ROAD_ENGINES_INDEX = NUM_TRAIN_ENGINES,
 };
 VARDEF Engine _engines[TOTAL_NUM_ENGINES];
+#define DEREF_ENGINE(i) (&_engines[i])
 VARDEF StringID _engine_name_strings[TOTAL_NUM_ENGINES];
 
+/* Access Vehicle Data */
+//#include "table/engines.h"
 extern EngineInfo _engine_info[TOTAL_NUM_ENGINES];
-extern RailVehicleInfo _rail_vehicle_info[];
-#define road_vehicle_info(e) (&_road_vehicle_info[e - ROAD_ENGINES_INDEX])
-extern RoadVehicleInfo _road_vehicle_info[];
-/* TODO: Change this to return a pointer instead, for the sake of consistency.
- * --pasky */
+extern RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
+extern ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES];
+extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
+extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
+/* TODO: Change this to return a pointer type instead, for the sake of consistency.
+ * --pasky. XXX - really needed? Why?. Best to remove the pointer type as well cause
+ * _map uses it that way...less conflicts - Darkvater */
+#define rail_vehinfo(e) _rail_vehicle_info[e]
 #define ship_vehicle_info(e) _ship_vehicle_info[e - SHIP_ENGINES_INDEX]
-extern ShipVehicleInfo _ship_vehicle_info[];
-
+#define aircraft_vehinfo(e) _aircraft_vehicle_info[e - AIRCRAFT_ENGINES_INDEX]
+#define road_vehicle_info(e) (&_road_vehicle_info[e - ROAD_ENGINES_INDEX])
 #endif
diff --git a/table/engines.h b/table/engines.h
index 07f7cc88b..c314954df 100644
--- a/table/engines.h
+++ b/table/engines.h
@@ -1,107 +1,112 @@
+#ifndef ENGINES_H
+#define ENGINES_H
+
+#include "../sound.h"
+
 #define MK(a,b,c,d,e,f) {a,b,c,d,((e)<<4)|(f)}
 #define MW(a,b,c,d,e,f) {a,b|0x80,c,d,((e)<<4)|(f)}
 
 EngineInfo _engine_info[TOTAL_NUM_ENGINES] = {
-	MK(  1827,  20,  15,  30,   0,   1), /* 0 */
-	MK( 12784,  20,  22,  30,   0,   6), /* 1 */
-	MK(  9497,  20,  20,  50,   0,   8), /* 2 */
-	MK( 11688,  20,  20,  30,   0,   8), /* 3 */
-	MK( 16802,  20,  20,  30,   0,   8), /* 4 */
-	MK( 18993,  20,  20,  30,   0,   8), /* 5 */
-	MK( 20820,  20,  20,  30,   0,   8), /* 6 */
-	MK(  8766,  20,  20,  30,   0,   6), /* 7 */
-	MK(  5114,  20,  21,  30,   0,   1), /* 8 */
-	MK(  5479,  20,  20,  30,   0,   1), /* 9 */
-	MK( 12419,  20,  23,  25,   0,   1), /* 10 */
-	MK( 13149,  20,  12,  30,   0,   1), /* 11 */
-	MK( 23376,  20,  15,  35,   0,   1), /* 12 */
-	MK( 14976,  20,  18,  28,   0,   1), /* 13 */
-	MK( 14245,  20,  20,  30,   0,   1), /* 14 */
-	MK( 15341,  20,  22,  33,   0,   1), /* 15 */
-	MK( 14976,  20,  20,  25,   0,   6), /* 16 */
-	MK( 16437,  20,  20,  30,   0,   6), /* 17 */
-	MK( 18993,  20,  22,  30,   0,   6), /* 18 */
-	MK( 13880,  20,  22,  30,   0,   6), /* 19 */
-	MK( 20454,  20,  22,  30,   0,   6), /* 20 */
-	MK( 16071,  20,  22,  30,   0,   6), /* 21 */
-	MK( 20820,  20,  20,  25,   0,   1), /* 22 */
-	MK( 16437,  20,  23,  30,   0,   1), /* 23 */
-	MK( 19359,  20,  23,  80,   0,   1), /* 24 */
-	MK( 23376,  20,  25,  30,   0,   1), /* 25 */
-	MK( 26298,  20,  25,  50,   0,   1), /* 26 */
-	MW(  1827,  20,  20,  50,   0,  15), /* 27 */
-	MW(  1827,  20,  20,  50,   0,  15), /* 28 */
-	MW(  1827,  20,  20,  50,   0,   3), /* 29 */
-	MW(  1827,  20,  20,  50,   0,   7), /* 30 */
-	MW(  1827,  20,  20,  50,   0,   3), /* 31 */
-	MW(  1827,  20,  20,  50,   0,   7), /* 32 */
-	MW(  1827,  20,  20,  50,   0,   7), /* 33 */
-	MW(  1827,  20,  20,  50,   0,   7), /* 34 */
-	MW(  1827,  20,  20,  50,   0,   1), /* 35 */
-	MW(  1827,  20,  20,  50,   0,   1), /* 36 */
-	MW(  1827,  20,  20,  50,   0,   7), /* 37 */
-	MW(  1827,  20,  20,  50,   0,   6), /* 38 */
-	MW(  1827,  20,  20,  50,   0,   2), /* 39 */
-	MW(  1827,  20,  20,  50,   0,   4), /* 40 */
-	MW(  1827,  20,  20,  50,   0,   4), /* 41 */
-	MW(  1827,  20,  20,  50,   0,   4), /* 42 */
-	MW(  1827,  20,  20,  50,   0,   4), /* 43 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 44 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 45 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 46 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 47 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 48 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 49 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 50 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 51 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 52 */
-	MW(  1827,  20,  20,  50,   0,   8), /* 53 */
-	MK( 28490,  20,  20,  50,   1,   7), /* 54 */
-	MK( 31047,  20,  20,  50,   1,   7), /* 55 */
-	MK( 28855,  20,  20,  50,   1,   8), /* 56 */
-	MW(  1827,  20,  20,  50,   1,  15), /* 57 */
-	MW(  1827,  20,  20,  50,   1,  15), /* 58 */
-	MW(  1827,  20,  20,  50,   1,   3), /* 59 */
-	MW(  1827,  20,  20,  50,   1,   7), /* 60 */
-	MW(  1827,  20,  20,  50,   1,   3), /* 61 */
-	MW(  1827,  20,  20,  50,   1,   7), /* 62 */
-	MW(  1827,  20,  20,  50,   1,   7), /* 63 */
-	MW(  1827,  20,  20,  50,   1,   7), /* 64 */
-	MW(  1827,  20,  20,  50,   1,   1), /* 65 */
-	MW(  1827,  20,  20,  50,   1,   1), /* 66 */
-	MW(  1827,  20,  20,  50,   1,   7), /* 67 */
-	MW(  1827,  20,  20,  50,   1,   6), /* 68 */
-	MW(  1827,  20,  20,  50,   1,   2), /* 69 */
-	MW(  1827,  20,  20,  50,   1,   4), /* 70 */
-	MW(  1827,  20,  20,  50,   1,   4), /* 71 */
-	MW(  1827,  20,  20,  50,   1,   4), /* 72 */
-	MW(  1827,  20,  20,  50,   1,   4), /* 73 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 74 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 75 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 76 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 77 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 78 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 79 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 80 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 81 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 82 */
-	MW(  1827,  20,  20,  50,   1,   8), /* 83 */
-	MK( 36525,  20,  20,  50,   2,   7), /* 84 */
-	MK( 39447,  20,  20,  50,   2,   7), /* 85 */
-	MK( 42004,  20,  20,  50,   2,   7), /* 86 */
-	MK( 42735,  20,  20,  50,   2,   7), /* 87 */
-	MK( 36891,  20,  20,  60,   2,   8), /* 88 */
-	MW(  1827,  20,  20,  50,   2,  15), /* 89 */
-	MW(  1827,  20,  20,  50,   2,  15), /* 90 */
-	MW(  1827,  20,  20,  50,   2,   3), /* 91 */
-	MW(  1827,  20,  20,  50,   2,   7), /* 92 */
-	MW(  1827,  20,  20,  50,   2,   3), /* 93 */
-	MW(  1827,  20,  20,  50,   2,   7), /* 94 */
-	MW(  1827,  20,  20,  50,   2,   7), /* 95 */
-	MW(  1827,  20,  20,  50,   2,   7), /* 96 */
-	MW(  1827,  20,  20,  50,   2,   1), /* 97 */
-	MW(  1827,  20,  20,  50,   2,   1), /* 98 */
-	MW(  1827,  20,  20,  50,   2,   7), /* 99 */
+	MK(  1827,  20,  15,  30,   0,   1), /*   0 */
+	MK( 12784,  20,  22,  30,   0,   6), /*   1 */
+	MK(  9497,  20,  20,  50,   0,   8), /*   2 */
+	MK( 11688,  20,  20,  30,   0,   8), /*   3 */
+	MK( 16802,  20,  20,  30,   0,   8), /*   4 */
+	MK( 18993,  20,  20,  30,   0,   8), /*   5 */
+	MK( 20820,  20,  20,  30,   0,   8), /*   6 */
+	MK(  8766,  20,  20,  30,   0,   6), /*   7 */
+	MK(  5114,  20,  21,  30,   0,   1), /*   8 */
+	MK(  5479,  20,  20,  30,   0,   1), /*   9 */
+	MK( 12419,  20,  23,  25,   0,   1), /*  10 */
+	MK( 13149,  20,  12,  30,   0,   1), /*  11 */
+	MK( 23376,  20,  15,  35,   0,   1), /*  12 */
+	MK( 14976,  20,  18,  28,   0,   1), /*  13 */
+	MK( 14245,  20,  20,  30,   0,   1), /*  14 */
+	MK( 15341,  20,  22,  33,   0,   1), /*  15 */
+	MK( 14976,  20,  20,  25,   0,   6), /*  16 */
+	MK( 16437,  20,  20,  30,   0,   6), /*  17 */
+	MK( 18993,  20,  22,  30,   0,   6), /*  18 */
+	MK( 13880,  20,  22,  30,   0,   6), /*  19 */
+	MK( 20454,  20,  22,  30,   0,   6), /*  20 */
+	MK( 16071,  20,  22,  30,   0,   6), /*  21 */
+	MK( 20820,  20,  20,  25,   0,   1), /*  22 */
+	MK( 16437,  20,  23,  30,   0,   1), /*  23 */
+	MK( 19359,  20,  23,  80,   0,   1), /*  24 */
+	MK( 23376,  20,  25,  30,   0,   1), /*  25 */
+	MK( 26298,  20,  25,  50,   0,   1), /*  26 */
+	MW(  1827,  20,  20,  50,   0,  15), /*  27 */
+	MW(  1827,  20,  20,  50,   0,  15), /*  28 */
+	MW(  1827,  20,  20,  50,   0,   3), /*  29 */
+	MW(  1827,  20,  20,  50,   0,   7), /*  30 */
+	MW(  1827,  20,  20,  50,   0,   3), /*  31 */
+	MW(  1827,  20,  20,  50,   0,   7), /*  32 */
+	MW(  1827,  20,  20,  50,   0,   7), /*  33 */
+	MW(  1827,  20,  20,  50,   0,   7), /*  34 */
+	MW(  1827,  20,  20,  50,   0,   1), /*  35 */
+	MW(  1827,  20,  20,  50,   0,   1), /*  36 */
+	MW(  1827,  20,  20,  50,   0,   7), /*  37 */
+	MW(  1827,  20,  20,  50,   0,   6), /*  38 */
+	MW(  1827,  20,  20,  50,   0,   2), /*  39 */
+	MW(  1827,  20,  20,  50,   0,   4), /*  40 */
+	MW(  1827,  20,  20,  50,   0,   4), /*  41 */
+	MW(  1827,  20,  20,  50,   0,   4), /*  42 */
+	MW(  1827,  20,  20,  50,   0,   4), /*  43 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  44 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  45 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  46 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  47 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  48 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  49 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  50 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  51 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  52 */
+	MW(  1827,  20,  20,  50,   0,   8), /*  53 */
+	MK( 28490,  20,  20,  50,   1,   7), /*  54 */
+	MK( 31047,  20,  20,  50,   1,   7), /*  55 */
+	MK( 28855,  20,  20,  50,   1,   8), /*  56 */
+	MW(  1827,  20,  20,  50,   1,  15), /*  57 */
+	MW(  1827,  20,  20,  50,   1,  15), /*  58 */
+	MW(  1827,  20,  20,  50,   1,   3), /*  59 */
+	MW(  1827,  20,  20,  50,   1,   7), /*  60 */
+	MW(  1827,  20,  20,  50,   1,   3), /*  61 */
+	MW(  1827,  20,  20,  50,   1,   7), /*  62 */
+	MW(  1827,  20,  20,  50,   1,   7), /*  63 */
+	MW(  1827,  20,  20,  50,   1,   7), /*  64 */
+	MW(  1827,  20,  20,  50,   1,   1), /*  65 */
+	MW(  1827,  20,  20,  50,   1,   1), /*  66 */
+	MW(  1827,  20,  20,  50,   1,   7), /*  67 */
+	MW(  1827,  20,  20,  50,   1,   6), /*  68 */
+	MW(  1827,  20,  20,  50,   1,   2), /*  69 */
+	MW(  1827,  20,  20,  50,   1,   4), /*  70 */
+	MW(  1827,  20,  20,  50,   1,   4), /*  71 */
+	MW(  1827,  20,  20,  50,   1,   4), /*  72 */
+	MW(  1827,  20,  20,  50,   1,   4), /*  73 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  74 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  75 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  76 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  77 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  78 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  79 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  80 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  81 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  82 */
+	MW(  1827,  20,  20,  50,   1,   8), /*  83 */
+	MK( 36525,  20,  20,  50,   2,   7), /*  84 */
+	MK( 39447,  20,  20,  50,   2,   7), /*  85 */
+	MK( 42004,  20,  20,  50,   2,   7), /*  86 */
+	MK( 42735,  20,  20,  50,   2,   7), /*  87 */
+	MK( 36891,  20,  20,  60,   2,   8), /*  88 */
+	MW(  1827,  20,  20,  50,   2,  15), /*  89 */
+	MW(  1827,  20,  20,  50,   2,  15), /*  90 */
+	MW(  1827,  20,  20,  50,   2,   3), /*  91 */
+	MW(  1827,  20,  20,  50,   2,   7), /*  92 */
+	MW(  1827,  20,  20,  50,   2,   3), /*  93 */
+	MW(  1827,  20,  20,  50,   2,   7), /*  94 */
+	MW(  1827,  20,  20,  50,   2,   7), /*  95 */
+	MW(  1827,  20,  20,  50,   2,   7), /*  96 */
+	MW(  1827,  20,  20,  50,   2,   1), /*  97 */
+	MW(  1827,  20,  20,  50,   2,   1), /*  98 */
+	MW(  1827,  20,  20,  50,   2,   7), /*  99 */
 	MW(  1827,  20,  20,  50,   2,   6), /* 100 */
 	MW(  1827,  20,  20,  50,   2,   2), /* 101 */
 	MW(  1827,  20,  20,  50,   2,   4), /* 102 */
@@ -260,243 +265,294 @@ EngineInfo _engine_info[TOTAL_NUM_ENGINES] = {
 	MK( 13575,  20,  20,  99,   0,   8), /* 255 */
 };
 
-RailVehicleInfo _rail_vehicle_info[] = {
-	// image_index    max_speed (kph)  running_cost_base
-	// |  flags       |      power (hp)|    running_cost_class
-	// |  |    base_cost     |    weight    |    capacity
-	// |  |    |      |      |    |    |    |    |    cargo_type
-	// |  |    |      |      |    |    |    |    |    |
-	{  2, 0,   7,    64,   300,  47,  50,   0,   0,   0}, /* 0 */
-	{ 19, 0,   8,    80,   600,  65,  65,   1,   0,   0}, /* 1 */
-	{  2, 0,  10,    72,   400,  85,  90,   0,   0,   0}, /* 2 */
-	{  0, 0,  15,    96,   900, 130, 130,   0,   0,   0}, /* 3 */
-	{  1, 0,  19,   112,  1000, 140, 145,   0,   0,   0}, /* 4 */
-	{ 12, 0,  16,   120,  1400,  95, 125,   1,   0,   0}, /* 5 */
-	{ 14, 0,  20,   152,  2000, 120, 135,   1,   0,   0}, /* 6 */
-	{  3, 0,  14,    88,  1100, 145, 130,   0,   0,   0}, /* 7 */
-	{  0, 0,  13,   112,  1000, 131, 120,   0,   0,   0}, /* 8 */
-	{  1, 0,  19,   128,  1200, 162, 140,   0,   0,   0}, /* 9 */
-	{  0, 0,  22,   144,  1600, 170, 130,   0,   0,   0}, /* 10 */
-	{  8, 1,  11,   112, 600/2,  32,85/2,   1,  38,   CT_PASSENGERS}, /* 11 */
-	{ 10, 1,  14,   120, 700/2,  38,70/2,   1,  40,   CT_PASSENGERS}, /* 12 */
-	{  4, 0,  15,   128,  1250,  72,  95,   1,   0,   0}, /* 13 */
-	{  5, 0,  17,   144,  1750, 101, 120,   1,   0,   0}, /* 14 */
-	{  4, 0,  18,   160,  2580, 112, 140,   1,   0,   0}, /* 15 */
-	{ 14, 0,  23,    96,  4000, 150, 135,   1,   0,   0}, /* 16 */
-	{ 12, 0,  16,   112,  2400, 120, 105,   1,   0,   0}, /* 17 */
-	{ 13, 0,  30,   112,  6600, 207, 155,   1,   0,   0}, /* 18 */
-	{ 15, 0,  18,   104,  1500, 110, 105,   1,   0,   0}, /* 19 */
-	{ 16, 1,  35,   160,3500/2,  95, 205/2, 1,   0,   0}, /* 20 */
-	{ 18, 0,  21,   104,  2200, 120, 145,   1,   0,   0}, /* 21 */
-	{  6, 1,  20,   200,4500/2,  70, 190/2, 1,   4,   CT_MAIL}, /* 22 */
-	{ 20, 0,  26,   160,  3600,  84, 180,   2,   0,   0}, /* 23 */
-	{ 20, 0,  30,   176,  5000,  82, 205,   2,   0,   0}, /* 24 */
-	{ 21, 1,  40,   240,7000/2,  90, 240/2, 2,   0,   0}, /* 25 */
-	{ 23, 1,  43,   264,8000/2,  95, 250/2, 2,   0,   0}, /* 26 */
-	{ 33, 2, 247,     0,     0,  25,   0,   0,  40,   CT_PASSENGERS}, /* 27 */
-	{ 35, 2, 228,     0,     0,  21,   0,   0,  30,   CT_MAIL}, /* 28 */
-	{ 34, 2, 176,     0,     0,  18,   0,   0,  30,   CT_COAL}, /* 29 */
-	{ 36, 2, 200,     0,     0,  24,   0,   0,  30,   CT_OIL}, /* 30 */
-	{ 37, 2, 192,     0,     0,  20,   0,   0,  25,   CT_LIVESTOCK}, /* 31 */
-	{ 38, 2, 190,     0,     0,  21,   0,   0,  25,   CT_GOODS}, /* 32 */
-	{ 39, 2, 182,     0,     0,  19,   0,   0,  30,   CT_GRAIN}, /* 33 */
-	{ 40, 2, 181,     0,     0,  16,   0,   0,  30,   CT_WOOD}, /* 34 */
-	{ 41, 2, 179,     0,     0,  19,   0,   0,  30,   CT_IRON_ORE}, /* 35 */
-	{ 42, 2, 196,     0,     0,  18,   0,   0,  20,   CT_STEEL}, /* 36 */
-	{ 43, 2, 255,     0,     0,  30,   0,   0,  20,   CT_VALUABLES}, /* 37 */
-	{ 44, 2, 191,     0,     0,  22,   0,   0,  25,   CT_FOOD}, /* 38 */
-	{ 45, 2, 196,     0,     0,  18,   0,   0,  20,   CT_PAPER}, /* 39 */
-	{ 46, 2, 179,     0,     0,  19,   0,   0,  30,   CT_COPPER_ORE}, /* 40 */
-	{ 47, 2, 199,     0,     0,  25,   0,   0,  25,   CT_WATER}, /* 41 */
-	{ 48, 2, 182,     0,     0,  18,   0,   0,  25,   CT_FRUIT}, /* 42 */
-	{ 49, 2, 185,     0,     0,  19,   0,   0,  21,   CT_RUBBER}, /* 43 */
-	{ 50, 2, 176,     0,     0,  19,   0,   0,  30,   CT_SUGAR}, /* 44 */
-	{ 51, 2, 178,     0,     0,  20,   0,   0,  30,   CT_COTTON_CANDY}, /* 45 */
-	{ 52, 2, 192,     0,     0,  20,   0,   0,  30,   CT_TOFFEE}, /* 46 */
-	{ 53, 2, 190,     0,     0,  21,   0,   0,  20,   CT_BUBBLES}, /* 47 */
-	{ 54, 2, 182,     0,     0,  24,   0,   0,  25,   CT_COLA}, /* 48 */
-	{ 55, 2, 181,     0,     0,  21,   0,   0,  25,   CT_CANDY}, /* 49 */
-	{ 56, 2, 183,     0,     0,  21,   0,   0,  20,   CT_TOYS}, /* 50 */
-	{ 57, 2, 196,     0,     0,  18,   0,   0,  22,   CT_BATTERIES}, /* 51 */
-	{ 58, 2, 193,     0,     0,  18,   0,   0,  25,   CT_FIZZY_DRINKS}, /* 52 */
-	{ 59, 2, 191,     0,     0,  18,   0,   0,  30,   CT_PLASTIC}, /* 53 */
-	{ 25, 0,  52,   304,  9000,  95, 230,   2,   0,   0}, /* 54 */
-	{ 26, 1,  60,   336,10000/2, 85, 240/2, 2,  25,   CT_PASSENGERS}, /* 55 */
-	{ 26, 0,  53,   320,  5000,  95, 230,   2,   0,   0}, /* 56 */
-	{ 60, 2, 247,     0,     0,  25,   0,   0,  45,   CT_PASSENGERS}, /* 57 */
-	{ 62, 2, 228,     0,     0,  21,   0,   0,  35,   CT_MAIL}, /* 58 */
-	{ 61, 2, 176,     0,     0,  18,   0,   0,  35,   CT_COAL}, /* 59 */
-	{ 63, 2, 200,     0,     0,  24,   0,   0,  35,   CT_OIL}, /* 60 */
-	{ 64, 2, 192,     0,     0,  20,   0,   0,  30,   CT_LIVESTOCK}, /* 61 */
-	{ 65, 2, 190,     0,     0,  21,   0,   0,  30,   CT_GOODS}, /* 62 */
-	{ 66, 2, 182,     0,     0,  19,   0,   0,  35,   CT_GRAIN}, /* 63 */
-	{ 67, 2, 181,     0,     0,  16,   0,   0,  35,   CT_WOOD}, /* 64 */
-	{ 68, 2, 179,     0,     0,  19,   0,   0,  35,   CT_IRON_ORE}, /* 65 */
-	{ 69, 2, 196,     0,     0,  18,   0,   0,  25,   CT_STEEL}, /* 66 */
-	{ 70, 2, 255,     0,     0,  30,   0,   0,  25,   CT_VALUABLES}, /* 67 */
-	{ 71, 2, 191,     0,     0,  22,   0,   0,  30,   CT_FOOD}, /* 68 */
-	{ 72, 2, 196,     0,     0,  18,   0,   0,  25,   CT_PAPER}, /* 69 */
-	{ 73, 2, 179,     0,     0,  19,   0,   0,  35,   CT_COPPER_ORE}, /* 70 */
-	{ 47, 2, 199,     0,     0,  25,   0,   0,  30,   CT_WATER}, /* 71 */
-	{ 48, 2, 182,     0,     0,  18,   0,   0,  30,   CT_FRUIT}, /* 72 */
-	{ 49, 2, 185,     0,     0,  19,   0,   0,  26,   CT_RUBBER}, /* 73 */
-	{ 50, 2, 176,     0,     0,  19,   0,   0,  35,   CT_SUGAR}, /* 74 */
-	{ 51, 2, 178,     0,     0,  20,   0,   0,  35,   CT_COTTON_CANDY}, /* 75 */
-	{ 52, 2, 192,     0,     0,  20,   0,   0,  35,   CT_TOFFEE}, /* 76 */
-	{ 53, 2, 190,     0,     0,  21,   0,   0,  25,   CT_BUBBLES}, /* 77 */
-	{ 54, 2, 182,     0,     0,  24,   0,   0,  30,   CT_COLA}, /* 78 */
-	{ 55, 2, 181,     0,     0,  21,   0,   0,  30,   CT_CANDY}, /* 79 */
-	{ 56, 2, 183,     0,     0,  21,   0,   0,  25,   CT_TOYS}, /* 80 */
-	{ 57, 2, 196,     0,     0,  18,   0,   0,  27,   CT_BATTERIES}, /* 81 */
-	{ 58, 2, 193,     0,     0,  18,   0,   0,  30,   CT_FIZZY_DRINKS}, /* 82 */
-	{ 59, 2, 191,     0,     0,  18,   0,   0,  35,   CT_PLASTIC}, /* 83 */
-	{ 28, 0,  70,   400, 10000, 105, 250,   2,   0,   0}, /* 84 */
-	{ 29, 0,  74,   448, 12000, 120, 253,   2,   0,   0}, /* 85 */
-	{ 30, 0,  82,   480, 15000, 130, 254,   2,   0,   0}, /* 86 */
-	{ 31, 1,  95,   640,20000/2,150, 255/2, 2,   0,   0}, /* 87 */
-	{ 28, 0,  70,   480, 10000, 120, 250,   2,   0,   0}, /* 88 */
-	{ 60, 2, 247,     0,     0,  25,   0,   0,  47,   CT_PASSENGERS}, /* 89 */
-	{ 62, 2, 228,     0,     0,  21,   0,   0,  37,   CT_MAIL}, /* 90 */
-	{ 61, 2, 176,     0,     0,  18,   0,   0,  37,   CT_COAL}, /* 91 */
-	{ 63, 2, 200,     0,     0,  24,   0,   0,  37,   CT_OIL}, /* 92 */
-	{ 64, 2, 192,     0,     0,  20,   0,   0,  32,   CT_LIVESTOCK}, /* 93 */
-	{ 65, 2, 190,     0,     0,  21,   0,   0,  32,   CT_GOODS}, /* 94 */
-	{ 66, 2, 182,     0,     0,  19,   0,   0,  37,   CT_GRAIN}, /* 95 */
-	{ 67, 2, 181,     0,     0,  16,   0,   0,  37,   CT_WOOD}, /* 96 */
-	{ 68, 2, 179,     0,     0,  19,   0,   0,  37,   CT_IRON_ORE}, /* 97 */
-	{ 69, 2, 196,     0,     0,  18,   0,   0,  27,   CT_STEEL}, /* 98 */
-	{ 70, 2, 255,     0,     0,  30,   0,   0,  27,   CT_VALUABLES}, /* 99 */
-	{ 71, 2, 191,     0,     0,  22,   0,   0,  32,   CT_FOOD}, /* 100 */
-	{ 72, 2, 196,     0,     0,  18,   0,   0,  27,   CT_PAPER}, /* 101 */
-	{ 73, 2, 179,     0,     0,  19,   0,   0,  37,   CT_COPPER_ORE}, /* 102 */
-	{ 47, 2, 199,     0,     0,  25,   0,   0,  32,   CT_WATER}, /* 103 */
-	{ 48, 2, 182,     0,     0,  18,   0,   0,  32,   CT_FRUIT}, /* 104 */
-	{ 49, 2, 185,     0,     0,  19,   0,   0,  28,   CT_RUBBER}, /* 105 */
-	{ 50, 2, 176,     0,     0,  19,   0,   0,  37,   CT_SUGAR}, /* 106 */
-	{ 51, 2, 178,     0,     0,  20,   0,   0,  37,   CT_COTTON_CANDY}, /* 107 */
-	{ 52, 2, 192,     0,     0,  20,   0,   0,  37,   CT_TOFFEE}, /* 108 */
-	{ 53, 2, 190,     0,     0,  21,   0,   0,  27,   CT_BUBBLES}, /* 109 */
-	{ 54, 2, 182,     0,     0,  24,   0,   0,  32,   CT_COLA}, /* 110 */
-	{ 55, 2, 181,     0,     0,  21,   0,   0,  32,   CT_CANDY}, /* 111 */
-	{ 56, 2, 183,     0,     0,  21,   0,   0,  27,   CT_TOYS}, /* 112 */
-	{ 57, 2, 196,     0,     0,  18,   0,   0,  29,   CT_BATTERIES}, /* 113 */
-	{ 58, 2, 193,     0,     0,  18,   0,   0,  32,   CT_FIZZY_DRINKS}, /* 114 */
-	{ 59, 2, 191,     0,     0,  18,   0,   0,  37,   CT_PLASTIC}, /* 115 */
+RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES] = {
+	// image_index  max_speed (kph)      running_cost_base
+	// |  flags     |        power (hp)  |    running_cost_class
+	// |  |    base_cost     |    weight      |    capacity
+	// |  |    |    |        |    |      |    |    |    cargo_type
+	// |  |    |    |        |    |      |    |    |    |
+	{  2, 0,   7,  64,     300,  47,    50,   0,   0,   0               }, /*   0 */
+	{ 19, 0,   8,  80,     600,  65,    65,   1,   0,   0               }, /*   1 */
+	{  2, 0,  10,  72,     400,  85,    90,   0,   0,   0               }, /*   2 */
+	{  0, 0,  15,  96,     900, 130,   130,   0,   0,   0               }, /*   3 */
+	{  1, 0,  19, 112,    1000, 140,   145,   0,   0,   0               }, /*   4 */
+	{ 12, 0,  16, 120,    1400,  95,   125,   1,   0,   0               }, /*   5 */
+	{ 14, 0,  20, 152,    2000, 120,   135,   1,   0,   0               }, /*   6 */
+	{  3, 0,  14,  88,    1100, 145,   130,   0,   0,   0               }, /*   7 */
+	{  0, 0,  13, 112,    1000, 131,   120,   0,   0,   0               }, /*   8 */
+	{  1, 0,  19, 128,    1200, 162,   140,   0,   0,   0               }, /*   9 */
+	{  0, 0,  22, 144,    1600, 170,   130,   0,   0,   0               }, /*  10 */
+	{  8, 1,  11, 112,   600/2,  32,  85/2,   1,  38,   CT_PASSENGERS   }, /*  11 */
+	{ 10, 1,  14, 120,   700/2,  38,  70/2,   1,  40,   CT_PASSENGERS   }, /*  12 */
+	{  4, 0,  15, 128,    1250,  72,    95,   1,   0,   0               }, /*  13 */
+	{  5, 0,  17, 144,    1750, 101,   120,   1,   0,   0               }, /*  14 */
+	{  4, 0,  18, 160,    2580, 112,   140,   1,   0,   0               }, /*  15 */
+	{ 14, 0,  23,  96,    4000, 150,   135,   1,   0,   0               }, /*  16 */
+	{ 12, 0,  16, 112,    2400, 120,   105,   1,   0,   0               }, /*  17 */
+	{ 13, 0,  30, 112,    6600, 207,   155,   1,   0,   0               }, /*  18 */
+	{ 15, 0,  18, 104,    1500, 110,   105,   1,   0,   0               }, /*  19 */
+	{ 16, 1,  35, 160,  3500/2,  95, 205/2,   1,   0,   0               }, /*  20 */
+	{ 18, 0,  21, 104,    2200, 120,   145,   1,   0,   0               }, /*  21 */
+	{  6, 1,  20, 200,  4500/2,  70, 190/2,   1,   4,   CT_MAIL         }, /*  22 */
+	{ 20, 0,  26, 160,    3600,  84,   180,   2,   0,   0               }, /*  23 */
+	{ 20, 0,  30, 176,    5000,  82,   205,   2,   0,   0               }, /*  24 */
+	{ 21, 1,  40, 240,  7000/2,  90, 240/2,   2,   0,   0               }, /*  25 */
+	{ 23, 1,  43, 264,  8000/2,  95, 250/2,   2,   0,   0               }, /*  26 */
+	{ 33, 2, 247,   0,       0,  25,     0,   0,  40,   CT_PASSENGERS   }, /*  27 */
+	{ 35, 2, 228,   0,       0,  21,     0,   0,  30,   CT_MAIL         }, /*  28 */
+	{ 34, 2, 176,   0,       0,  18,     0,   0,  30,   CT_COAL         }, /*  29 */
+	{ 36, 2, 200,   0,       0,  24,     0,   0,  30,   CT_OIL          }, /*  30 */
+	{ 37, 2, 192,   0,       0,  20,     0,   0,  25,   CT_LIVESTOCK    }, /*  31 */
+	{ 38, 2, 190,   0,       0,  21,     0,   0,  25,   CT_GOODS        }, /*  32 */
+	{ 39, 2, 182,   0,       0,  19,     0,   0,  30,   CT_GRAIN        }, /*  33 */
+	{ 40, 2, 181,   0,       0,  16,     0,   0,  30,   CT_WOOD         }, /*  34 */
+	{ 41, 2, 179,   0,       0,  19,     0,   0,  30,   CT_IRON_ORE     }, /*  35 */
+	{ 42, 2, 196,   0,       0,  18,     0,   0,  20,   CT_STEEL        }, /*  36 */
+	{ 43, 2, 255,   0,       0,  30,     0,   0,  20,   CT_VALUABLES    }, /*  37 */
+	{ 44, 2, 191,   0,       0,  22,     0,   0,  25,   CT_FOOD         }, /*  38 */
+	{ 45, 2, 196,   0,       0,  18,     0,   0,  20,   CT_PAPER        }, /*  39 */
+	{ 46, 2, 179,   0,       0,  19,     0,   0,  30,   CT_COPPER_ORE   }, /*  40 */
+	{ 47, 2, 199,   0,       0,  25,     0,   0,  25,   CT_WATER        }, /*  41 */
+	{ 48, 2, 182,   0,       0,  18,     0,   0,  25,   CT_FRUIT        }, /*  42 */
+	{ 49, 2, 185,   0,       0,  19,     0,   0,  21,   CT_RUBBER       }, /*  43 */
+	{ 50, 2, 176,   0,       0,  19,     0,   0,  30,   CT_SUGAR        }, /*  44 */
+	{ 51, 2, 178,   0,       0,  20,     0,   0,  30,   CT_COTTON_CANDY }, /*  45 */
+	{ 52, 2, 192,   0,       0,  20,     0,   0,  30,   CT_TOFFEE       }, /*  46 */
+	{ 53, 2, 190,   0,       0,  21,     0,   0,  20,   CT_BUBBLES      }, /*  47 */
+	{ 54, 2, 182,   0,       0,  24,     0,   0,  25,   CT_COLA         }, /*  48 */
+	{ 55, 2, 181,   0,       0,  21,     0,   0,  25,   CT_CANDY        }, /*  49 */
+	{ 56, 2, 183,   0,       0,  21,     0,   0,  20,   CT_TOYS         }, /*  50 */
+	{ 57, 2, 196,   0,       0,  18,     0,   0,  22,   CT_BATTERIES    }, /*  51 */
+	{ 58, 2, 193,   0,       0,  18,     0,   0,  25,   CT_FIZZY_DRINKS }, /*  52 */
+	{ 59, 2, 191,   0,       0,  18,     0,   0,  30,   CT_PLASTIC      }, /*  53 */
+	{ 25, 0,  52, 304,    9000,  95,   230,   2,   0,   0               }, /*  54 */
+	{ 26, 1,  60, 336, 10000/2,  85, 240/2,   2,  25,   CT_PASSENGERS   }, /*  55 */
+	{ 26, 0,  53, 320,    5000,  95,   230,   2,   0,   0               }, /*  56 */
+	{ 60, 2, 247,   0,       0,  25,     0,   0,  45,   CT_PASSENGERS   }, /*  57 */
+	{ 62, 2, 228,   0,       0,  21,     0,   0,  35,   CT_MAIL         }, /*  58 */
+	{ 61, 2, 176,   0,       0,  18,     0,   0,  35,   CT_COAL         }, /*  59 */
+	{ 63, 2, 200,   0,       0,  24,     0,   0,  35,   CT_OIL          }, /*  60 */
+	{ 64, 2, 192,   0,       0,  20,     0,   0,  30,   CT_LIVESTOCK    }, /*  61 */
+	{ 65, 2, 190,   0,       0,  21,     0,   0,  30,   CT_GOODS        }, /*  62 */
+	{ 66, 2, 182,   0,       0,  19,     0,   0,  35,   CT_GRAIN        }, /*  63 */
+	{ 67, 2, 181,   0,       0,  16,     0,   0,  35,   CT_WOOD         }, /*  64 */
+	{ 68, 2, 179,   0,       0,  19,     0,   0,  35,   CT_IRON_ORE     }, /*  65 */
+	{ 69, 2, 196,   0,       0,  18,     0,   0,  25,   CT_STEEL        }, /*  66 */
+	{ 70, 2, 255,   0,       0,  30,     0,   0,  25,   CT_VALUABLES    }, /*  67 */
+	{ 71, 2, 191,   0,       0,  22,     0,   0,  30,   CT_FOOD         }, /*  68 */
+	{ 72, 2, 196,   0,       0,  18,     0,   0,  25,   CT_PAPER        }, /*  69 */
+	{ 73, 2, 179,   0,       0,  19,     0,   0,  35,   CT_COPPER_ORE   }, /*  70 */
+	{ 47, 2, 199,   0,       0,  25,     0,   0,  30,   CT_WATER        }, /*  71 */
+	{ 48, 2, 182,   0,       0,  18,     0,   0,  30,   CT_FRUIT        }, /*  72 */
+	{ 49, 2, 185,   0,       0,  19,     0,   0,  26,   CT_RUBBER       }, /*  73 */
+	{ 50, 2, 176,   0,       0,  19,     0,   0,  35,   CT_SUGAR        }, /*  74 */
+	{ 51, 2, 178,   0,       0,  20,     0,   0,  35,   CT_COTTON_CANDY }, /*  75 */
+	{ 52, 2, 192,   0,       0,  20,     0,   0,  35,   CT_TOFFEE       }, /*  76 */
+	{ 53, 2, 190,   0,       0,  21,     0,   0,  25,   CT_BUBBLES      }, /*  77 */
+	{ 54, 2, 182,   0,       0,  24,     0,   0,  30,   CT_COLA         }, /*  78 */
+	{ 55, 2, 181,   0,       0,  21,     0,   0,  30,   CT_CANDY        }, /*  79 */
+	{ 56, 2, 183,   0,       0,  21,     0,   0,  25,   CT_TOYS         }, /*  80 */
+	{ 57, 2, 196,   0,       0,  18,     0,   0,  27,   CT_BATTERIES    }, /*  81 */
+	{ 58, 2, 193,   0,       0,  18,     0,   0,  30,   CT_FIZZY_DRINKS }, /*  82 */
+	{ 59, 2, 191,   0,       0,  18,     0,   0,  35,   CT_PLASTIC      }, /*  83 */
+	{ 28, 0,  70, 400,   10000, 105,   250,   2,   0,   0               }, /*  84 */
+	{ 29, 0,  74, 448,   12000, 120,   253,   2,   0,   0               }, /*  85 */
+	{ 30, 0,  82, 480,   15000, 130,   254,   2,   0,   0               }, /*  86 */
+	{ 31, 1,  95, 640, 20000/2, 150, 255/2,   2,   0,   0               }, /*  87 */
+	{ 28, 0,  70, 480,   10000, 120,   250,   2,   0,   0               }, /*  88 */
+	{ 60, 2, 247,   0,       0,  25,     0,   0,  47,   CT_PASSENGERS   }, /*  89 */
+	{ 62, 2, 228,   0,       0,  21,     0,   0,  37,   CT_MAIL         }, /*  90 */
+	{ 61, 2, 176,   0,       0,  18,     0,   0,  37,   CT_COAL         }, /*  91 */
+	{ 63, 2, 200,   0,       0,  24,     0,   0,  37,   CT_OIL          }, /*  92 */
+	{ 64, 2, 192,   0,       0,  20,     0,   0,  32,   CT_LIVESTOCK    }, /*  93 */
+	{ 65, 2, 190,   0,       0,  21,     0,   0,  32,   CT_GOODS        }, /*  94 */
+	{ 66, 2, 182,   0,       0,  19,     0,   0,  37,   CT_GRAIN        }, /*  95 */
+	{ 67, 2, 181,   0,       0,  16,     0,   0,  37,   CT_WOOD         }, /*  96 */
+	{ 68, 2, 179,   0,       0,  19,     0,   0,  37,   CT_IRON_ORE     }, /*  97 */
+	{ 69, 2, 196,   0,       0,  18,     0,   0,  27,   CT_STEEL        }, /*  98 */
+	{ 70, 2, 255,   0,       0,  30,     0,   0,  27,   CT_VALUABLES    }, /*  99 */
+	{ 71, 2, 191,   0,       0,  22,     0,   0,  32,   CT_FOOD         }, /* 100 */
+	{ 72, 2, 196,   0,       0,  18,     0,   0,  27,   CT_PAPER        }, /* 101 */
+	{ 73, 2, 179,   0,       0,  19,     0,   0,  37,   CT_COPPER_ORE   }, /* 102 */
+	{ 47, 2, 199,   0,       0,  25,     0,   0,  32,   CT_WATER        }, /* 103 */
+	{ 48, 2, 182,   0,       0,  18,     0,   0,  32,   CT_FRUIT        }, /* 104 */
+	{ 49, 2, 185,   0,       0,  19,     0,   0,  28,   CT_RUBBER       }, /* 105 */
+	{ 50, 2, 176,   0,       0,  19,     0,   0,  37,   CT_SUGAR        }, /* 106 */
+	{ 51, 2, 178,   0,       0,  20,     0,   0,  37,   CT_COTTON_CANDY }, /* 107 */
+	{ 52, 2, 192,   0,       0,  20,     0,   0,  37,   CT_TOFFEE       }, /* 108 */
+	{ 53, 2, 190,   0,       0,  21,     0,   0,  27,   CT_BUBBLES      }, /* 109 */
+	{ 54, 2, 182,   0,       0,  24,     0,   0,  32,   CT_COLA         }, /* 110 */
+	{ 55, 2, 181,   0,       0,  21,     0,   0,  32,   CT_CANDY        }, /* 111 */
+	{ 56, 2, 183,   0,       0,  21,     0,   0,  27,   CT_TOYS         }, /* 112 */
+	{ 57, 2, 196,   0,       0,  18,     0,   0,  29,   CT_BATTERIES    }, /* 113 */
+	{ 58, 2, 193,   0,       0,  18,     0,   0,  32,   CT_FIZZY_DRINKS }, /* 114 */
+	{ 59, 2, 191,   0,       0,  18,     0,   0,  37,   CT_PLASTIC      }, /* 115 */
 };
 
-
-RoadVehicleInfo _road_vehicle_info[] = {
-	/* FIXME: Cargo type constant may not be appropriate for the
-	 * vehicle's climate. --pasky */
-	// image_index  cargo_type     cargo_amount
-	// |  base_cost  |             |    running_cost
-	// |   |   max_speed           |    |   sfx
-	// |   |    |    |             |    |   |
-	{  0, 120, 112, CT_PASSENGERS, 31,  91, 23 }, /*  0 */
-	{ 17, 140, 176, CT_PASSENGERS, 35, 128, 26 }, /*  1 */
-	{ 17, 150, 224, CT_PASSENGERS, 37, 178, 25 }, /*  2 */
-	{ 34, 160, 255, CT_PASSENGERS, 40, 240, 25 }, /*  3 */
-	{ 51, 120, 112, CT_PASSENGERS, 30,  91, 60 }, /*  4 */
-	{ 51, 140, 192, CT_PASSENGERS, 35, 171, 62 }, /*  5 */
-	{ 51, 160, 240, CT_PASSENGERS, 38, 240, 60 }, /*  6 */
-	{  1, 108,  96,       CT_COAL, 20,  90, 23 }, /*  7 */
-	{ 18, 128, 176,       CT_COAL, 25, 168, 23 }, /*  8 */
-	{ 35, 138, 224,       CT_COAL, 28, 240, 23 }, /*  9 */
-	{  2, 115,  96,       CT_MAIL, 22,  90, 23 }, /* 10 */
-	{ 19, 135, 176,       CT_MAIL, 28, 168, 23 }, /* 11 */
-	{ 36, 145, 224,       CT_MAIL, 30, 240, 23 }, /* 12 */
-	{ 57, 115,  96,       CT_MAIL, 22,  90, 62 }, /* 13 */
-	{ 57, 135, 176,       CT_MAIL, 28, 168, 60 }, /* 14 */
-	{ 57, 145, 224,       CT_MAIL, 30, 240, 62 }, /* 15 */
-	{  3, 110,  96,        CT_OIL, 21,  90, 23 }, /* 16 */
-	{ 20, 140, 176,        CT_OIL, 25, 168, 23 }, /* 17 */
-	{ 37, 150, 224,        CT_OIL, 27, 240, 23 }, /* 18 */
-	{  4, 105,  96,  CT_LIVESTOCK, 14,  90, 23 }, /* 19 */
-	{ 21, 130, 176,  CT_LIVESTOCK, 16, 168, 23 }, /* 20 */
-	{ 38, 140, 224,  CT_LIVESTOCK, 18, 240, 23 }, /* 21 */
-	{  5, 107,  96,      CT_GOODS, 14,  90, 23 }, /* 22 */
-	{ 22, 130, 176,      CT_GOODS, 16, 168, 23 }, /* 23 */
-	{ 39, 140, 224,      CT_GOODS, 18, 240, 23 }, /* 24 */
-	{  6, 114,  96,      CT_GRAIN, 20,  90, 23 }, /* 25 */
-	{ 23, 133, 176,      CT_GRAIN, 25, 168, 23 }, /* 26 */
-	{ 40, 143, 224,      CT_GRAIN, 30, 240, 23 }, /* 27 */
-	{  7, 118,  96,       CT_WOOD, 20,  90, 23 }, /* 28 */
-	{ 24, 137, 176,       CT_WOOD, 22, 168, 23 }, /* 29 */
-	{ 41, 147, 224,       CT_WOOD, 24, 240, 23 }, /* 30 */
-	{  8, 121,  96,   CT_IRON_ORE, 22,  90, 23 }, /* 31 */
-	{ 25, 140, 176,   CT_IRON_ORE, 25, 168, 23 }, /* 32 */
-	{ 42, 150, 224,   CT_IRON_ORE, 27, 240, 23 }, /* 33 */
-	{  9, 112,  96,      CT_STEEL, 15,  90, 23 }, /* 34 */
-	{ 26, 135, 176,      CT_STEEL, 18, 168, 23 }, /* 35 */
-	{ 43, 145, 224,      CT_STEEL, 20, 240, 23 }, /* 36 */
-	{ 10, 145,  96,  CT_VALUABLES, 12,  90, 23 }, /* 37 */
-	{ 27, 170, 176,  CT_VALUABLES, 15, 168, 23 }, /* 38 */
-	{ 44, 180, 224,  CT_VALUABLES, 16, 240, 23 }, /* 39 */
-	{ 11, 112,  96,       CT_FOOD, 17,  90, 23 }, /* 40 */
-	{ 28, 134, 176,       CT_FOOD, 20, 168, 23 }, /* 41 */
-	{ 45, 144, 224,       CT_FOOD, 22, 240, 23 }, /* 42 */
-	{ 12, 112,  96,      CT_STEEL, 15,  90, 23 }, /* 43 */
-	{ 29, 135, 176,      CT_STEEL, 18, 168, 23 }, /* 44 */
-	{ 46, 145, 224,      CT_STEEL, 20, 240, 23 }, /* 45 */
-	{ 13, 121,  96,   CT_IRON_ORE, 22,  90, 23 }, /* 46 */
-	{ 30, 140, 176,   CT_IRON_ORE, 25, 168, 23 }, /* 47 */
-	{ 47, 150, 224,   CT_IRON_ORE, 27, 240, 23 }, /* 48 */
-	{ 14, 111,  96,      CT_STEEL, 21,  90, 23 }, /* 49 */
-	{ 31, 141, 176,      CT_STEEL, 25, 168, 23 }, /* 50 */
-	{ 48, 151, 224,      CT_STEEL, 27, 240, 23 }, /* 51 */
-	{ 15, 118,  96,  CT_LIVESTOCK, 18,  90, 23 }, /* 52 */
-	{ 32, 148, 176,  CT_LIVESTOCK, 20, 168, 23 }, /* 53 */
-	{ 49, 158, 224,  CT_LIVESTOCK, 23, 240, 23 }, /* 54 */
-	{ 16, 117,  96,       CT_COAL, 17,  90, 23 }, /* 55 */
-	{ 33, 147, 176,       CT_COAL, 19, 168, 23 }, /* 56 */
-	{ 50, 157, 224,       CT_COAL, 22, 240, 23 }, /* 57 */
-	{ 52, 117,  96,       CT_COAL, 17,  90, 63 }, /* 58 */
-	{ 52, 147, 176,       CT_COAL, 19, 168, 64 }, /* 59 */
-	{ 52, 157, 224,       CT_COAL, 22, 240, 63 }, /* 60 */
-	{ 53, 117,  96,       CT_WOOD, 17,  90, 64 }, /* 61 */
-	{ 53, 147, 176,       CT_WOOD, 19, 168, 63 }, /* 62 */
-	{ 53, 157, 224,       CT_WOOD, 22, 240, 64 }, /* 63 */
-	{ 54, 117,  96,   CT_IRON_ORE, 17,  90, 63 }, /* 64 */
-	{ 54, 147, 176,   CT_IRON_ORE, 19, 168, 64 }, /* 65 */
-	{ 54, 157, 224,   CT_IRON_ORE, 22, 240, 63 }, /* 66 */
-	{ 55, 117,  96,      CT_GRAIN, 17,  90, 64 }, /* 67 */
-	{ 55, 147, 176,      CT_GRAIN, 19, 168, 63 }, /* 68 */
-	{ 55, 157, 224,      CT_GRAIN, 22, 240, 64 }, /* 69 */
-	{ 56, 117,  96,        CT_OIL, 17,  90, 63 }, /* 70 */
-	{ 56, 147, 176,        CT_OIL, 19, 168, 64 }, /* 71 */
-	{ 56, 157, 224,        CT_OIL, 22, 240, 63 }, /* 72 */
-	{ 58, 117,  96,      CT_GOODS, 17,  90, 64 }, /* 73 */
-	{ 58, 147, 176,      CT_GOODS, 19, 168, 63 }, /* 74 */
-	{ 58, 157, 224,      CT_GOODS, 22, 240, 64 }, /* 75 */
-	{ 59, 117,  96,  CT_LIVESTOCK, 17,  90, 63 }, /* 76 */
-	{ 59, 147, 176,  CT_LIVESTOCK, 19, 168, 64 }, /* 77 */
-	{ 59, 157, 224,  CT_LIVESTOCK, 22, 240, 63 }, /* 78 */
-	{ 60, 117,  96,       CT_FOOD, 17,  90, 64 }, /* 79 */
-	{ 60, 147, 176,       CT_FOOD, 19, 168, 63 }, /* 80 */
-	{ 60, 157, 224,       CT_FOOD, 22, 240, 64 }, /* 81 */
-	{ 61, 117,  96,  CT_VALUABLES, 17,  90, 63 }, /* 82 */
-	{ 61, 147, 176,  CT_VALUABLES, 19, 168, 64 }, /* 83 */
-	{ 61, 157, 224,  CT_VALUABLES, 22, 240, 63 }, /* 84 */
-	{ 62, 117,  96,      CT_STEEL, 17,  90, 64 }, /* 85 */
-	{ 62, 147, 176,      CT_STEEL, 19, 168, 63 }, /* 86 */
-	{ 62, 157, 224,      CT_STEEL, 22, 240, 64 }, /* 87 */
+ShipVehicleInfo _ship_vehicle_info[NUM_SHIP_ENGINES] = {
+	// image_index  cargo_type     cargo_amount                 refittable
+	// |  base_cost |              |    running_cost            |
+	// |  |    max_speed           |    |    sfx                |
+	// |  |    |    |              |    |    |                  |
+	{  1, 160, 48,  CT_OIL,        220, 140, SND_06_SHIP_HORN,  0 }, /*  0 */
+	{  1, 176, 80,  CT_OIL,        350, 125, SND_06_SHIP_HORN,  0 }, /*  1 */
+	{  2, 96,  64,  CT_PASSENGERS, 100, 90,  SND_07_FERRY_HORN, 0 }, /*  2 */
+	{  2, 112, 128, CT_PASSENGERS, 130, 80,  SND_07_FERRY_HORN, 0 }, /*  3 */
+	{  3, 148, 224, CT_PASSENGERS, 100, 190, SND_07_FERRY_HORN, 0 }, /*  4 */
+	{  2, 96,  64,  CT_PASSENGERS, 100, 90,  SND_07_FERRY_HORN, 0 }, /*  5 */
+	{  2, 112, 128, CT_PASSENGERS, 130, 80,  SND_07_FERRY_HORN, 0 }, /*  6 */
+	{  0, 128, 48,  CT_GOODS,      160, 150, SND_06_SHIP_HORN,  1 }, /*  7 */
+	{  0, 144, 80,  CT_GOODS,      190, 113, SND_06_SHIP_HORN,  1 }, /*  8 */
+	{  0, 128, 48,  CT_GOODS,      160, 150, SND_06_SHIP_HORN,  1 }, /*  9 */
+	{  0, 144, 80,  CT_GOODS,      190, 113, SND_06_SHIP_HORN,  1 }, /* 10 */
 };
 
+/* subtype: 0: chopper; 1: regular aircraft; 2: crashes easily on small airports */
+/* sfx from somewhere around SND_45_PLANE_CRASHING are toyland plane-sounds */
+AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES] = {
+	// image_index         sfx                         acceleration
+	// |   base_cost       |                           |   max_speed
+	// |   |    running_cost                           |   |    mail_capacity
+	// |   |    |  subtype |                           |   |    |    passanger_capacity
+	// |   |    |  |       |                           |   |    |    |
+	{  1, 14,  85, 1, SND_08_PLANE_TAKE_OFF,          18,  37,  4,  25 }, /*  0 */
+	{  0, 15, 100, 1, SND_08_PLANE_TAKE_OFF,          20,  37,  8,  65 }, /*  1 */
+	{  2, 16, 130, 3, SND_09_JET,                     35,  74, 10,  90 }, /*  2 */
+	{  8, 75, 250, 3, SND_3B_JET_OVERHEAD,            50, 181, 20, 100 }, /*  3 */
+	{  5, 15,  98, 1, SND_08_PLANE_TAKE_OFF,          20,  37,  6,  30 }, /*  4 */
+	{  6, 18, 240, 3, SND_09_JET,                     40,  74, 30, 200 }, /*  5 */
+	{  2, 17, 150, 1, SND_09_JET,                     35,  74, 15, 100 }, /*  6 */
+	{  2, 18, 245, 3, SND_09_JET,                     40,  74, 30, 150 }, /*  7 */
+	{	 3, 19, 192, 3, SND_09_JET,                     40,  74, 40, 220 }, /*  8 */
+	{  3, 20, 190, 3, SND_09_JET,                     40,  74, 25, 230 }, /*  9 */
+	{  2, 16, 135, 3, SND_09_JET,                     35,  74, 10,  95 }, /* 10 */
+	{  2, 18, 240, 3, SND_09_JET,                     40,  74, 35, 170 }, /* 11 */
+	{  4, 17, 155, 3, SND_09_JET,                     40,  74, 15, 110 }, /* 12 */
+	{  7, 30, 253, 3, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 50, 300 }, /* 13 */
+	{  4, 18, 210, 3, SND_09_JET,                     40,  74, 25, 200 }, /* 14 */
+	{  4, 19, 220, 3, SND_09_JET,                     40,  74, 25, 240 }, /* 15 */
+	{  4, 27, 230, 3, SND_09_JET,                     40,  74, 40, 260 }, /* 16 */
+	{  3, 25, 225, 3, SND_09_JET,                     40,  74, 35, 240 }, /* 17 */
+	{  4, 20, 235, 3, SND_09_JET,                     40,  74, 30, 260 }, /* 18 */
+	{  4, 19, 220, 3, SND_09_JET,                     40,  74, 25, 210 }, /* 19 */
+	{  4, 18, 170, 3, SND_09_JET,                     40,  74, 20, 160 }, /* 20 */
+	{  4, 26, 210, 3, SND_09_JET,                     40,  74, 20, 220 }, /* 21 */
+	{  6, 16, 125, 1, SND_09_JET,                     50,  74, 10,  80 }, /* 22 */
+	{  2, 17, 145, 1, SND_09_JET,                     40,  74, 10,  85 }, /* 23 */
+	{ 11, 16, 130, 3, SND_09_JET,                     40,  74, 10,  75 }, /* 24 */
+	{ 10, 16, 149, 3, SND_09_JET,                     40,  74, 10,  85 }, /* 25 */
+	{ 15, 17, 170, 3, SND_09_JET,                     40,  74, 18,  65 }, /* 26 */
+	{ 12, 18, 210, 3, SND_09_JET,                     40,  74, 25, 110 }, /* 27 */
+	{ 13, 20, 230, 3, SND_09_JET,                     40,  74, 60, 180 }, /* 28 */
+	{ 14, 21, 220, 3, SND_09_JET,                     40,  74, 65, 150 }, /* 29 */
+	{ 16, 19, 160, 3, SND_09_JET,                     40, 181, 45,  85 }, /* 30 */
+	{ 17, 24, 248, 3, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 80, 400 }, /* 31 */
+	{ 18, 80, 251, 3, SND_3B_JET_OVERHEAD,            50, 181, 45, 130 }, /* 32 */
+	{ 20, 13,  85, 1, SND_45_PLANE_CRASHING,          18,  37,  5,  25 }, /* 33 */
+	{ 21, 18, 100, 1, SND_46_PLANE_ENGINE_SPUTTERING, 20,  37,  9,  60 }, /* 34 */
+	{ 22, 25, 140, 1, SND_09_JET,                     40,  74, 12,  90 }, /* 35 */
+	{ 23, 32, 220, 3, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 40, 200 }, /* 36 */
+	{ 24, 80, 255, 3, SND_3B_JET_OVERHEAD,            50, 181, 30, 100 }, /* 37 */
+	{  9, 15,  81, 0, SND_09_JET,                     20,  25, 15,  40 }, /* 38 */
+	{ 19, 17,  77, 0, SND_09_JET,                     20,  40, 20,  55 }, /* 39 */
+	{ 25, 15,  80, 0, SND_09_JET,                     20,  25, 10,  40 }, /* 40 */
+};
 
-ShipVehicleInfo _ship_vehicle_info[] = {
-	// image_index  cargo_type     cargo_amount  refittable
-	// |  base_cost |              |    running_cost
-	// |  |    max_speed           |    |    sfx |
-	// |  |    |    |              |    |    |   |
-	{  1, 160, 48,  CT_OIL,        220, 140, 4, 0 }, /* 0 */
-	{  1, 176, 80,  CT_OIL,        350, 125, 4, 0 }, /* 1 */
-	{  2, 96,  64,  CT_PASSENGERS, 100, 90,  5, 0 }, /* 2 */
-	{  2, 112, 128, CT_PASSENGERS, 130, 80,  5, 0 }, /* 3 */
-	{  3, 148, 224, CT_PASSENGERS, 100, 190, 5, 0 }, /* 4 */
-	{  2, 96,  64,  CT_PASSENGERS, 100, 90,  5, 0 }, /* 5 */
-	{  2, 112, 128, CT_PASSENGERS, 130, 80,  5, 0 }, /* 6 */
-	{  0, 128, 48,  CT_GOODS,      160, 150, 4, 1 }, /* 7 */
-	{  0, 144, 80,  CT_GOODS,      190, 113, 4, 1 }, /* 8 */
-	{  0, 128, 48,  CT_GOODS,      160, 150, 4, 1 }, /* 9 */
-	{  0, 144, 80,  CT_GOODS,      190, 113, 4, 1 }, /* 10 */
+/* I hope I got the cargo types right, figuring out which is which for which
+ * climate is a bitch */
+RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES] = {
+	// image_index       sfx                                 max_speed
+	// |    base_cost    |                                   |   capacity
+	// |    |    running_cost                                |   |  cargo_type
+	// |    |    |       |                                   |   |  |
+	{  0, 120,  91, SND_19_BUS_START_PULL_AWAY,            112, 31, CT_PASSENGERS   }, /*  0 */
+	{ 17, 140, 128, SND_1C_TRUCK_START_2,                  176, 35, CT_PASSENGERS   }, /*  1 */
+	{ 17, 150, 178, SND_1B_TRUCK_START,                    224, 37, CT_PASSENGERS   }, /*  2 */
+	{ 34, 160, 240, SND_1B_TRUCK_START,                    255, 40, CT_PASSENGERS   }, /*  3 */
+	{ 51, 120,  91, SND_3C_COMEDY_CAR,                     112, 30, CT_PASSENGERS   }, /*  4 */
+	{ 51, 140, 171, SND_3E_COMEDY_CAR_2,                   192, 35, CT_PASSENGERS   }, /*  5 */
+	{ 51, 160, 240, SND_3C_COMEDY_CAR,                     240, 38, CT_PASSENGERS   }, /*  6 */
+	{  1, 108,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_COAL         }, /*  7 */
+	{ 18, 128, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_COAL         }, /*  8 */
+	{ 35, 138, 240, SND_19_BUS_START_PULL_AWAY,            224, 28, CT_COAL         }, /*  9 */
+	{  2, 115,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_MAIL         }, /* 10 */
+	{ 19, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 28, CT_MAIL         }, /* 11 */
+	{ 36, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 30, CT_MAIL         }, /* 12 */
+	{ 57, 115,  90, SND_3E_COMEDY_CAR_2,                    96, 22, CT_MAIL         }, /* 13 */
+	{ 57, 135, 168, SND_3C_COMEDY_CAR,                     176, 28, CT_MAIL         }, /* 14 */
+	{ 57, 145, 240, SND_3E_COMEDY_CAR_2,                   224, 30, CT_MAIL         }, /* 15 */
+	{  3, 110,  90, SND_19_BUS_START_PULL_AWAY,             96, 21, CT_OIL          }, /* 16 */
+	{ 20, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_OIL          }, /* 17 */
+	{ 37, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_OIL          }, /* 18 */
+	{  4, 105,  90, SND_19_BUS_START_PULL_AWAY,             96, 14, CT_LIVESTOCK    }, /* 19 */
+	{ 21, 130, 168, SND_19_BUS_START_PULL_AWAY,            176, 16, CT_LIVESTOCK    }, /* 20 */
+	{ 38, 140, 240, SND_19_BUS_START_PULL_AWAY,            224, 18, CT_LIVESTOCK    }, /* 21 */
+	{  5, 107,  90, SND_19_BUS_START_PULL_AWAY,             96, 14, CT_GOODS        }, /* 22 */
+	{ 22, 130, 168, SND_19_BUS_START_PULL_AWAY,            176, 16, CT_GOODS        }, /* 23 */
+	{ 39, 140, 240, SND_19_BUS_START_PULL_AWAY,            224, 18, CT_GOODS        }, /* 24 */
+	{  6, 114,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_GRAIN        }, /* 25 */
+	{ 23, 133, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_GRAIN        }, /* 26 */
+	{ 40, 143, 240, SND_19_BUS_START_PULL_AWAY,            224, 30, CT_GRAIN        }, /* 27 */
+	{  7, 118,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_WOOD         }, /* 28 */
+	{ 24, 137, 168, SND_19_BUS_START_PULL_AWAY,            176, 22, CT_WOOD         }, /* 29 */
+	{ 41, 147, 240, SND_19_BUS_START_PULL_AWAY,            224, 24, CT_WOOD         }, /* 30 */
+	{  8, 121,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_IRON_ORE     }, /* 31 */
+	{ 25, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_IRON_ORE     }, /* 32 */
+	{ 42, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_IRON_ORE     }, /* 33 */
+	{  9, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 15, CT_STEEL        }, /* 34 */
+	{ 26, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 18, CT_STEEL        }, /* 35 */
+	{ 43, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 20, CT_STEEL        }, /* 36 */
+	{ 10, 145,  90, SND_19_BUS_START_PULL_AWAY,             96, 12, CT_VALUABLES    }, /* 37 */
+	{ 27, 170, 168, SND_19_BUS_START_PULL_AWAY,            176, 15, CT_VALUABLES    }, /* 38 */
+	{ 44, 180, 240, SND_19_BUS_START_PULL_AWAY,            224, 16, CT_VALUABLES    }, /* 39 */
+	{ 11, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 17, CT_FOOD         }, /* 40 */
+	{ 28, 134, 168, SND_19_BUS_START_PULL_AWAY,            176, 20, CT_FOOD         }, /* 41 */
+	{ 45, 144, 240, SND_19_BUS_START_PULL_AWAY,            224, 22, CT_FOOD         }, /* 42 */
+	{ 12, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 15, CT_PAPER        }, /* 43 */
+	{ 29, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 18, CT_PAPER        }, /* 44 */
+	{ 46, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 20, CT_PAPER        }, /* 45 */
+	{ 13, 121,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_COPPER_ORE   }, /* 46 */
+	{ 30, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_COPPER_ORE   }, /* 47 */
+	{ 47, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_COPPER_ORE   }, /* 48 */
+	{ 14, 111,  90, SND_19_BUS_START_PULL_AWAY,             96, 21, CT_WATER        }, /* 49 */
+	{ 31, 141, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_WATER        }, /* 50 */
+	{ 48, 151, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_WATER        }, /* 51 */
+	{ 15, 118,  90, SND_19_BUS_START_PULL_AWAY,             96, 18, CT_FRUIT        }, /* 52 */
+	{ 32, 148, 168, SND_19_BUS_START_PULL_AWAY,            176, 20, CT_FRUIT        }, /* 53 */
+	{ 49, 158, 240, SND_19_BUS_START_PULL_AWAY,            224, 23, CT_FRUIT        }, /* 54 */
+	{ 16, 117,  90, SND_19_BUS_START_PULL_AWAY,             96, 17, CT_RUBBER       }, /* 55 */
+	{ 33, 147, 168, SND_19_BUS_START_PULL_AWAY,            176, 19, CT_RUBBER       }, /* 56 */
+	{ 50, 157, 240, SND_19_BUS_START_PULL_AWAY,            224, 22, CT_RUBBER       }, /* 57 */
+	{ 52, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_SUGAR        }, /* 58 */
+	{ 52, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_SUGAR        }, /* 59 */
+	{ 52, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_SUGAR        }, /* 60 */
+	{ 53, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_COLA         }, /* 61 */
+	{ 53, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_COLA         }, /* 62 */
+	{ 53, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_COLA         }, /* 63 */
+	{ 54, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_COTTON_CANDY }, /* 64 */
+	{ 54, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_COTTON_CANDY }, /* 65 */
+	{ 54, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_COTTON_CANDY }, /* 66 */
+	{ 55, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_TOFFEE       }, /* 67 */
+	{ 55, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_TOFFEE       }, /* 68 */
+	{ 55, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_TOFFEE       }, /* 69 */
+	{ 56, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_TOYS         }, /* 70 */
+	{ 56, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_TOYS         }, /* 71 */
+	{ 56, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_TOYS         }, /* 72 */
+	{ 58, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_CANDY        }, /* 73 */
+	{ 58, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_CANDY        }, /* 74 */
+	{ 58, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_CANDY        }, /* 75 */
+	{ 59, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_BATTERIES    }, /* 76 */
+	{ 59, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_BATTERIES    }, /* 77 */
+	{ 59, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_BATTERIES    }, /* 78 */
+	{ 60, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_FIZZY_DRINKS }, /* 79 */
+	{ 60, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_FIZZY_DRINKS }, /* 80 */
+	{ 60, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_FIZZY_DRINKS }, /* 81 */
+	{ 61, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_PLASTIC      }, /* 82 */
+	{ 61, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_PLASTIC      }, /* 83 */
+	{ 61, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_PLASTIC      }, /* 84 */
+	{ 62, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_BUBBLES      }, /* 85 */
+	{ 62, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_BUBBLES      }, /* 86 */
+	{ 62, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_BUBBLES      }, /* 87 */
 };
+
+#endif /* ENGINES_H */