cpp/openttd-patchpack/source Changeset - r11362:d9d4adbc4779

Changeset - r11362:d9d4adbc4779

Parent rev.

Child rev.

[Not reviewed]

master

0 11 0

rubidium - 15 years ago 2009-03-15 00:03:27
rubidium@openttd.org

(svn r15717) -Cleanup: apply some documentation coding style upon the stuff in table/

11 files changed with 1054 insertions and 1054 deletions:

src/table/autorail.h

src/table/elrail_data.h

src/table/engines.h

419

src/table/namegen.h

src/table/palettes.h

src/table/railtypes.h

src/table/sprites.h

src/table/station_land.h

113

src/table/town_land.h

110

src/table/tree_land.h

196

src/table/unicode.h

0 comments (0 inline, 0 general)

src/table/autorail.h

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
  *   0      1      2      3     4     5
  */
-// mark invalid tiles red
+/* mark invalid tiles red */
 #define RED(c) -c
 // table maps each of the six rail directions and tileh combinations to a sprite
 // invalid entries are required to make sure that this array can be quickly accessed
 /* table maps each of the six rail directions and tileh combinations to a sprite
  * invalid entries are required to make sure that this array can be quickly accessed */
 static const int _AutorailTilehSprite[][6] = {
-// type   0        1        2        3        4        5
+/* type   0        1        2        3        4        5 */
 	{       0,       8,      16,      25,      34,      42 }, // tileh = 0
 	{       5,      13, RED(22), RED(31),      35,      42 }, // tileh = 1
 	{       5,      10,      16,      26, RED(38), RED(46) }, // tileh = 2
@@ @@ -52,8 +52,8 @@ static const int _AutorailTilehSprite[][ @@
 #undef RED
 // maps each pixel of a tile (16x16) to a selection type
 // (0,0) is the top corner, (16,16) the bottom corner
 /* maps each pixel of a tile (16x16) to a selection type
  * (0,0) is the top corner, (16,16) the bottom corner */
 static const HighLightStyle _autorail_piece[][16] = {
 	{ HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_X, HT_DIR_X, HT_DIR_X, HT_DIR_X, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR },
 	{ HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_HU, HT_DIR_X, HT_DIR_X, HT_DIR_X, HT_DIR_X, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR, HT_DIR_VR },

src/table/elrail_data.h

➞

Show inline comments

@@ @@ -50,12 +50,12 @@ static byte OwnedPPPonPCP[DIAGDIR_END] = @@
 /** Maps a track bit onto two PCP positions */
 static const DiagDirection PCPpositions[TRACK_END][2] = {
 	{DIAGDIR_NE, DIAGDIR_SW}, /* X */
 	{DIAGDIR_SE, DIAGDIR_NW}, /* Y */
 	{DIAGDIR_NW, DIAGDIR_NE}, /* UPPER */
 	{DIAGDIR_SE, DIAGDIR_SW}, /* LOWER */
 	{DIAGDIR_SW, DIAGDIR_NW}, /* LEFT */
 	{DIAGDIR_NE, DIAGDIR_SE}, /* RIGHT */
 	{DIAGDIR_NE, DIAGDIR_SW}, // X
 	{DIAGDIR_SE, DIAGDIR_NW}, // Y
 	{DIAGDIR_NW, DIAGDIR_NE}, // UPPER
 	{DIAGDIR_SE, DIAGDIR_SW}, // LOWER
 	{DIAGDIR_SW, DIAGDIR_NW}, // LEFT
 	{DIAGDIR_NE, DIAGDIR_SE}, // RIGHT
 };
 #define PCP_NOT_ON_TRACK 0xFF
@@ @@ -64,32 +64,32 @@ static const DiagDirection PCPpositions[ @@
  * which are not on either end of the track are fully preferred.
  * @see PCPpositions */
 static byte PreferredPPPofTrackAtPCP[TRACK_END][DIAGDIR_END] = {
 	{    /* X */
 << DIR_NE | 1 << DIR_SE | 1 << DIR_NW, /* NE */
 		PCP_NOT_ON_TRACK,                        /* SE */
 << DIR_SE | 1 << DIR_SW | 1 << DIR_NW, /* SW */
 		PCP_NOT_ON_TRACK                         /* NE */
 	}, { /* Y */
 	{    // X
 << DIR_NE | 1 << DIR_SE | 1 << DIR_NW, // NE
 		PCP_NOT_ON_TRACK,                        // SE
 << DIR_SE | 1 << DIR_SW | 1 << DIR_NW, // SW
 		PCP_NOT_ON_TRACK                         // NE
 	}, { // Y
 		PCP_NOT_ON_TRACK,
 << DIR_NE | 1 << DIR_SE | 1 << DIR_SW,
 		PCP_NOT_ON_TRACK,
 << DIR_SW | 1 << DIR_NW | 1 << DIR_NE
-	}, { /* UPPER */
+	}, { // UPPER
 << DIR_E | 1 << DIR_N | 1 << DIR_S,
 		PCP_NOT_ON_TRACK,
 		PCP_NOT_ON_TRACK,
 << DIR_W | 1 << DIR_N | 1 << DIR_S
-	}, { /* LOWER */
+	}, { // LOWER
 		PCP_NOT_ON_TRACK,
 << DIR_E | 1 << DIR_N | 1 << DIR_S,
 << DIR_W | 1 << DIR_N | 1 << DIR_S,
 		PCP_NOT_ON_TRACK
-	}, { /* LEFT */
+	}, { // LEFT
 		PCP_NOT_ON_TRACK,
 		PCP_NOT_ON_TRACK,
 << DIR_S | 1 << DIR_E | 1 << DIR_W,
 << DIR_N | 1 << DIR_E | 1 << DIR_W
-	}, { /* RIGHT */
+	}, { // RIGHT
 << DIR_N | 1 << DIR_E | 1 << DIR_W,
 << DIR_S | 1 << DIR_E | 1 << DIR_W,
 		PCP_NOT_ON_TRACK,
@@ @@ -105,30 +105,30 @@ static byte PreferredPPPofTrackAtPCP[TRA @@
  * so there are certain tiles which we ignore. A straight line is found if
  * we have exactly two PPPs. */
 static byte IgnoredPCP[NUM_IGNORE_GROUPS][TLG_END][DIAGDIR_END] = {
 	{   /* Ignore group 1, X and Y tracks */
 		{     /* X even, Y even */
 	{   // Ignore group 1, X and Y tracks
 		{     // X even, Y even
 			IGNORE_NONE,
 << DIR_NE | 1 << DIR_SW,
 << DIR_NW | 1 << DIR_SE,
 			IGNORE_NONE
-		}, { /* X even, Y odd  */
+		}, { // X even, Y odd
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_NW | 1 << DIR_SE,
 << DIR_NE | 1 << DIR_SW
-		}, { /* X odd,  Y even */
+		}, { // X odd,  Y even
 << DIR_NW | 1 << DIR_SE,
 << DIR_NE | 1 << DIR_SW,
 			IGNORE_NONE,
 			IGNORE_NONE
-		}, { /* X odd,  Y odd  */
+		}, { // X odd,  Y odd
 << DIR_NW | 1 << DIR_SE,
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_NE | 1 << DIR_SW
+		}
 	},
-	{   /* Ignore group 2, LEFT and RIGHT tracks */
+	{   // Ignore group 2, LEFT and RIGHT tracks
+		{
 << DIR_E | 1 << DIR_W,
 			IGNORE_NONE,
@@ @@ -151,7 +151,7 @@ static byte IgnoredPCP[NUM_IGNORE_GROUPS @@
 << DIR_E | 1 << DIR_W
+		}
 	},
-	{   /* Ignore group 3, UPPER and LOWER tracks */
+	{   // Ignore group 3, UPPER and LOWER tracks
+		{
 << DIR_N | 1 << DIR_S,
 << DIR_N | 1 << DIR_S,
@@ @@ -180,12 +180,12 @@ static byte IgnoredPCP[NUM_IGNORE_GROUPS @@
 /** Which pylons can definately NOT be built */
 static byte DisallowedPPPofTrackAtPCP[TRACK_END][DIAGDIR_END] = {
 	{1 << DIR_SW | 1 << DIR_NE, 0,           1 << DIR_SW | 1 << DIR_NE, 0          }, /* X */
 	{0,           1 << DIR_NW | 1 << DIR_SE, 0,           1 << DIR_NW | 1 << DIR_SE}, /* Y */
 	{1 << DIR_W | 1 << DIR_E,  0,           0,           1 << DIR_W | 1 << DIR_E }, /* UPPER */
 	{0,           1 << DIR_W | 1 << DIR_E,  1 << DIR_W | 1 << DIR_E,  0          }, /* LOWER */
 	{0,           0,           1 << DIR_S | 1 << DIR_N,  1 << DIR_N | 1 << DIR_S }, /* LEFT */
 	{1 << DIR_S | 1 << DIR_N,  1 << DIR_S | 1 << DIR_N,  0,           0,         }, /* RIGHT */
 	{1 << DIR_SW | 1 << DIR_NE, 0,           1 << DIR_SW | 1 << DIR_NE, 0          }, // X
 	{0,           1 << DIR_NW | 1 << DIR_SE, 0,           1 << DIR_NW | 1 << DIR_SE}, // Y
 	{1 << DIR_W | 1 << DIR_E,  0,           0,           1 << DIR_W | 1 << DIR_E }, // UPPER
 	{0,           1 << DIR_W | 1 << DIR_E,  1 << DIR_W | 1 << DIR_E,  0          }, // LOWER
 	{0,           0,           1 << DIR_S | 1 << DIR_N,  1 << DIR_N | 1 << DIR_S }, // LEFT
 	{1 << DIR_S | 1 << DIR_N,  1 << DIR_S | 1 << DIR_N,  0,           0,         }, // RIGHT
 };
 /* This array stores which track bits can meet at a tile edge */
@@ @@ -206,27 +206,27 @@ static const TileSource TrackSourceTile[ @@
 };
 /* Several PPPs maybe exist, here they are sorted in order of preference. */
 static const Direction PPPorder[DIAGDIR_END][TLG_END][DIR_END] = {    /*  X  -  Y  */
 	{   /* PCP 0 */
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_N, DIR_E, DIR_S, DIR_W}, /* evn - evn */
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_S, DIR_W, DIR_N, DIR_E}, /* evn - odd */
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_S, DIR_W, DIR_N, DIR_E}, /* odd - evn */
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_N, DIR_E, DIR_S, DIR_W}, /* odd - odd */
 	}, {/* PCP 1 */
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_S, DIR_E, DIR_N, DIR_W}, /* evn - evn */
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_N, DIR_W, DIR_S, DIR_E}, /* evn - odd */
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_N, DIR_W, DIR_S, DIR_E}, /* odd - evn */
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_S, DIR_E, DIR_N, DIR_W}, /* odd - odd */
 	}, {/* PCP 2 */
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_S, DIR_W, DIR_N, DIR_E}, /* evn - evn */
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_N, DIR_E, DIR_S, DIR_W}, /* evn - odd */
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_N, DIR_E, DIR_S, DIR_W}, /* odd - evn */
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_S, DIR_W, DIR_N, DIR_E}, /* odd - odd */
 	}, {/* PCP 3 */
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_N, DIR_W, DIR_S, DIR_E}, /* evn - evn */
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_S, DIR_E, DIR_N, DIR_W}, /* evn - odd */
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_S, DIR_E, DIR_N, DIR_W}, /* odd - evn */
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_N, DIR_W, DIR_S, DIR_E}, /* odd - odd */
 static const Direction PPPorder[DIAGDIR_END][TLG_END][DIR_END] = {    //  X  -  Y
 	{   // PCP 0
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_N, DIR_E, DIR_S, DIR_W}, // evn - evn
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_S, DIR_W, DIR_N, DIR_E}, // evn - odd
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_S, DIR_W, DIR_N, DIR_E}, // odd - evn
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_N, DIR_E, DIR_S, DIR_W}, // odd - odd
 	}, {// PCP 1
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_S, DIR_E, DIR_N, DIR_W}, // evn - evn
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_N, DIR_W, DIR_S, DIR_E}, // evn - odd
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_N, DIR_W, DIR_S, DIR_E}, // odd - evn
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_S, DIR_E, DIR_N, DIR_W}, // odd - odd
 	}, {// PCP 2
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_S, DIR_W, DIR_N, DIR_E}, // evn - evn
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_N, DIR_E, DIR_S, DIR_W}, // evn - odd
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_N, DIR_E, DIR_S, DIR_W}, // odd - evn
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_S, DIR_W, DIR_N, DIR_E}, // odd - odd
 	}, {// PCP 3
 		{DIR_NE, DIR_NW, DIR_SE, DIR_SW, DIR_N, DIR_W, DIR_S, DIR_E}, // evn - evn
 		{DIR_NE, DIR_SE, DIR_SW, DIR_NW, DIR_S, DIR_E, DIR_N, DIR_W}, // evn - odd
 		{DIR_SW, DIR_NW, DIR_NE, DIR_SE, DIR_S, DIR_E, DIR_N, DIR_W}, // odd - evn
 		{DIR_SW, DIR_SE, DIR_NE, DIR_NW, DIR_N, DIR_W, DIR_S, DIR_E}, // odd - odd
+	}
 };
 /* Geometric placement of the PCP relative to the tile origin */
@@ @@ -317,41 +317,41 @@ enum { @@
 };
 static const SortableSpriteStruct CatenarySpriteData[] = {
 /* X direction */
 	/* Flat tiles: */
 		/* Wires */
 /* X direction
 	 * Flat tiles:
 		 * Wires */
 	{ WSO_X_SW,          0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! 0: Wire in X direction, pylon on the SW end only
 	{ WSO_X_NE,          0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! 1: Wire in X direction, pylon on the NE end
 	{ WSO_X_SHORT,       0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! 2: Wire in X direction, pylon on both ends
 	/* "up" tiles */
 		/* Wires */
 	/* "up" tiles
 		 * Wires */
 	{ WSO_X_SW_UP,       0,  7, 15,  8,  1, ELRAIL_ELEVRAISE }, //! 3: Wire in X pitch up, pylon on the SW end only
 	{ WSO_X_NE_UP,       0,  7, 15,  8,  1, ELRAIL_ELEVRAISE }, //! 4: Wire in X pitch up, pylon on the NE end
 	{ WSO_X_SHORT_UP,    0,  7, 15,  8,  1, ELRAIL_ELEVRAISE }, //! 5: Wire in X pitch up, pylon on both ends
 	/* "down" tiles */
 		/* Wires */
 	/* "down" tiles
 		 * Wires */
 	{ WSO_X_SW_DOWN,     0,  7, 15,  8,  1, ELRAIL_ELEVATION }, //! 6: Wire in X pitch down, pylon on the SW end
 	{ WSO_X_NE_DOWN,     0,  7, 15,  8,  1, ELRAIL_ELEVATION }, //! 7: Wire in X pitch down, pylon on the NE end
 	{ WSO_X_SHORT_DOWN,  0,  7, 15,  8,  1, ELRAIL_ELEVATION }, //! 8: Wire in X pitch down, pylon on both ends
 /* Y direction */
 	/* Flat tiles: */
 		/* Wires */
 /* Y direction
 	 * Flat tiles:
 		 * Wires */
 	{ WSO_Y_SE,          7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //! 9: Wire in Y direction, pylon on the SE end only
 	{ WSO_Y_NW,          7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //!10: Wire in Y direction, pylon on the NW end
 	{ WSO_Y_SHORT,       7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //!11: Wire in Y direction, pylon on both ends
 	/* "up" tiles */
 		/* Wires */
 	/* "up" tiles
 		 * Wires */
 	{ WSO_Y_SE_UP,       7,  0,  8, 15,  1, ELRAIL_ELEVRAISE }, //!12: Wire in Y pitch up, pylon on the SE end only
 	{ WSO_Y_NW_UP,       7,  0,  8, 15,  1, ELRAIL_ELEVRAISE }, //!13: Wire in Y pitch up, pylon on the NW end
 	{ WSO_Y_SHORT_UP,    7,  0,  8, 15,  1, ELRAIL_ELEVRAISE }, //!14: Wire in Y pitch up, pylon on both ends
 	/* "down" tiles */
 		/* Wires */
 	/* "down" tiles
 		 * Wires */
 	{ WSO_Y_SE_DOWN,     7,  0,  8, 15,  1, ELRAIL_ELEVATION }, //!15: Wire in Y pitch down, pylon on the SE end
 	{ WSO_Y_NW_DOWN,     7,  0,  8, 15,  1, ELRAIL_ELEVATION }, //!16: Wire in Y pitch down, pylon on the NW end
 	{ WSO_Y_SHORT_DOWN,  7,  0,  8, 15,  1, ELRAIL_ELEVATION }, //!17: Wire in Y pitch down, pylon on both ends
@@ @@ -456,35 +456,35 @@ enum CatenarySprite { @@
  * d) both
  * PCP exists.*/
 static const CatenarySprite Wires[5][TRACK_END][4] = {
-	{ /* Tileh == 0 */
+	{ // Tileh == 0
 		{INVALID_CATENARY, WIRE_X_FLAT_NE,   WIRE_X_FLAT_SW,   WIRE_X_FLAT_BOTH},
 		{INVALID_CATENARY, WIRE_Y_FLAT_SE,   WIRE_Y_FLAT_NW,   WIRE_Y_FLAT_BOTH},
 		{INVALID_CATENARY, WIRE_EW_N_W,      WIRE_EW_N_E,      WIRE_EW_N_BOTH},
 		{INVALID_CATENARY, WIRE_EW_S_E,      WIRE_EW_S_W,      WIRE_EW_S_BOTH},
 		{INVALID_CATENARY, WIRE_NS_W_S,      WIRE_NS_W_N,      WIRE_NS_W_BOTH},
 		{INVALID_CATENARY, WIRE_NS_E_N,      WIRE_NS_E_S,      WIRE_NS_E_BOTH},
-	}, { /* Tileh == 3 */
+	}, { // Tileh == 3
 		{INVALID_CATENARY, WIRE_X_UP_NE,     WIRE_X_UP_SW,     WIRE_X_UP_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
-	}, { /* Tileh == 6 */
+	}, { // Tileh == 6
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, WIRE_Y_UP_SE,     WIRE_Y_UP_NW,     WIRE_Y_UP_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
-	}, { /* Tileh == 9 */
+	}, { // Tileh == 9
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, WIRE_Y_DOWN_SE,   WIRE_Y_DOWN_NW,   WIRE_Y_DOWN_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
-	}, { /* Tileh == 12 */
+	}, { // Tileh == 12
 		{INVALID_CATENARY, WIRE_X_DOWN_NE,   WIRE_X_DOWN_SW,   WIRE_X_DOWN_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},

src/table/engines.h

➞

Show inline comments

@@ @@ -60,272 +60,272 @@ enum { @@
  */
 #define MA(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 20, e, 0, 8, 0, 0, 0, STR_EMPTY }
 // Climates
 // T = Temperate
 // A = Arctic
 // S = Sub-Tropic
 // Y = Toyland
 /* Climates
  * T = Temperate
  * A = Arctic
  * S = Sub-Tropic
  * Y = Toyland */
 #define T 1
 #define A 2
 #define S 4
 #define Y 8
 static const EngineInfo _orig_engine_info[] = {
 	MK(  1827,  20,  15,  30, T      ), /*   0 Kirby Paul Tank (Steam) */
 	MK( 12784,  20,  22,  30,   A|S  ), /*   1 MJS 250 (Diesel) */
 	MK(  9497,  20,  20,  50,       Y), /*   2 Ploddyphut Choo-Choo */
 	MK( 11688,  20,  20,  30,       Y), /*   3 Powernaut Choo-Choo */
 	MK( 16802,  20,  20,  30,       Y), /*   4 Mightymover Choo-Choo */
 	MK( 18993,  20,  20,  30,       Y), /*   5 Ploddyphut Diesel */
 	MK( 20820,  20,  20,  30,       Y), /*   6 Powernaut Diesel */
 	MK(  8766,  20,  20,  30,   A|S  ), /*   7 Wills 2-8-0 (Steam) */
 	MK(  5114,  20,  21,  30, T      ), /*   8 Chaney 'Jubilee' (Steam) */
 	MK(  5479,  20,  20,  30, T      ), /*   9 Ginzu 'A4' (Steam) */
 	MK( 12419,  20,  23,  25, T      ), /*  10 SH '8P' (Steam) */
 	MK( 13149,  20,  12,  30, T      ), /*  11 Manley-Morel DMU (Diesel) */
 	MK( 23376,  20,  15,  35, T      ), /*  12 'Dash' (Diesel) */
 	MK( 14976,  20,  18,  28, T      ), /*  13 SH/Hendry '25' (Diesel) */
 	MK( 14245,  20,  20,  30, T      ), /*  14 UU '37' (Diesel) */
 	MK( 15341,  20,  22,  33, T      ), /*  15 Floss '47' (Diesel) */
 	MK( 14976,  20,  20,  25,   A|S  ), /*  16 CS 4000 (Diesel) */
 	MK( 16437,  20,  20,  30,   A|S  ), /*  17 CS 2400 (Diesel) */
 	MK( 18993,  20,  22,  30,   A|S  ), /*  18 Centennial (Diesel) */
 	MK( 13880,  20,  22,  30,   A|S  ), /*  19 Kelling 3100 (Diesel) */
 	MK( 20454,  20,  22,  30,   A|S  ), /*  20 Turner Turbo (Diesel) */
 	MK( 16071,  20,  22,  30,   A|S  ), /*  21 MJS 1000 (Diesel) */
 	MK( 20820,  20,  20,  25, T      ), /*  22 SH '125' (Diesel) */
 	MK( 16437,  20,  23,  30, T      ), /*  23 SH '30' (Electric) */
 	MK( 19359,  20,  23,  80, T      ), /*  24 SH '40' (Electric) */
 	MK( 23376,  20,  25,  30, T      ), /*  25 'T.I.M.' (Electric) */
 	MK( 26298,  20,  25,  50, T      ), /*  26 'AsiaStar' (Electric) */
 	MW(  1827,  20,  20,  50, T|A|S|Y), /*  27 Passenger Carriage */
 	MW(  1827,  20,  20,  50, T|A|S|Y), /*  28 Mail Van */
 	MW(  1827,  20,  20,  50, T|A    ), /*  29 Coal Truck */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  30 Oil Tanker */
 	MW(  1827,  20,  20,  50, T|A    ), /*  31 Livestock Van */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  32 Goods Van */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  33 Grain Hopper */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  34 Wood Truck */
 	MW(  1827,  20,  20,  50, T      ), /*  35 Iron Ore Hopper */
 	MW(  1827,  20,  20,  50, T      ), /*  36 Steel Truck */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  37 Armoured Van */
 	MW(  1827,  20,  20,  50,   A|S  ), /*  38 Food Van */
 	MW(  1827,  20,  20,  50,   A    ), /*  39 Paper Truck */
 	MW(  1827,  20,  20,  50,     S  ), /*  40 Copper Ore Hopper */
 	MW(  1827,  20,  20,  50,     S  ), /*  41 Water Tanker */
 	MW(  1827,  20,  20,  50,     S  ), /*  42 Fruit Truck */
 	MW(  1827,  20,  20,  50,     S  ), /*  43 Rubber Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  44 Sugar Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  45 Candyfloss Hopper */
 	MW(  1827,  20,  20,  50,       Y), /*  46 Toffee Hopper */
 	MW(  1827,  20,  20,  50,       Y), /*  47 Bubble Van */
 	MW(  1827,  20,  20,  50,       Y), /*  48 Cola Tanker */
 	MW(  1827,  20,  20,  50,       Y), /*  49 Sweet Van */
 	MW(  1827,  20,  20,  50,       Y), /*  50 Toy Van */
 	MW(  1827,  20,  20,  50,       Y), /*  51 Battery Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  52 Fizzy Drink Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  53 Plastic Truck */
 	MK( 28490,  20,  20,  50, T|A|S  ), /*  54 'X2001' (Electric) */
 	MK( 31047,  20,  20,  50, T|A|S  ), /*  55 'Millennium Z1' (Electric) */
 	MK( 28855,  20,  20,  50,       Y), /*  56 Wizzowow Z99 */
 	MW(  1827,  20,  20,  50, T|A|S|Y), /*  57 Passenger Carriage */
 	MW(  1827,  20,  20,  50, T|A|S|Y), /*  58 Mail Van */
 	MW(  1827,  20,  20,  50, T|A    ), /*  59 Coal Truck */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  60 Oil Tanker */
 	MW(  1827,  20,  20,  50, T|A    ), /*  61 Livestock Van */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  62 Goods Van */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  63 Grain Hopper */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  64 Wood Truck */
 	MW(  1827,  20,  20,  50, T      ), /*  65 Iron Ore Hopper */
 	MW(  1827,  20,  20,  50, T      ), /*  66 Steel Truck */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  67 Armoured Van */
 	MW(  1827,  20,  20,  50,   A|S  ), /*  68 Food Van */
 	MW(  1827,  20,  20,  50,   A    ), /*  69 Paper Truck */
 	MW(  1827,  20,  20,  50,     S  ), /*  70 Copper Ore Hopper */
 	MW(  1827,  20,  20,  50,     S  ), /*  71 Water Tanker */
 	MW(  1827,  20,  20,  50,     S  ), /*  72 Fruit Truck */
 	MW(  1827,  20,  20,  50,     S  ), /*  73 Rubber Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  74 Sugar Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  75 Candyfloss Hopper */
 	MW(  1827,  20,  20,  50,       Y), /*  76 Toffee Hopper */
 	MW(  1827,  20,  20,  50,       Y), /*  77 Bubble Van */
 	MW(  1827,  20,  20,  50,       Y), /*  78 Cola Tanker */
 	MW(  1827,  20,  20,  50,       Y), /*  79 Sweet Van */
 	MW(  1827,  20,  20,  50,       Y), /*  80 Toy Van */
 	MW(  1827,  20,  20,  50,       Y), /*  81 Battery Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  82 Fizzy Drink Truck */
 	MW(  1827,  20,  20,  50,       Y), /*  83 Plastic Truck */
 	MK( 36525,  20,  20,  50, T|A|S  ), /*  84 Lev1 'Leviathan' (Electric) */
 	MK( 39447,  20,  20,  50, T|A|S  ), /*  85 Lev2 'Cyclops' (Electric) */
 	MK( 42004,  20,  20,  50, T|A|S  ), /*  86 Lev3 'Pegasus' (Electric) */
 	MK( 42735,  20,  20,  50, T|A|S  ), /*  87 Lev4 'Chimaera' (Electric) */
 	MK( 36891,  20,  20,  60,       Y), /*  88 Wizzowow Rocketeer */
 	MW(  1827,  20,  20,  50, T|A|S|Y), /*  89 Passenger Carriage */
 	MW(  1827,  20,  20,  50, T|A|S|Y), /*  90 Mail Van */
 	MW(  1827,  20,  20,  50, T|A    ), /*  91 Coal Truck */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  92 Oil Tanker */
 	MW(  1827,  20,  20,  50, T|A    ), /*  93 Livestock Van */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  94 Goods Van */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  95 Grain Hopper */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  96 Wood Truck */
 	MW(  1827,  20,  20,  50, T      ), /*  97 Iron Ore Hopper */
 	MW(  1827,  20,  20,  50, T      ), /*  98 Steel Truck */
 	MW(  1827,  20,  20,  50, T|A|S  ), /*  99 Armoured Van */
 	MW(  1827,  20,  20,  50,   A|S  ), /* 100 Food Van */
 	MW(  1827,  20,  20,  50,   A    ), /* 101 Paper Truck */
 	MW(  1827,  20,  20,  50,     S  ), /* 102 Copper Ore Hopper */
 	MW(  1827,  20,  20,  50,     S  ), /* 103 Water Tanker */
 	MW(  1827,  20,  20,  50,     S  ), /* 104 Fruit Truck */
 	MW(  1827,  20,  20,  50,     S  ), /* 105 Rubber Truck */
 	MW(  1827,  20,  20,  50,       Y), /* 106 Sugar Truck */
 	MW(  1827,  20,  20,  50,       Y), /* 107 Candyfloss Hopper */
 	MW(  1827,  20,  20,  50,       Y), /* 108 Toffee Hopper */
 	MW(  1827,  20,  20,  50,       Y), /* 109 Bubble Van */
 	MW(  1827,  20,  20,  50,       Y), /* 110 Cola Tanker */
 	MW(  1827,  20,  20,  50,       Y), /* 111 Sweet Van */
 	MW(  1827,  20,  20,  50,       Y), /* 112 Toy Van */
 	MW(  1827,  20,  20,  50,       Y), /* 113 Battery Truck */
 	MW(  1827,  20,  20,  50,       Y), /* 114 Fizzy Drink Truck */
 	MW(  1827,  20,  20,  50,       Y), /* 115 Plastic Truck */
 	MK(  3378,  20,  12,  40, T|A|S  ), /* 116 MPS Regal Bus */
 	MK( 16071,  20,  15,  30, T|A|S  ), /* 117 Hereford Leopard Bus */
 	MK( 24107,  20,  15,  40, T|A|S  ), /* 118 Foster Bus */
 	MK( 32142,  20,  15,  80, T|A|S  ), /* 119 Foster MkII Superbus */
 	MK(  9132,  20,  15,  40,       Y), /* 120 Ploddyphut MkI Bus */
 	MK( 18993,  20,  15,  40,       Y), /* 121 Ploddyphut MkII Bus */
 	MK( 32873,  20,  15,  80,       Y), /* 122 Ploddyphut MkIII Bus */
 	MK(  5479,  20,  15,  55, T|A    ), /* 123 Balogh Coal Truck */
 	MK( 20089,  20,  15,  55, T|A    ), /* 124 Uhl Coal Truck */
 	MK( 33969,  20,  15,  85, T|A    ), /* 125 DW Coal Truck */
 	MK(  5479,  20,  15,  55, T|A|S  ), /* 126 MPS Mail Truck */
 	MK( 21550,  20,  15,  55, T|A|S  ), /* 127 Reynard Mail Truck */
 	MK( 35795,  20,  15,  85, T|A|S  ), /* 128 Perry Mail Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 129 MightyMover Mail Truck */
 	MK( 21550,  20,  15,  55,       Y), /* 130 Powernaught Mail Truck */
 	MK( 35795,  20,  15,  85,       Y), /* 131 Wizzowow Mail Truck */
 	MK(  5479,  20,  15,  55, T|A|S  ), /* 132 Witcombe Oil Tanker */
 	MK( 19359,  20,  15,  55, T|A|S  ), /* 133 Foster Oil Tanker */
 	MK( 31047,  20,  15,  85, T|A|S  ), /* 134 Perry Oil Tanker */
 	MK(  5479,  20,  15,  55, T|A    ), /* 135 Talbott Livestock Van */
 	MK( 21915,  20,  15,  55, T|A    ), /* 136 Uhl Livestock Van */
 	MK( 37256,  20,  15,  85, T|A    ), /* 137 Foster Livestock Van */
 	MK(  5479,  20,  15,  55, T|A|S  ), /* 138 Balogh Goods Truck */
 	MK( 19724,  20,  15,  55, T|A|S  ), /* 139 Craighead Goods Truck */
 	MK( 31047,  20,  15,  85, T|A|S  ), /* 140 Goss Goods Truck */
 	MK(  5479,  20,  15,  55, T|A|S  ), /* 141 Hereford Grain Truck */
 	MK( 21185,  20,  15,  55, T|A|S  ), /* 142 Thomas Grain Truck */
 	MK( 32873,  20,  15,  85, T|A|S  ), /* 143 Goss Grain Truck */
 	MK(  5479,  20,  15,  55, T|A|S  ), /* 144 Witcombe Wood Truck */
 	MK( 19724,  20,  15,  55, T|A|S  ), /* 145 Foster Wood Truck */
 	MK( 35430,  20,  15,  85, T|A|S  ), /* 146 Moreland Wood Truck */
 	MK(  5479,  20,  15,  55, T      ), /* 147 MPS Iron Ore Truck */
 	MK( 20820,  20,  15,  55, T      ), /* 148 Uhl Iron Ore Truck */
 	MK( 33238,  20,  15,  85, T      ), /* 149 Chippy Iron Ore Truck */
 	MK(  5479,  20,  15,  55, T      ), /* 150 Balogh Steel Truck */
 	MK( 21185,  20,  15,  55, T      ), /* 151 Uhl Steel Truck */
 	MK( 31777,  20,  15,  85, T      ), /* 152 Kelling Steel Truck */
 	MK(  5479,  20,  15,  55, T|A|S  ), /* 153 Balogh Armoured Truck */
 	MK( 22281,  20,  15,  55, T|A|S  ), /* 154 Uhl Armoured Truck */
 	MK( 33603,  20,  15,  85, T|A|S  ), /* 155 Foster Armoured Truck */
 	MK(  5479,  20,  15,  55,   A|S  ), /* 156 Foster Food Van */
 	MK( 18628,  20,  15,  55,   A|S  ), /* 157 Perry Food Van */
 	MK( 30681,  20,  15,  85,   A|S  ), /* 158 Chippy Food Van */
 	MK(  5479,  20,  15,  55,   A    ), /* 159 Uhl Paper Truck */
 	MK( 21185,  20,  15,  55,   A    ), /* 160 Balogh Paper Truck */
 	MK( 31777,  20,  15,  85,   A    ), /* 161 MPS Paper Truck */
 	MK(  5479,  20,  15,  55,     S  ), /* 162 MPS Copper Ore Truck */
 	MK( 20820,  20,  15,  55,     S  ), /* 163 Uhl Copper Ore Truck */
 	MK( 33238,  20,  15,  85,     S  ), /* 164 Goss Copper Ore Truck */
 	MK(  5479,  20,  15,  55,     S  ), /* 165 Uhl Water Tanker */
 	MK( 20970,  20,  15,  55,     S  ), /* 166 Balogh Water Tanker */
 	MK( 33388,  20,  15,  85,     S  ), /* 167 MPS Water Tanker */
 	MK(  5479,  20,  15,  55,     S  ), /* 168 Balogh Fruit Truck */
 	MK( 21335,  20,  15,  55,     S  ), /* 169 Uhl Fruit Truck */
 	MK( 33753,  20,  15,  85,     S  ), /* 170 Kelling Fruit Truck */
 	MK(  5479,  20,  15,  55,     S  ), /* 171 Balogh Rubber Truck */
 	MK( 20604,  20,  15,  55,     S  ), /* 172 Uhl Rubber Truck */
 	MK( 33023,  20,  15,  85,     S  ), /* 173 RMT Rubber Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 174 MightyMover Sugar Truck */
 	MK( 19724,  20,  15,  55,       Y), /* 175 Powernaught Sugar Truck */
 	MK( 33238,  20,  15,  85,       Y), /* 176 Wizzowow Sugar Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 177 MightyMover Cola Truck */
 	MK( 20089,  20,  15,  55,       Y), /* 178 Powernaught Cola Truck */
 	MK( 33603,  20,  15,  85,       Y), /* 179 Wizzowow Cola Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 180 MightyMover Candyfloss Truck */
 	MK( 20454,  20,  15,  55,       Y), /* 181 Powernaught Candyfloss Truck */
 	MK( 33969,  20,  15,  85,       Y), /* 182 Wizzowow Candyfloss Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 183 MightyMover Toffee Truck */
 	MK( 20820,  20,  15,  55,       Y), /* 184 Powernaught Toffee Truck */
 	MK( 34334,  20,  15,  85,       Y), /* 185 Wizzowow Toffee Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 186 MightyMover Toy Van */
 	MK( 21185,  20,  15,  55,       Y), /* 187 Powernaught Toy Van */
 	MK( 34699,  20,  15,  85,       Y), /* 188 Wizzowow Toy Van */
 	MK(  5479,  20,  15,  55,       Y), /* 189 MightyMover Sweet Truck */
 	MK( 21550,  20,  15,  55,       Y), /* 190 Powernaught Sweet Truck */
 	MK( 35064,  20,  15,  85,       Y), /* 191 Wizzowow Sweet Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 192 MightyMover Battery Truck */
 	MK( 19874,  20,  15,  55,       Y), /* 193 Powernaught Battery Truck */
 	MK( 35430,  20,  15,  85,       Y), /* 194 Wizzowow Battery Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 195 MightyMover Fizzy Drink Truck */
 	MK( 20239,  20,  15,  55,       Y), /* 196 Powernaught Fizzy Drink Truck */
 	MK( 35795,  20,  15,  85,       Y), /* 197 Wizzowow Fizzy Drink Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 198 MightyMover Plastic Truck */
 	MK( 20604,  20,  15,  55,       Y), /* 199 Powernaught Plastic Truck */
 	MK( 32873,  20,  15,  85,       Y), /* 200 Wizzowow Plastic Truck */
 	MK(  5479,  20,  15,  55,       Y), /* 201 MightyMover Bubble Truck */
 	MK( 20970,  20,  15,  55,       Y), /* 202 Powernaught Bubble Truck */
 	MK( 33023,  20,  15,  85,       Y), /* 203 Wizzowow Bubble Truck */
 	MS(  2922,   5,  30,  50, T|A|S  ), /* 204 MPS Oil Tanker */
 	MS( 17167,   5,  30,  90, T|A|S  ), /* 205 CS-Inc. Oil Tanker */
 	MS(  2192,   5,  30,  55, T|A|S  ), /* 206 MPS Passenger Ferry */
 	MS( 18628,   5,  30,  90, T|A|S  ), /* 207 FFP Passenger Ferry */
 	MS( 17257,  10,  25,  90, T|A|S  ), /* 208 Bakewell 300 Hovercraft */
 	MS(  9587,   5,  30,  40,       Y), /* 209 Chugger-Chug Passenger Ferry */
 	MS( 20544,   5,  30,  90,       Y), /* 210 Shivershake Passenger Ferry */
 	MS(  2557,   5,  30,  55, T|A|S  ), /* 211 Yate Cargo ship */
 	MS( 19724,   5,  30,  98, T|A|S  ), /* 212 Bakewell Cargo ship */
 	MS(  9587,   5,  30,  45,       Y), /* 213 Mightymover Cargo ship */
 	MS( 22371,   5,  30,  90,       Y), /* 214 Powernaut Cargo ship */
 	MA(  2922,  20,  20,  20, T|A|S  ), /* 215 Sampson U52 */
 	MA(  9922,  20,  24,  20, T|A|S  ), /* 216 Coleman Count */
 	MA( 12659,  20,  18,  20, T|A|S  ), /* 217 FFP Dart */
 	MA( 17652,  20,  25,  35, T|A|S  ), /* 218 Yate Haugan */
 	MA(  4929,  20,  30,  30, T|A|S  ), /* 219 Bakewell Cotswald LB-3 */
 	MA( 13695,  20,  23,  25, T|A|S  ), /* 220 Bakewell Luckett LB-8 */
 	MA( 16341,  20,  26,  30, T|A|S  ), /* 221 Bakewell Luckett LB-9 */
 	MA( 21395,  20,  25,  30, T|A|S  ), /* 222 Bakewell Luckett LB80 */
 	MA( 18263,  20,  20,  30, T|A|S  ), /* 223 Bakewell Luckett LB-10 */
 	MA( 25233,  20,  25,  30, T|A|S  ), /* 224 Bakewell Luckett LB-11 */
 	MA( 15371,  20,  22,  25, T|A|S  ), /* 225 Yate Aerospace YAC 1-11 */
 	MA( 15461,  20,  25,  25, T|A|S  ), /* 226 Darwin 100 */
 	MA( 16952,  20,  22,  25, T|A|S  ), /* 227 Darwin 200 */
 	MA( 17227,  20,  25,  30, T|A|S  ), /* 228 Darwin 300 */
 	MA( 22371,  20,  25,  35, T|A|S  ), /* 229 Darwin 400 */
 	MA( 22341,  20,  25,  30, T|A|S  ), /* 230 Darwin 500 */
 	MA( 27209,  20,  25,  30, T|A|S  ), /* 231 Darwin 600 */
 	MA( 17988,  20,  20,  30, T|A|S  ), /* 232 Guru Galaxy */
 	MA( 18993,  20,  24,  35, T|A|S  ), /* 233 Airtaxi A21 */
 	MA( 22401,  20,  24,  30, T|A|S  ), /* 234 Airtaxi A31 */
 	MA( 24472,  20,  24,  30, T|A|S  ), /* 235 Airtaxi A32 */
 	MA( 26724,  20,  24,  30, T|A|S  ), /* 236 Airtaxi A33 */
 	MA( 22005,  20,  25,  30, T|A|S  ), /* 237 Yate Aerospace YAe46 */
 	MA( 24107,  20,  20,  35, T|A|S  ), /* 238 Dinger 100 */
 	MA( 29310,  20,  25,  60, T|A|S  ), /* 239 AirTaxi A34-1000 */
 	MA( 35520,  20,  22,  30, T|A|S  ), /* 240 Yate Z-Shuttle */
 	MA( 36981,  20,  22,  30, T|A|S  ), /* 241 Kelling K1 */
 	MA( 38807,  20,  22,  50, T|A|S  ), /* 242 Kelling K6 */
 	MA( 42094,  20,  25,  30, T|A|S  ), /* 243 Kelling K7 */
 	MA( 44651,  20,  23,  30, T|A|S  ), /* 244 Darwin 700 */
 	MA( 40268,  20,  25,  30, T|A|S  ), /* 245 FFP Hyperdart 2 */
 	MA( 33693,  20,  25,  50, T|A|S  ), /* 246 Dinger 200 */
 	MA( 32963,  20,  20,  60, T|A|S  ), /* 247 Dinger 1000 */
 	MA(  9222,  20,  20,  35,       Y), /* 248 Ploddyphut 100 */
 	MA( 12874,  20,  20,  35,       Y), /* 249 Ploddyphut 500 */
 	MA( 16892,  20,  20,  35,       Y), /* 250 Flashbang X1 */
 	MA( 21275,  20,  20,  99,       Y), /* 251 Juggerplane M1 */
 	MA( 23832,  20,  20,  99,       Y), /* 252 Flashbang Wizzer */
 	MA( 13575,  20,  20,  40, T|A|S  ), /* 253 Tricario Helicopter */
 	MA( 28215,  20,  20,  30, T|A|S  ), /* 254 Guru X2 Helicopter */
 	MK( 13575,  20,  20,  99,       Y), /* 255  */
 	MK(  1827,  20,  15,  30, T      ), //   0 Kirby Paul Tank (Steam)
 	MK( 12784,  20,  22,  30,   A|S  ), //   1 MJS 250 (Diesel)
 	MK(  9497,  20,  20,  50,       Y), //   2 Ploddyphut Choo-Choo
 	MK( 11688,  20,  20,  30,       Y), //   3 Powernaut Choo-Choo
 	MK( 16802,  20,  20,  30,       Y), //   4 Mightymover Choo-Choo
 	MK( 18993,  20,  20,  30,       Y), //   5 Ploddyphut Diesel
 	MK( 20820,  20,  20,  30,       Y), //   6 Powernaut Diesel
 	MK(  8766,  20,  20,  30,   A|S  ), //   7 Wills 2-8-0 (Steam)
 	MK(  5114,  20,  21,  30, T      ), //   8 Chaney 'Jubilee' (Steam)
 	MK(  5479,  20,  20,  30, T      ), //   9 Ginzu 'A4' (Steam)
 	MK( 12419,  20,  23,  25, T      ), //  10 SH '8P' (Steam)
 	MK( 13149,  20,  12,  30, T      ), //  11 Manley-Morel DMU (Diesel)
 	MK( 23376,  20,  15,  35, T      ), //  12 'Dash' (Diesel)
 	MK( 14976,  20,  18,  28, T      ), //  13 SH/Hendry '25' (Diesel)
 	MK( 14245,  20,  20,  30, T      ), //  14 UU '37' (Diesel)
 	MK( 15341,  20,  22,  33, T      ), //  15 Floss '47' (Diesel)
 	MK( 14976,  20,  20,  25,   A|S  ), //  16 CS 4000 (Diesel)
 	MK( 16437,  20,  20,  30,   A|S  ), //  17 CS 2400 (Diesel)
 	MK( 18993,  20,  22,  30,   A|S  ), //  18 Centennial (Diesel)
 	MK( 13880,  20,  22,  30,   A|S  ), //  19 Kelling 3100 (Diesel)
 	MK( 20454,  20,  22,  30,   A|S  ), //  20 Turner Turbo (Diesel)
 	MK( 16071,  20,  22,  30,   A|S  ), //  21 MJS 1000 (Diesel)
 	MK( 20820,  20,  20,  25, T      ), //  22 SH '125' (Diesel)
 	MK( 16437,  20,  23,  30, T      ), //  23 SH '30' (Electric)
 	MK( 19359,  20,  23,  80, T      ), //  24 SH '40' (Electric)
 	MK( 23376,  20,  25,  30, T      ), //  25 'T.I.M.' (Electric)
 	MK( 26298,  20,  25,  50, T      ), //  26 'AsiaStar' (Electric)
 	MW(  1827,  20,  20,  50, T|A|S|Y), //  27 Passenger Carriage
 	MW(  1827,  20,  20,  50, T|A|S|Y), //  28 Mail Van
 	MW(  1827,  20,  20,  50, T|A    ), //  29 Coal Truck
 	MW(  1827,  20,  20,  50, T|A|S  ), //  30 Oil Tanker
 	MW(  1827,  20,  20,  50, T|A    ), //  31 Livestock Van
 	MW(  1827,  20,  20,  50, T|A|S  ), //  32 Goods Van
 	MW(  1827,  20,  20,  50, T|A|S  ), //  33 Grain Hopper
 	MW(  1827,  20,  20,  50, T|A|S  ), //  34 Wood Truck
 	MW(  1827,  20,  20,  50, T      ), //  35 Iron Ore Hopper
 	MW(  1827,  20,  20,  50, T      ), //  36 Steel Truck
 	MW(  1827,  20,  20,  50, T|A|S  ), //  37 Armoured Van
 	MW(  1827,  20,  20,  50,   A|S  ), //  38 Food Van
 	MW(  1827,  20,  20,  50,   A    ), //  39 Paper Truck
 	MW(  1827,  20,  20,  50,     S  ), //  40 Copper Ore Hopper
 	MW(  1827,  20,  20,  50,     S  ), //  41 Water Tanker
 	MW(  1827,  20,  20,  50,     S  ), //  42 Fruit Truck
 	MW(  1827,  20,  20,  50,     S  ), //  43 Rubber Truck
 	MW(  1827,  20,  20,  50,       Y), //  44 Sugar Truck
 	MW(  1827,  20,  20,  50,       Y), //  45 Candyfloss Hopper
 	MW(  1827,  20,  20,  50,       Y), //  46 Toffee Hopper
 	MW(  1827,  20,  20,  50,       Y), //  47 Bubble Van
 	MW(  1827,  20,  20,  50,       Y), //  48 Cola Tanker
 	MW(  1827,  20,  20,  50,       Y), //  49 Sweet Van
 	MW(  1827,  20,  20,  50,       Y), //  50 Toy Van
 	MW(  1827,  20,  20,  50,       Y), //  51 Battery Truck
 	MW(  1827,  20,  20,  50,       Y), //  52 Fizzy Drink Truck
 	MW(  1827,  20,  20,  50,       Y), //  53 Plastic Truck
 	MK( 28490,  20,  20,  50, T|A|S  ), //  54 'X2001' (Electric)
 	MK( 31047,  20,  20,  50, T|A|S  ), //  55 'Millennium Z1' (Electric)
 	MK( 28855,  20,  20,  50,       Y), //  56 Wizzowow Z99
 	MW(  1827,  20,  20,  50, T|A|S|Y), //  57 Passenger Carriage
 	MW(  1827,  20,  20,  50, T|A|S|Y), //  58 Mail Van
 	MW(  1827,  20,  20,  50, T|A    ), //  59 Coal Truck
 	MW(  1827,  20,  20,  50, T|A|S  ), //  60 Oil Tanker
 	MW(  1827,  20,  20,  50, T|A    ), //  61 Livestock Van
 	MW(  1827,  20,  20,  50, T|A|S  ), //  62 Goods Van
 	MW(  1827,  20,  20,  50, T|A|S  ), //  63 Grain Hopper
 	MW(  1827,  20,  20,  50, T|A|S  ), //  64 Wood Truck
 	MW(  1827,  20,  20,  50, T      ), //  65 Iron Ore Hopper
 	MW(  1827,  20,  20,  50, T      ), //  66 Steel Truck
 	MW(  1827,  20,  20,  50, T|A|S  ), //  67 Armoured Van
 	MW(  1827,  20,  20,  50,   A|S  ), //  68 Food Van
 	MW(  1827,  20,  20,  50,   A    ), //  69 Paper Truck
 	MW(  1827,  20,  20,  50,     S  ), //  70 Copper Ore Hopper
 	MW(  1827,  20,  20,  50,     S  ), //  71 Water Tanker
 	MW(  1827,  20,  20,  50,     S  ), //  72 Fruit Truck
 	MW(  1827,  20,  20,  50,     S  ), //  73 Rubber Truck
 	MW(  1827,  20,  20,  50,       Y), //  74 Sugar Truck
 	MW(  1827,  20,  20,  50,       Y), //  75 Candyfloss Hopper
 	MW(  1827,  20,  20,  50,       Y), //  76 Toffee Hopper
 	MW(  1827,  20,  20,  50,       Y), //  77 Bubble Van
 	MW(  1827,  20,  20,  50,       Y), //  78 Cola Tanker
 	MW(  1827,  20,  20,  50,       Y), //  79 Sweet Van
 	MW(  1827,  20,  20,  50,       Y), //  80 Toy Van
 	MW(  1827,  20,  20,  50,       Y), //  81 Battery Truck
 	MW(  1827,  20,  20,  50,       Y), //  82 Fizzy Drink Truck
 	MW(  1827,  20,  20,  50,       Y), //  83 Plastic Truck
 	MK( 36525,  20,  20,  50, T|A|S  ), //  84 Lev1 'Leviathan' (Electric)
 	MK( 39447,  20,  20,  50, T|A|S  ), //  85 Lev2 'Cyclops' (Electric)
 	MK( 42004,  20,  20,  50, T|A|S  ), //  86 Lev3 'Pegasus' (Electric)
 	MK( 42735,  20,  20,  50, T|A|S  ), //  87 Lev4 'Chimaera' (Electric)
 	MK( 36891,  20,  20,  60,       Y), //  88 Wizzowow Rocketeer
 	MW(  1827,  20,  20,  50, T|A|S|Y), //  89 Passenger Carriage
 	MW(  1827,  20,  20,  50, T|A|S|Y), //  90 Mail Van
 	MW(  1827,  20,  20,  50, T|A    ), //  91 Coal Truck
 	MW(  1827,  20,  20,  50, T|A|S  ), //  92 Oil Tanker
 	MW(  1827,  20,  20,  50, T|A    ), //  93 Livestock Van
 	MW(  1827,  20,  20,  50, T|A|S  ), //  94 Goods Van
 	MW(  1827,  20,  20,  50, T|A|S  ), //  95 Grain Hopper
 	MW(  1827,  20,  20,  50, T|A|S  ), //  96 Wood Truck
 	MW(  1827,  20,  20,  50, T      ), //  97 Iron Ore Hopper
 	MW(  1827,  20,  20,  50, T      ), //  98 Steel Truck
 	MW(  1827,  20,  20,  50, T|A|S  ), //  99 Armoured Van
 	MW(  1827,  20,  20,  50,   A|S  ), // 100 Food Van
 	MW(  1827,  20,  20,  50,   A    ), // 101 Paper Truck
 	MW(  1827,  20,  20,  50,     S  ), // 102 Copper Ore Hopper
 	MW(  1827,  20,  20,  50,     S  ), // 103 Water Tanker
 	MW(  1827,  20,  20,  50,     S  ), // 104 Fruit Truck
 	MW(  1827,  20,  20,  50,     S  ), // 105 Rubber Truck
 	MW(  1827,  20,  20,  50,       Y), // 106 Sugar Truck
 	MW(  1827,  20,  20,  50,       Y), // 107 Candyfloss Hopper
 	MW(  1827,  20,  20,  50,       Y), // 108 Toffee Hopper
 	MW(  1827,  20,  20,  50,       Y), // 109 Bubble Van
 	MW(  1827,  20,  20,  50,       Y), // 110 Cola Tanker
 	MW(  1827,  20,  20,  50,       Y), // 111 Sweet Van
 	MW(  1827,  20,  20,  50,       Y), // 112 Toy Van
 	MW(  1827,  20,  20,  50,       Y), // 113 Battery Truck
 	MW(  1827,  20,  20,  50,       Y), // 114 Fizzy Drink Truck
 	MW(  1827,  20,  20,  50,       Y), // 115 Plastic Truck
 	MK(  3378,  20,  12,  40, T|A|S  ), // 116 MPS Regal Bus
 	MK( 16071,  20,  15,  30, T|A|S  ), // 117 Hereford Leopard Bus
 	MK( 24107,  20,  15,  40, T|A|S  ), // 118 Foster Bus
 	MK( 32142,  20,  15,  80, T|A|S  ), // 119 Foster MkII Superbus
 	MK(  9132,  20,  15,  40,       Y), // 120 Ploddyphut MkI Bus
 	MK( 18993,  20,  15,  40,       Y), // 121 Ploddyphut MkII Bus
 	MK( 32873,  20,  15,  80,       Y), // 122 Ploddyphut MkIII Bus
 	MK(  5479,  20,  15,  55, T|A    ), // 123 Balogh Coal Truck
 	MK( 20089,  20,  15,  55, T|A    ), // 124 Uhl Coal Truck
 	MK( 33969,  20,  15,  85, T|A    ), // 125 DW Coal Truck
 	MK(  5479,  20,  15,  55, T|A|S  ), // 126 MPS Mail Truck
 	MK( 21550,  20,  15,  55, T|A|S  ), // 127 Reynard Mail Truck
 	MK( 35795,  20,  15,  85, T|A|S  ), // 128 Perry Mail Truck
 	MK(  5479,  20,  15,  55,       Y), // 129 MightyMover Mail Truck
 	MK( 21550,  20,  15,  55,       Y), // 130 Powernaught Mail Truck
 	MK( 35795,  20,  15,  85,       Y), // 131 Wizzowow Mail Truck
 	MK(  5479,  20,  15,  55, T|A|S  ), // 132 Witcombe Oil Tanker
 	MK( 19359,  20,  15,  55, T|A|S  ), // 133 Foster Oil Tanker
 	MK( 31047,  20,  15,  85, T|A|S  ), // 134 Perry Oil Tanker
 	MK(  5479,  20,  15,  55, T|A    ), // 135 Talbott Livestock Van
 	MK( 21915,  20,  15,  55, T|A    ), // 136 Uhl Livestock Van
 	MK( 37256,  20,  15,  85, T|A    ), // 137 Foster Livestock Van
 	MK(  5479,  20,  15,  55, T|A|S  ), // 138 Balogh Goods Truck
 	MK( 19724,  20,  15,  55, T|A|S  ), // 139 Craighead Goods Truck
 	MK( 31047,  20,  15,  85, T|A|S  ), // 140 Goss Goods Truck
 	MK(  5479,  20,  15,  55, T|A|S  ), // 141 Hereford Grain Truck
 	MK( 21185,  20,  15,  55, T|A|S  ), // 142 Thomas Grain Truck
 	MK( 32873,  20,  15,  85, T|A|S  ), // 143 Goss Grain Truck
 	MK(  5479,  20,  15,  55, T|A|S  ), // 144 Witcombe Wood Truck
 	MK( 19724,  20,  15,  55, T|A|S  ), // 145 Foster Wood Truck
 	MK( 35430,  20,  15,  85, T|A|S  ), // 146 Moreland Wood Truck
 	MK(  5479,  20,  15,  55, T      ), // 147 MPS Iron Ore Truck
 	MK( 20820,  20,  15,  55, T      ), // 148 Uhl Iron Ore Truck
 	MK( 33238,  20,  15,  85, T      ), // 149 Chippy Iron Ore Truck
 	MK(  5479,  20,  15,  55, T      ), // 150 Balogh Steel Truck
 	MK( 21185,  20,  15,  55, T      ), // 151 Uhl Steel Truck
 	MK( 31777,  20,  15,  85, T      ), // 152 Kelling Steel Truck
 	MK(  5479,  20,  15,  55, T|A|S  ), // 153 Balogh Armoured Truck
 	MK( 22281,  20,  15,  55, T|A|S  ), // 154 Uhl Armoured Truck
 	MK( 33603,  20,  15,  85, T|A|S  ), // 155 Foster Armoured Truck
 	MK(  5479,  20,  15,  55,   A|S  ), // 156 Foster Food Van
 	MK( 18628,  20,  15,  55,   A|S  ), // 157 Perry Food Van
 	MK( 30681,  20,  15,  85,   A|S  ), // 158 Chippy Food Van
 	MK(  5479,  20,  15,  55,   A    ), // 159 Uhl Paper Truck
 	MK( 21185,  20,  15,  55,   A    ), // 160 Balogh Paper Truck
 	MK( 31777,  20,  15,  85,   A    ), // 161 MPS Paper Truck
 	MK(  5479,  20,  15,  55,     S  ), // 162 MPS Copper Ore Truck
 	MK( 20820,  20,  15,  55,     S  ), // 163 Uhl Copper Ore Truck
 	MK( 33238,  20,  15,  85,     S  ), // 164 Goss Copper Ore Truck
 	MK(  5479,  20,  15,  55,     S  ), // 165 Uhl Water Tanker
 	MK( 20970,  20,  15,  55,     S  ), // 166 Balogh Water Tanker
 	MK( 33388,  20,  15,  85,     S  ), // 167 MPS Water Tanker
 	MK(  5479,  20,  15,  55,     S  ), // 168 Balogh Fruit Truck
 	MK( 21335,  20,  15,  55,     S  ), // 169 Uhl Fruit Truck
 	MK( 33753,  20,  15,  85,     S  ), // 170 Kelling Fruit Truck
 	MK(  5479,  20,  15,  55,     S  ), // 171 Balogh Rubber Truck
 	MK( 20604,  20,  15,  55,     S  ), // 172 Uhl Rubber Truck
 	MK( 33023,  20,  15,  85,     S  ), // 173 RMT Rubber Truck
 	MK(  5479,  20,  15,  55,       Y), // 174 MightyMover Sugar Truck
 	MK( 19724,  20,  15,  55,       Y), // 175 Powernaught Sugar Truck
 	MK( 33238,  20,  15,  85,       Y), // 176 Wizzowow Sugar Truck
 	MK(  5479,  20,  15,  55,       Y), // 177 MightyMover Cola Truck
 	MK( 20089,  20,  15,  55,       Y), // 178 Powernaught Cola Truck
 	MK( 33603,  20,  15,  85,       Y), // 179 Wizzowow Cola Truck
 	MK(  5479,  20,  15,  55,       Y), // 180 MightyMover Candyfloss Truck
 	MK( 20454,  20,  15,  55,       Y), // 181 Powernaught Candyfloss Truck
 	MK( 33969,  20,  15,  85,       Y), // 182 Wizzowow Candyfloss Truck
 	MK(  5479,  20,  15,  55,       Y), // 183 MightyMover Toffee Truck
 	MK( 20820,  20,  15,  55,       Y), // 184 Powernaught Toffee Truck
 	MK( 34334,  20,  15,  85,       Y), // 185 Wizzowow Toffee Truck
 	MK(  5479,  20,  15,  55,       Y), // 186 MightyMover Toy Van
 	MK( 21185,  20,  15,  55,       Y), // 187 Powernaught Toy Van
 	MK( 34699,  20,  15,  85,       Y), // 188 Wizzowow Toy Van
 	MK(  5479,  20,  15,  55,       Y), // 189 MightyMover Sweet Truck
 	MK( 21550,  20,  15,  55,       Y), // 190 Powernaught Sweet Truck
 	MK( 35064,  20,  15,  85,       Y), // 191 Wizzowow Sweet Truck
 	MK(  5479,  20,  15,  55,       Y), // 192 MightyMover Battery Truck
 	MK( 19874,  20,  15,  55,       Y), // 193 Powernaught Battery Truck
 	MK( 35430,  20,  15,  85,       Y), // 194 Wizzowow Battery Truck
 	MK(  5479,  20,  15,  55,       Y), // 195 MightyMover Fizzy Drink Truck
 	MK( 20239,  20,  15,  55,       Y), // 196 Powernaught Fizzy Drink Truck
 	MK( 35795,  20,  15,  85,       Y), // 197 Wizzowow Fizzy Drink Truck
 	MK(  5479,  20,  15,  55,       Y), // 198 MightyMover Plastic Truck
 	MK( 20604,  20,  15,  55,       Y), // 199 Powernaught Plastic Truck
 	MK( 32873,  20,  15,  85,       Y), // 200 Wizzowow Plastic Truck
 	MK(  5479,  20,  15,  55,       Y), // 201 MightyMover Bubble Truck
 	MK( 20970,  20,  15,  55,       Y), // 202 Powernaught Bubble Truck
 	MK( 33023,  20,  15,  85,       Y), // 203 Wizzowow Bubble Truck
 	MS(  2922,   5,  30,  50, T|A|S  ), // 204 MPS Oil Tanker
 	MS( 17167,   5,  30,  90, T|A|S  ), // 205 CS-Inc. Oil Tanker
 	MS(  2192,   5,  30,  55, T|A|S  ), // 206 MPS Passenger Ferry
 	MS( 18628,   5,  30,  90, T|A|S  ), // 207 FFP Passenger Ferry
 	MS( 17257,  10,  25,  90, T|A|S  ), // 208 Bakewell 300 Hovercraft
 	MS(  9587,   5,  30,  40,       Y), // 209 Chugger-Chug Passenger Ferry
 	MS( 20544,   5,  30,  90,       Y), // 210 Shivershake Passenger Ferry
 	MS(  2557,   5,  30,  55, T|A|S  ), // 211 Yate Cargo ship
 	MS( 19724,   5,  30,  98, T|A|S  ), // 212 Bakewell Cargo ship
 	MS(  9587,   5,  30,  45,       Y), // 213 Mightymover Cargo ship
 	MS( 22371,   5,  30,  90,       Y), // 214 Powernaut Cargo ship
 	MA(  2922,  20,  20,  20, T|A|S  ), // 215 Sampson U52
 	MA(  9922,  20,  24,  20, T|A|S  ), // 216 Coleman Count
 	MA( 12659,  20,  18,  20, T|A|S  ), // 217 FFP Dart
 	MA( 17652,  20,  25,  35, T|A|S  ), // 218 Yate Haugan
 	MA(  4929,  20,  30,  30, T|A|S  ), // 219 Bakewell Cotswald LB-3
 	MA( 13695,  20,  23,  25, T|A|S  ), // 220 Bakewell Luckett LB-8
 	MA( 16341,  20,  26,  30, T|A|S  ), // 221 Bakewell Luckett LB-9
 	MA( 21395,  20,  25,  30, T|A|S  ), // 222 Bakewell Luckett LB80
 	MA( 18263,  20,  20,  30, T|A|S  ), // 223 Bakewell Luckett LB-10
 	MA( 25233,  20,  25,  30, T|A|S  ), // 224 Bakewell Luckett LB-11
 	MA( 15371,  20,  22,  25, T|A|S  ), // 225 Yate Aerospace YAC 1-11
 	MA( 15461,  20,  25,  25, T|A|S  ), // 226 Darwin 100
 	MA( 16952,  20,  22,  25, T|A|S  ), // 227 Darwin 200
 	MA( 17227,  20,  25,  30, T|A|S  ), // 228 Darwin 300
 	MA( 22371,  20,  25,  35, T|A|S  ), // 229 Darwin 400
 	MA( 22341,  20,  25,  30, T|A|S  ), // 230 Darwin 500
 	MA( 27209,  20,  25,  30, T|A|S  ), // 231 Darwin 600
 	MA( 17988,  20,  20,  30, T|A|S  ), // 232 Guru Galaxy
 	MA( 18993,  20,  24,  35, T|A|S  ), // 233 Airtaxi A21
 	MA( 22401,  20,  24,  30, T|A|S  ), // 234 Airtaxi A31
 	MA( 24472,  20,  24,  30, T|A|S  ), // 235 Airtaxi A32
 	MA( 26724,  20,  24,  30, T|A|S  ), // 236 Airtaxi A33
 	MA( 22005,  20,  25,  30, T|A|S  ), // 237 Yate Aerospace YAe46
 	MA( 24107,  20,  20,  35, T|A|S  ), // 238 Dinger 100
 	MA( 29310,  20,  25,  60, T|A|S  ), // 239 AirTaxi A34-1000
 	MA( 35520,  20,  22,  30, T|A|S  ), // 240 Yate Z-Shuttle
 	MA( 36981,  20,  22,  30, T|A|S  ), // 241 Kelling K1
 	MA( 38807,  20,  22,  50, T|A|S  ), // 242 Kelling K6
 	MA( 42094,  20,  25,  30, T|A|S  ), // 243 Kelling K7
 	MA( 44651,  20,  23,  30, T|A|S  ), // 244 Darwin 700
 	MA( 40268,  20,  25,  30, T|A|S  ), // 245 FFP Hyperdart 2
 	MA( 33693,  20,  25,  50, T|A|S  ), // 246 Dinger 200
 	MA( 32963,  20,  20,  60, T|A|S  ), // 247 Dinger 1000
 	MA(  9222,  20,  20,  35,       Y), // 248 Ploddyphut 100
 	MA( 12874,  20,  20,  35,       Y), // 249 Ploddyphut 500
 	MA( 16892,  20,  20,  35,       Y), // 250 Flashbang X1
 	MA( 21275,  20,  20,  99,       Y), // 251 Juggerplane M1
 	MA( 23832,  20,  20,  99,       Y), // 252 Flashbang Wizzer
 	MA( 13575,  20,  20,  40, T|A|S  ), // 253 Tricario Helicopter
 	MA( 28215,  20,  20,  30, T|A|S  ), // 254 Guru X2 Helicopter
 	MK( 13575,  20,  20,  99,       Y), // 255
 };
 #undef Y
 #undef S
@@ @@ -371,11 +371,11 @@ static const EngineInfo _orig_engine_inf @@
 #define L RAILTYPE_MAGLEV
 static const RailVehicleInfo _orig_rail_vehicle_info[] = {
 	//   image_index  max_speed (kph)      running_cost                   ai_rank
 	//   |  flags     |        power (hp)  |  running_cost_class          |  railtype
 	//   |  |    base_cost     |    weight |  |      capacity             |  |
 	//   |  |    |    |        |    |      |  |      |  cargo_type        |  |  engclass
 	//   |  |    |    |        |    |      |  |      |  |                 |  |  |
 	/*   image_index  max_speed (kph)      running_cost                   ai_rank
 	 *   |  flags     |        power (hp)  |  running_cost_class          |  railtype
 	 *   |  |    base_cost     |    weight |  |      capacity             |  |
 	 *   |  |    |    |        |    |      |  |      |  cargo_type        |  |  engclass
 	 *   |  |    |    |        |    |      |  |      |  |                 |  |  | */
 	RVI( 2, G,   7,  64,     300,  47,    50, RC_S,  0, 0              ,  1, R, S), //   0
 	RVI(19, G,   8,  80,     600,  65,    65, RC_D,  0, 0              ,  4, R, D), //   1
 	RVI( 2, G,  10,  72,     400,  85,    90, RC_S,  0, 0              ,  7, R, S), //   2
@@ @@ -520,21 +520,21 @@ static const RailVehicleInfo _orig_rail_ @@
  */
 #define SVI(a, b, c, d, e, f, g, h) { a, b, c, d, e, f, {g}, h }
 static const ShipVehicleInfo _orig_ship_vehicle_info[] = {
 	//   image_index  cargo_type     cargo_amount                 refittable
 	//   |    base_cost |              |    running_cost          |
 	//   |    |    max_speed           |    |  sfx                |
 	//   |    |    |    |              |    |  |                  |
 	SVI( 1, 160,  48, CT_OIL,        220, 140, SND_06_SHIP_HORN,  0 ), /*  0 */
 	SVI( 1, 176,  80, CT_OIL,        350, 125, SND_06_SHIP_HORN,  0 ), /*  1 */
 	SVI( 2,  96,  64, CT_PASSENGERS, 100,  90, SND_07_FERRY_HORN, 0 ), /*  2 */
 	SVI( 2, 112, 128, CT_PASSENGERS, 130,  80, SND_07_FERRY_HORN, 0 ), /*  3 */
 	SVI( 3, 148, 224, CT_PASSENGERS, 100, 190, SND_07_FERRY_HORN, 0 ), /*  4 */
 	SVI( 2,  96,  64, CT_PASSENGERS, 100,  90, SND_07_FERRY_HORN, 0 ), /*  5 */
 	SVI( 2, 112, 128, CT_PASSENGERS, 130,  80, SND_07_FERRY_HORN, 0 ), /*  6 */
 	SVI( 0, 128,  48, CT_GOODS,      160, 150, SND_06_SHIP_HORN,  1 ), /*  7 */
 	SVI( 0, 144,  80, CT_GOODS,      190, 113, SND_06_SHIP_HORN,  1 ), /*  8 */
 	SVI( 0, 128,  48, CT_GOODS,      160, 150, SND_06_SHIP_HORN,  1 ), /*  9 */
 	SVI( 0, 144,  80, CT_GOODS,      190, 113, SND_06_SHIP_HORN,  1 ), /* 10 */
 	/*   image_index  cargo_type     cargo_amount                 refittable
 	 *   |    base_cost |              |    running_cost          |
 	 *   |    |    max_speed           |    |  sfx                |
 	 *   |    |    |    |              |    |  |                  | */
 	SVI( 1, 160,  48, CT_OIL,        220, 140, SND_06_SHIP_HORN,  0 ), //  0
 	SVI( 1, 176,  80, CT_OIL,        350, 125, SND_06_SHIP_HORN,  0 ), //  1
 	SVI( 2,  96,  64, CT_PASSENGERS, 100,  90, SND_07_FERRY_HORN, 0 ), //  2
 	SVI( 2, 112, 128, CT_PASSENGERS, 130,  80, SND_07_FERRY_HORN, 0 ), //  3
 	SVI( 3, 148, 224, CT_PASSENGERS, 100, 190, SND_07_FERRY_HORN, 0 ), //  4
 	SVI( 2,  96,  64, CT_PASSENGERS, 100,  90, SND_07_FERRY_HORN, 0 ), //  5
 	SVI( 2, 112, 128, CT_PASSENGERS, 130,  80, SND_07_FERRY_HORN, 0 ), //  6
 	SVI( 0, 128,  48, CT_GOODS,      160, 150, SND_06_SHIP_HORN,  1 ), //  7
 	SVI( 0, 144,  80, CT_GOODS,      190, 113, SND_06_SHIP_HORN,  1 ), //  8
 	SVI( 0, 128,  48, CT_GOODS,      160, 150, SND_06_SHIP_HORN,  1 ), //  9
 	SVI( 0, 144,  80, CT_GOODS,      190, 113, SND_06_SHIP_HORN,  1 ), // 10
 };
 #undef SVI
@@ @@ -555,52 +555,52 @@ static const ShipVehicleInfo _orig_ship_ @@
 #define P AIR_CTOL
 #define J AIR_CTOL | AIR_FAST
 static const AircraftVehicleInfo _orig_aircraft_vehicle_info[] = {
 	//    image_index         sfx                         acceleration
 	//    |   base_cost       |                           |   max_speed
 	//    |   |    running_cost                           |   |    mail_capacity
 	//    |   |    |  subtype |                           |   |    |    passenger_capacity
 	//    |   |    |  |       |                           |   |    |    |
 	AVI(  1, 14,  85, P, SND_08_PLANE_TAKE_OFF,          18,  37,  4,  25 ), /*  0 */
 	AVI(  0, 15, 100, P, SND_08_PLANE_TAKE_OFF,          20,  37,  8,  65 ), /*  1 */
 	AVI(  2, 16, 130, J, SND_09_JET,                     35,  74, 10,  90 ), /*  2 */
 	AVI(  8, 75, 250, J, SND_3B_JET_OVERHEAD,            50, 181, 20, 100 ), /*  3 */
 	AVI(  5, 15,  98, P, SND_08_PLANE_TAKE_OFF,          20,  37,  6,  30 ), /*  4 */
 	AVI(  6, 18, 240, J, SND_09_JET,                     40,  74, 30, 200 ), /*  5 */
 	AVI(  2, 17, 150, P, SND_09_JET,                     35,  74, 15, 100 ), /*  6 */
 	AVI(  2, 18, 245, J, SND_09_JET,                     40,  74, 30, 150 ), /*  7 */
 	AVI(  3, 19, 192, J, SND_09_JET,                     40,  74, 40, 220 ), /*  8 */
 	AVI(  3, 20, 190, J, SND_09_JET,                     40,  74, 25, 230 ), /*  9 */
 	AVI(  2, 16, 135, J, SND_09_JET,                     35,  74, 10,  95 ), /* 10 */
 	AVI(  2, 18, 240, J, SND_09_JET,                     40,  74, 35, 170 ), /* 11 */
 	AVI(  4, 17, 155, J, SND_09_JET,                     40,  74, 15, 110 ), /* 12 */
 	AVI(  7, 30, 253, J, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 50, 300 ), /* 13 */
 	AVI(  4, 18, 210, J, SND_09_JET,                     40,  74, 25, 200 ), /* 14 */
 	AVI(  4, 19, 220, J, SND_09_JET,                     40,  74, 25, 240 ), /* 15 */
 	AVI(  4, 27, 230, J, SND_09_JET,                     40,  74, 40, 260 ), /* 16 */
 	AVI(  3, 25, 225, J, SND_09_JET,                     40,  74, 35, 240 ), /* 17 */
 	AVI(  4, 20, 235, J, SND_09_JET,                     40,  74, 30, 260 ), /* 18 */
 	AVI(  4, 19, 220, J, SND_09_JET,                     40,  74, 25, 210 ), /* 19 */
 	AVI(  4, 18, 170, J, SND_09_JET,                     40,  74, 20, 160 ), /* 20 */
 	AVI(  4, 26, 210, J, SND_09_JET,                     40,  74, 20, 220 ), /* 21 */
 	AVI(  6, 16, 125, P, SND_09_JET,                     50,  74, 10,  80 ), /* 22 */
 	AVI(  2, 17, 145, P, SND_09_JET,                     40,  74, 10,  85 ), /* 23 */
 	AVI( 11, 16, 130, P, SND_09_JET,                     40,  74, 10,  75 ), /* 24 */
 	AVI( 10, 16, 149, P, SND_09_JET,                     40,  74, 10,  85 ), /* 25 */
 	AVI( 15, 17, 170, P, SND_09_JET,                     40,  74, 18,  65 ), /* 26 */
 	AVI( 12, 18, 210, J, SND_09_JET,                     40,  74, 25, 110 ), /* 27 */
 	AVI( 13, 20, 230, J, SND_09_JET,                     40,  74, 60, 180 ), /* 28 */
 	AVI( 14, 21, 220, J, SND_09_JET,                     40,  74, 65, 150 ), /* 29 */
 	AVI( 16, 19, 160, J, SND_09_JET,                     40, 181, 45,  85 ), /* 30 */
 	AVI( 17, 24, 248, J, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 80, 400 ), /* 31 */
 	AVI( 18, 80, 251, J, SND_3B_JET_OVERHEAD,            50, 181, 45, 130 ), /* 32 */
 	AVI( 20, 13,  85, P, SND_45_PLANE_CRASHING,          18,  37,  5,  25 ), /* 33 */
 	AVI( 21, 18, 100, P, SND_46_PLANE_ENGINE_SPUTTERING, 20,  37,  9,  60 ), /* 34 */
 	AVI( 22, 25, 140, P, SND_09_JET,                     40,  74, 12,  90 ), /* 35 */
 	AVI( 23, 32, 220, J, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 40, 200 ), /* 36 */
 	AVI( 24, 80, 255, J, SND_3B_JET_OVERHEAD,            50, 181, 30, 100 ), /* 37 */
 	AVI(  9, 15,  81, H, SND_09_JET,                     20,  25, 15,  40 ), /* 38 */
 	AVI( 19, 17,  77, H, SND_09_JET,                     20,  40, 20,  55 ), /* 39 */
 	AVI( 25, 15,  80, H, SND_09_JET,                     20,  25, 10,  40 ), /* 40 */
 	/*    image_index         sfx                         acceleration
 	 *    |   base_cost       |                           |   max_speed
 	 *    |   |    running_cost                           |   |    mail_capacity
 	 *    |   |    |  subtype |                           |   |    |    passenger_capacity
 	 *    |   |    |  |       |                           |   |    |    | */
 	AVI(  1, 14,  85, P, SND_08_PLANE_TAKE_OFF,          18,  37,  4,  25 ), //  0
 	AVI(  0, 15, 100, P, SND_08_PLANE_TAKE_OFF,          20,  37,  8,  65 ), //  1
 	AVI(  2, 16, 130, J, SND_09_JET,                     35,  74, 10,  90 ), //  2
 	AVI(  8, 75, 250, J, SND_3B_JET_OVERHEAD,            50, 181, 20, 100 ), //  3
 	AVI(  5, 15,  98, P, SND_08_PLANE_TAKE_OFF,          20,  37,  6,  30 ), //  4
 	AVI(  6, 18, 240, J, SND_09_JET,                     40,  74, 30, 200 ), //  5
 	AVI(  2, 17, 150, P, SND_09_JET,                     35,  74, 15, 100 ), //  6
 	AVI(  2, 18, 245, J, SND_09_JET,                     40,  74, 30, 150 ), //  7
 	AVI(  3, 19, 192, J, SND_09_JET,                     40,  74, 40, 220 ), //  8
 	AVI(  3, 20, 190, J, SND_09_JET,                     40,  74, 25, 230 ), //  9
 	AVI(  2, 16, 135, J, SND_09_JET,                     35,  74, 10,  95 ), // 10
 	AVI(  2, 18, 240, J, SND_09_JET,                     40,  74, 35, 170 ), // 11
 	AVI(  4, 17, 155, J, SND_09_JET,                     40,  74, 15, 110 ), // 12
 	AVI(  7, 30, 253, J, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 50, 300 ), // 13
 	AVI(  4, 18, 210, J, SND_09_JET,                     40,  74, 25, 200 ), // 14
 	AVI(  4, 19, 220, J, SND_09_JET,                     40,  74, 25, 240 ), // 15
 	AVI(  4, 27, 230, J, SND_09_JET,                     40,  74, 40, 260 ), // 16
 	AVI(  3, 25, 225, J, SND_09_JET,                     40,  74, 35, 240 ), // 17
 	AVI(  4, 20, 235, J, SND_09_JET,                     40,  74, 30, 260 ), // 18
 	AVI(  4, 19, 220, J, SND_09_JET,                     40,  74, 25, 210 ), // 19
 	AVI(  4, 18, 170, J, SND_09_JET,                     40,  74, 20, 160 ), // 20
 	AVI(  4, 26, 210, J, SND_09_JET,                     40,  74, 20, 220 ), // 21
 	AVI(  6, 16, 125, P, SND_09_JET,                     50,  74, 10,  80 ), // 22
 	AVI(  2, 17, 145, P, SND_09_JET,                     40,  74, 10,  85 ), // 23
 	AVI( 11, 16, 130, P, SND_09_JET,                     40,  74, 10,  75 ), // 24
 	AVI( 10, 16, 149, P, SND_09_JET,                     40,  74, 10,  85 ), // 25
 	AVI( 15, 17, 170, P, SND_09_JET,                     40,  74, 18,  65 ), // 26
 	AVI( 12, 18, 210, J, SND_09_JET,                     40,  74, 25, 110 ), // 27
 	AVI( 13, 20, 230, J, SND_09_JET,                     40,  74, 60, 180 ), // 28
 	AVI( 14, 21, 220, J, SND_09_JET,                     40,  74, 65, 150 ), // 29
 	AVI( 16, 19, 160, J, SND_09_JET,                     40, 181, 45,  85 ), // 30
 	AVI( 17, 24, 248, J, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 80, 400 ), // 31
 	AVI( 18, 80, 251, J, SND_3B_JET_OVERHEAD,            50, 181, 45, 130 ), // 32
 	AVI( 20, 13,  85, P, SND_45_PLANE_CRASHING,          18,  37,  5,  25 ), // 33
 	AVI( 21, 18, 100, P, SND_46_PLANE_ENGINE_SPUTTERING, 20,  37,  9,  60 ), // 34
 	AVI( 22, 25, 140, P, SND_09_JET,                     40,  74, 12,  90 ), // 35
 	AVI( 23, 32, 220, J, SND_3D_ANOTHER_JET_OVERHEAD,    40,  74, 40, 200 ), // 36
 	AVI( 24, 80, 255, J, SND_3B_JET_OVERHEAD,            50, 181, 30, 100 ), // 37
 	AVI(  9, 15,  81, H, SND_09_JET,                     20,  25, 15,  40 ), // 38
 	AVI( 19, 17,  77, H, SND_09_JET,                     20,  40, 20,  55 ), // 39
 	AVI( 25, 15,  80, H, SND_09_JET,                     20,  25, 10,  40 ), // 40
 };
 #undef J
 #undef P
@@ @@ -621,98 +621,98 @@ static const AircraftVehicleInfo _orig_a @@
  */
 #define ROV(a, b, c, d, e, f, g, h, i) { a, b, c, RC_R, {d}, e, f, g, h, i, 76, 0 }
 static const RoadVehicleInfo _orig_road_vehicle_info[] = {
 	//    image_index       sfx                                 max_speed
 	//    |    base_cost    |                                   |   capacity
 	//    |    |    running_cost                                |   |  cargo_type
 	//    |    |    |       |                                   |   |  |
 	ROV(  0, 120,  91, SND_19_BUS_START_PULL_AWAY,            112, 31, CT_PASSENGERS   , 42,  9), /*  0 */
 	ROV( 17, 140, 128, SND_1C_TRUCK_START_2,                  176, 35, CT_PASSENGERS   , 60, 12), /*  1 */
 	ROV( 17, 150, 178, SND_1B_TRUCK_START,                    224, 37, CT_PASSENGERS   , 70, 15), /*  2 */
 	ROV( 34, 160, 240, SND_1B_TRUCK_START,                    255, 40, CT_PASSENGERS   ,100, 25), /*  3 */
 	ROV( 51, 120,  91, SND_3C_COMEDY_CAR,                     112, 30, CT_PASSENGERS   , 42,  9), /*  4 */
 	ROV( 51, 140, 171, SND_3E_COMEDY_CAR_2,                   192, 35, CT_PASSENGERS   , 60, 15), /*  5 */
 	ROV( 51, 160, 240, SND_3C_COMEDY_CAR,                     240, 38, CT_PASSENGERS   , 90, 25), /*  6 */
 	ROV(  1, 108,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_COAL         , 38, 12), /*  7 */
 	ROV( 18, 128, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_COAL         , 48, 22), /*  8 */
 	ROV( 35, 138, 240, SND_19_BUS_START_PULL_AWAY,            224, 28, CT_COAL         , 69, 45), /*  9 */
 	ROV(  2, 115,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_MAIL         , 38, 12), /* 10 */
 	ROV( 19, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 28, CT_MAIL         , 48, 22), /* 11 */
 	ROV( 36, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 30, CT_MAIL         , 69, 45), /* 12 */
 	ROV( 57, 115,  90, SND_3E_COMEDY_CAR_2,                    96, 22, CT_MAIL         , 38, 12), /* 13 */
 	ROV( 57, 135, 168, SND_3C_COMEDY_CAR,                     176, 28, CT_MAIL         , 48, 22), /* 14 */
 	ROV( 57, 145, 240, SND_3E_COMEDY_CAR_2,                   224, 30, CT_MAIL         , 69, 45), /* 15 */
 	ROV(  3, 110,  90, SND_19_BUS_START_PULL_AWAY,             96, 21, CT_OIL          , 38, 12), /* 16 */
 	ROV( 20, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_OIL          , 48, 22), /* 17 */
 	ROV( 37, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_OIL          , 69, 45), /* 18 */
 	ROV(  4, 105,  90, SND_19_BUS_START_PULL_AWAY,             96, 14, CT_LIVESTOCK    , 38, 12), /* 19 */
 	ROV( 21, 130, 168, SND_19_BUS_START_PULL_AWAY,            176, 16, CT_LIVESTOCK    , 48, 22), /* 20 */
 	ROV( 38, 140, 240, SND_19_BUS_START_PULL_AWAY,            224, 18, CT_LIVESTOCK    , 69, 45), /* 21 */
 	ROV(  5, 107,  90, SND_19_BUS_START_PULL_AWAY,             96, 14, CT_GOODS        , 38, 12), /* 22 */
 	ROV( 22, 130, 168, SND_19_BUS_START_PULL_AWAY,            176, 16, CT_GOODS        , 48, 22), /* 23 */
 	ROV( 39, 140, 240, SND_19_BUS_START_PULL_AWAY,            224, 18, CT_GOODS        , 69, 45), /* 24 */
 	ROV(  6, 114,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_GRAIN        , 38, 12), /* 25 */
 	ROV( 23, 133, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_GRAIN        , 48, 22), /* 26 */
 	ROV( 40, 143, 240, SND_19_BUS_START_PULL_AWAY,            224, 30, CT_GRAIN        , 69, 45), /* 27 */
 	ROV(  7, 118,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_WOOD         , 38, 12), /* 28 */
 	ROV( 24, 137, 168, SND_19_BUS_START_PULL_AWAY,            176, 22, CT_WOOD         , 48, 22), /* 29 */
 	ROV( 41, 147, 240, SND_19_BUS_START_PULL_AWAY,            224, 24, CT_WOOD         , 69, 45), /* 30 */
 	ROV(  8, 121,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_IRON_ORE     , 38, 12), /* 31 */
 	ROV( 25, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_IRON_ORE     , 48, 22), /* 32 */
 	ROV( 42, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_IRON_ORE     , 69, 45), /* 33 */
 	ROV(  9, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 15, CT_STEEL        , 38, 12), /* 34 */
 	ROV( 26, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 18, CT_STEEL        , 48, 22), /* 35 */
 	ROV( 43, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 20, CT_STEEL        , 69, 45), /* 36 */
 	ROV( 10, 145,  90, SND_19_BUS_START_PULL_AWAY,             96, 12, CT_VALUABLES    , 38, 12), /* 37 */
 	ROV( 27, 170, 168, SND_19_BUS_START_PULL_AWAY,            176, 15, CT_VALUABLES    , 48, 22), /* 38 */
 	ROV( 44, 180, 240, SND_19_BUS_START_PULL_AWAY,            224, 16, CT_VALUABLES    , 69, 45), /* 39 */
 	ROV( 11, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 17, CT_FOOD         , 38, 12), /* 40 */
 	ROV( 28, 134, 168, SND_19_BUS_START_PULL_AWAY,            176, 20, CT_FOOD         , 48, 22), /* 41 */
 	ROV( 45, 144, 240, SND_19_BUS_START_PULL_AWAY,            224, 22, CT_FOOD         , 69, 45), /* 42 */
 	ROV( 12, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 15, CT_PAPER        , 38, 12), /* 43 */
 	ROV( 29, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 18, CT_PAPER        , 48, 22), /* 44 */
 	ROV( 46, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 20, CT_PAPER        , 69, 45), /* 45 */
 	ROV( 13, 121,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_COPPER_ORE   , 38, 12), /* 46 */
 	ROV( 30, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_COPPER_ORE   , 48, 22), /* 47 */
 	ROV( 47, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_COPPER_ORE   , 69, 45), /* 48 */
 	ROV( 14, 111,  90, SND_19_BUS_START_PULL_AWAY,             96, 21, CT_WATER        , 38, 12), /* 49 */
 	ROV( 31, 141, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_WATER        , 48, 22), /* 50 */
 	ROV( 48, 151, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_WATER        , 69, 45), /* 51 */
 	ROV( 15, 118,  90, SND_19_BUS_START_PULL_AWAY,             96, 18, CT_FRUIT        , 38, 12), /* 52 */
 	ROV( 32, 148, 168, SND_19_BUS_START_PULL_AWAY,            176, 20, CT_FRUIT        , 48, 22), /* 53 */
 	ROV( 49, 158, 240, SND_19_BUS_START_PULL_AWAY,            224, 23, CT_FRUIT        , 69, 45), /* 54 */
 	ROV( 16, 117,  90, SND_19_BUS_START_PULL_AWAY,             96, 17, CT_RUBBER       , 38, 12), /* 55 */
 	ROV( 33, 147, 168, SND_19_BUS_START_PULL_AWAY,            176, 19, CT_RUBBER       , 48, 22), /* 56 */
 	ROV( 50, 157, 240, SND_19_BUS_START_PULL_AWAY,            224, 22, CT_RUBBER       , 69, 45), /* 57 */
 	ROV( 52, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_SUGAR        , 38, 12), /* 58 */
 	ROV( 52, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_SUGAR        , 48, 22), /* 59 */
 	ROV( 52, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_SUGAR        , 69, 45), /* 60 */
 	ROV( 53, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_COLA         , 38, 12), /* 61 */
 	ROV( 53, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_COLA         , 48, 22), /* 62 */
 	ROV( 53, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_COLA         , 69, 45), /* 63 */
 	ROV( 54, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_COTTON_CANDY , 38, 12), /* 64 */
 	ROV( 54, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_COTTON_CANDY , 48, 22), /* 65 */
 	ROV( 54, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_COTTON_CANDY , 69, 45), /* 66 */
 	ROV( 55, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_TOFFEE       , 38, 12), /* 67 */
 	ROV( 55, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_TOFFEE       , 48, 22), /* 68 */
 	ROV( 55, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_TOFFEE       , 69, 45), /* 69 */
 	ROV( 56, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_TOYS         , 38, 12), /* 70 */
 	ROV( 56, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_TOYS         , 48, 22), /* 71 */
 	ROV( 56, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_TOYS         , 69, 45), /* 72 */
 	ROV( 58, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_CANDY        , 38, 12), /* 73 */
 	ROV( 58, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_CANDY        , 48, 22), /* 74 */
 	ROV( 58, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_CANDY        , 69, 45), /* 75 */
 	ROV( 59, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_BATTERIES    , 38, 12), /* 76 */
 	ROV( 59, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_BATTERIES    , 48, 22), /* 77 */
 	ROV( 59, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_BATTERIES    , 69, 45), /* 78 */
 	ROV( 60, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_FIZZY_DRINKS , 38, 12), /* 79 */
 	ROV( 60, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_FIZZY_DRINKS , 48, 22), /* 80 */
 	ROV( 60, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_FIZZY_DRINKS , 69, 45), /* 81 */
 	ROV( 61, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_PLASTIC      , 38, 12), /* 82 */
 	ROV( 61, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_PLASTIC      , 48, 22), /* 83 */
 	ROV( 61, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_PLASTIC      , 69, 45), /* 84 */
 	ROV( 62, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_BUBBLES      , 38, 12), /* 85 */
 	ROV( 62, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_BUBBLES      , 48, 22), /* 86 */
 	ROV( 62, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_BUBBLES      , 69, 45), /* 87 */
 	/*    image_index       sfx                                 max_speed
 	 *    |    base_cost    |                                   |   capacity
 	 *    |    |    running_cost                                |   |  cargo_type
 	 *    |    |    |       |                                   |   |  | */
 	ROV(  0, 120,  91, SND_19_BUS_START_PULL_AWAY,            112, 31, CT_PASSENGERS   , 42,  9), //  0
 	ROV( 17, 140, 128, SND_1C_TRUCK_START_2,                  176, 35, CT_PASSENGERS   , 60, 12), //  1
 	ROV( 17, 150, 178, SND_1B_TRUCK_START,                    224, 37, CT_PASSENGERS   , 70, 15), //  2
 	ROV( 34, 160, 240, SND_1B_TRUCK_START,                    255, 40, CT_PASSENGERS   ,100, 25), //  3
 	ROV( 51, 120,  91, SND_3C_COMEDY_CAR,                     112, 30, CT_PASSENGERS   , 42,  9), //  4
 	ROV( 51, 140, 171, SND_3E_COMEDY_CAR_2,                   192, 35, CT_PASSENGERS   , 60, 15), //  5
 	ROV( 51, 160, 240, SND_3C_COMEDY_CAR,                     240, 38, CT_PASSENGERS   , 90, 25), //  6
 	ROV(  1, 108,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_COAL         , 38, 12), //  7
 	ROV( 18, 128, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_COAL         , 48, 22), //  8
 	ROV( 35, 138, 240, SND_19_BUS_START_PULL_AWAY,            224, 28, CT_COAL         , 69, 45), //  9
 	ROV(  2, 115,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_MAIL         , 38, 12), // 10
 	ROV( 19, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 28, CT_MAIL         , 48, 22), // 11
 	ROV( 36, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 30, CT_MAIL         , 69, 45), // 12
 	ROV( 57, 115,  90, SND_3E_COMEDY_CAR_2,                    96, 22, CT_MAIL         , 38, 12), // 13
 	ROV( 57, 135, 168, SND_3C_COMEDY_CAR,                     176, 28, CT_MAIL         , 48, 22), // 14
 	ROV( 57, 145, 240, SND_3E_COMEDY_CAR_2,                   224, 30, CT_MAIL         , 69, 45), // 15
 	ROV(  3, 110,  90, SND_19_BUS_START_PULL_AWAY,             96, 21, CT_OIL          , 38, 12), // 16
 	ROV( 20, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_OIL          , 48, 22), // 17
 	ROV( 37, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_OIL          , 69, 45), // 18
 	ROV(  4, 105,  90, SND_19_BUS_START_PULL_AWAY,             96, 14, CT_LIVESTOCK    , 38, 12), // 19
 	ROV( 21, 130, 168, SND_19_BUS_START_PULL_AWAY,            176, 16, CT_LIVESTOCK    , 48, 22), // 20
 	ROV( 38, 140, 240, SND_19_BUS_START_PULL_AWAY,            224, 18, CT_LIVESTOCK    , 69, 45), // 21
 	ROV(  5, 107,  90, SND_19_BUS_START_PULL_AWAY,             96, 14, CT_GOODS        , 38, 12), // 22
 	ROV( 22, 130, 168, SND_19_BUS_START_PULL_AWAY,            176, 16, CT_GOODS        , 48, 22), // 23
 	ROV( 39, 140, 240, SND_19_BUS_START_PULL_AWAY,            224, 18, CT_GOODS        , 69, 45), // 24
 	ROV(  6, 114,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_GRAIN        , 38, 12), // 25
 	ROV( 23, 133, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_GRAIN        , 48, 22), // 26
 	ROV( 40, 143, 240, SND_19_BUS_START_PULL_AWAY,            224, 30, CT_GRAIN        , 69, 45), // 27
 	ROV(  7, 118,  90, SND_19_BUS_START_PULL_AWAY,             96, 20, CT_WOOD         , 38, 12), // 28
 	ROV( 24, 137, 168, SND_19_BUS_START_PULL_AWAY,            176, 22, CT_WOOD         , 48, 22), // 29
 	ROV( 41, 147, 240, SND_19_BUS_START_PULL_AWAY,            224, 24, CT_WOOD         , 69, 45), // 30
 	ROV(  8, 121,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_IRON_ORE     , 38, 12), // 31
 	ROV( 25, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_IRON_ORE     , 48, 22), // 32
 	ROV( 42, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_IRON_ORE     , 69, 45), // 33
 	ROV(  9, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 15, CT_STEEL        , 38, 12), // 34
 	ROV( 26, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 18, CT_STEEL        , 48, 22), // 35
 	ROV( 43, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 20, CT_STEEL        , 69, 45), // 36
 	ROV( 10, 145,  90, SND_19_BUS_START_PULL_AWAY,             96, 12, CT_VALUABLES    , 38, 12), // 37
 	ROV( 27, 170, 168, SND_19_BUS_START_PULL_AWAY,            176, 15, CT_VALUABLES    , 48, 22), // 38
 	ROV( 44, 180, 240, SND_19_BUS_START_PULL_AWAY,            224, 16, CT_VALUABLES    , 69, 45), // 39
 	ROV( 11, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 17, CT_FOOD         , 38, 12), // 40
 	ROV( 28, 134, 168, SND_19_BUS_START_PULL_AWAY,            176, 20, CT_FOOD         , 48, 22), // 41
 	ROV( 45, 144, 240, SND_19_BUS_START_PULL_AWAY,            224, 22, CT_FOOD         , 69, 45), // 42
 	ROV( 12, 112,  90, SND_19_BUS_START_PULL_AWAY,             96, 15, CT_PAPER        , 38, 12), // 43
 	ROV( 29, 135, 168, SND_19_BUS_START_PULL_AWAY,            176, 18, CT_PAPER        , 48, 22), // 44
 	ROV( 46, 145, 240, SND_19_BUS_START_PULL_AWAY,            224, 20, CT_PAPER        , 69, 45), // 45
 	ROV( 13, 121,  90, SND_19_BUS_START_PULL_AWAY,             96, 22, CT_COPPER_ORE   , 38, 12), // 46
 	ROV( 30, 140, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_COPPER_ORE   , 48, 22), // 47
 	ROV( 47, 150, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_COPPER_ORE   , 69, 45), // 48
 	ROV( 14, 111,  90, SND_19_BUS_START_PULL_AWAY,             96, 21, CT_WATER        , 38, 12), // 49
 	ROV( 31, 141, 168, SND_19_BUS_START_PULL_AWAY,            176, 25, CT_WATER        , 48, 22), // 50
 	ROV( 48, 151, 240, SND_19_BUS_START_PULL_AWAY,            224, 27, CT_WATER        , 69, 45), // 51
 	ROV( 15, 118,  90, SND_19_BUS_START_PULL_AWAY,             96, 18, CT_FRUIT        , 38, 12), // 52
 	ROV( 32, 148, 168, SND_19_BUS_START_PULL_AWAY,            176, 20, CT_FRUIT        , 48, 22), // 53
 	ROV( 49, 158, 240, SND_19_BUS_START_PULL_AWAY,            224, 23, CT_FRUIT        , 69, 45), // 54
 	ROV( 16, 117,  90, SND_19_BUS_START_PULL_AWAY,             96, 17, CT_RUBBER       , 38, 12), // 55
 	ROV( 33, 147, 168, SND_19_BUS_START_PULL_AWAY,            176, 19, CT_RUBBER       , 48, 22), // 56
 	ROV( 50, 157, 240, SND_19_BUS_START_PULL_AWAY,            224, 22, CT_RUBBER       , 69, 45), // 57
 	ROV( 52, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_SUGAR        , 38, 12), // 58
 	ROV( 52, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_SUGAR        , 48, 22), // 59
 	ROV( 52, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_SUGAR        , 69, 45), // 60
 	ROV( 53, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_COLA         , 38, 12), // 61
 	ROV( 53, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_COLA         , 48, 22), // 62
 	ROV( 53, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_COLA         , 69, 45), // 63
 	ROV( 54, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_COTTON_CANDY , 38, 12), // 64
 	ROV( 54, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_COTTON_CANDY , 48, 22), // 65
 	ROV( 54, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_COTTON_CANDY , 69, 45), // 66
 	ROV( 55, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_TOFFEE       , 38, 12), // 67
 	ROV( 55, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_TOFFEE       , 48, 22), // 68
 	ROV( 55, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_TOFFEE       , 69, 45), // 69
 	ROV( 56, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_TOYS         , 38, 12), // 70
 	ROV( 56, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_TOYS         , 48, 22), // 71
 	ROV( 56, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_TOYS         , 69, 45), // 72
 	ROV( 58, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_CANDY        , 38, 12), // 73
 	ROV( 58, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_CANDY        , 48, 22), // 74
 	ROV( 58, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_CANDY        , 69, 45), // 75
 	ROV( 59, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_BATTERIES    , 38, 12), // 76
 	ROV( 59, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_BATTERIES    , 48, 22), // 77
 	ROV( 59, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_BATTERIES    , 69, 45), // 78
 	ROV( 60, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_FIZZY_DRINKS , 38, 12), // 79
 	ROV( 60, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_FIZZY_DRINKS , 48, 22), // 80
 	ROV( 60, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_FIZZY_DRINKS , 69, 45), // 81
 	ROV( 61, 117,  90, SND_3F_COMEDY_CAR_3,                    96, 17, CT_PLASTIC      , 38, 12), // 82
 	ROV( 61, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_PLASTIC      , 48, 22), // 83
 	ROV( 61, 157, 240, SND_3F_COMEDY_CAR_3,                   224, 22, CT_PLASTIC      , 69, 45), // 84
 	ROV( 62, 117,  90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY,  96, 17, CT_BUBBLES      , 38, 12), // 85
 	ROV( 62, 147, 168, SND_3F_COMEDY_CAR_3,                   176, 19, CT_BUBBLES      , 48, 22), // 86
 	ROV( 62, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_BUBBLES      , 69, 45), // 87
 };
 #undef ROV

src/table/namegen.h

➞

Show inline comments

@@ @@ -1685,12 +1685,12 @@ static const char *const name_czech_real @@
 };
 /* The advanced hyperintelligent Czech town names generator! */
 /* The tables and MakeCzechTownName() is (c) Petr Baudis 2005 (GPL'd)
 /* The advanced hyperintelligent Czech town names generator!
  * The tables and MakeCzechTownName() is (c) Petr Baudis 2005 (GPL'd)
  * Feel free to ask me about anything unclear or if you need help
  * with cloning this for your own language. */
-// Sing., pl.
+/* Sing., pl. */
 enum CzechGender {
 	CZG_SMASC,
 	CZG_SFEM,
@@ @@ -1698,9 +1698,9 @@ enum CzechGender { @@
 	CZG_PMASC,
 	CZG_PFEM,
 	CZG_PNEUT,
-	// Special for substantive stems - the ending chooses the gender.
+	/* Special for substantive stems - the ending chooses the gender. */
 	CZG_FREE,
-	// Like CZG_FREE, but disallow CZG_SNEUT.
+	/* Like CZG_FREE, but disallow CZG_SNEUT. */
 	CZG_NFREE
 };
@@ @@ -1711,8 +1711,8 @@ enum CzechPattern { @@
 };
 /* [CzechGender][CzechPattern] - replaces the last character of the adjective
  * by this. */
 // XXX: [CZG_SMASC][CZP_PRIVL] needs special handling: -ovX -> -uv.
  * by this.
  * XXX: [CZG_SMASC][CZP_PRIVL] needs special handling: -ovX -> -uv. */
 static const char *const name_czech_patmod[][3] = {
 	/* CZG_SMASC */ { "í", "ý", "X" },
 	/* CZG_SFEM */  { "í", "á", "a" },
@@ @@ -1722,8 +1722,8 @@ static const char *const name_czech_patm @@
 	/* CZG_PNEUT */ { "í", "á", "a" }
 };
 // This way the substantives can choose only some adjectives/endings:
 // At least one of these flags must be satisfied:
 /* This way the substantives can choose only some adjectives/endings:
  * At least one of these flags must be satisfied: */
 enum CzechAllow {
 	CZA_SHORT = 1,
 	CZA_MIDDLE = 2,
@@ @@ -1733,7 +1733,7 @@ enum CzechAllow { @@
 DECLARE_ENUM_AS_BIT_SET(CzechAllow);
-// All these flags must be satisfied (in the stem->others direction):
+/* All these flags must be satisfied (in the stem->others direction): */
 enum CzechChoose {
 	CZC_NONE = 0, // No requirements.
 	CZC_COLOR = 1,
@@ @@ -1757,7 +1757,7 @@ struct CzechNameAdj { @@
 	const char *name;
 };
-// Some of items which should be common are doubled.
+/* Some of items which should be common are doubled. */
 static const CzechNameAdj name_czech_adj[] = {
 	{ CZP_JARNI, CZC_ANY, "Horní" },
 	{ CZP_JARNI, CZC_ANY, "Horní" },
@@ @@ -1809,7 +1809,7 @@ static const CzechNameAdj name_czech_adj @@
 	{ CZP_PRIVL, CZC_ANY, "Sudovo" },
 };
-// Considered a stem for choose/allow matching purposes.
+/* Considered a stem for choose/allow matching purposes. */
 static const CzechNameSubst name_czech_subst_full[] = {
 	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Sedlec" },
 	{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
@@ @@ -1829,7 +1829,7 @@ static const CzechNameSubst name_czech_s @@
 	{ CZG_PNEUT, CZA_ALL, CZC_COLOR, "Pole" },
 };
-// TODO: More stems needed. --pasky
+/* TODO: More stems needed. --pasky */
 static const CzechNameSubst name_czech_subst_stem[] = {
 	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Kostel" },
 	{ CZG_SMASC,             CZA_MIDDLE,            CZC_COLOR, "Klášter" },
@@ @@ -1875,14 +1875,14 @@ static const CzechNameSubst name_czech_s @@
 	{ CZG_FREE,              CZA_MIDDLE | CZA_LONG, CZC_NONE, "Lip" },
 };
-// Optional postfix inserted between stem and ending.
+/* Optional postfix inserted between stem and ending. */
 static const char *const name_czech_subst_postfix[] = {
 	"av", "an", "at",
 	"ov", "on", "ot",
 	"ev", "en", "et",
 };
-// This array must have the both neutral genders at the end!
+/* This array must have the both neutral genders at the end! */
 static const CzechNameSubst name_czech_subst_ending[] = {
 	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "ec" },
 	{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE,            CZC_ANY, "ín" },

src/table/palettes.h

➞

Show inline comments

@@ @@ -194,14 +194,14 @@ static const ExtraPaletteValues _extra_p @@
 };
 #undef M
-// Colour table for colours in lang files (e.g. {BLACK})
+/* Colour table for colours in lang files (e.g. {BLACK}) */
 struct StringColour {
 	byte text;
 	byte shadow;
 };
 static const StringColour _string_colourmap[][17] = {
-	{ /* DOS palette. */
+	{ // DOS palette.
 		{ 150,   1 }, // TC_BLUE
 		{  12,   1 }, // TC_SILVER
 		{ 189,   1 }, // TC_GOLD
@@ @@ -220,7 +220,7 @@ static const StringColour _string_colour @@
 		{ 133,   1 }, // TC_DARK_BLUE
 		{   1,   0 }, // TC_BLACK
 	},
-	{ /* Windows palette. */
+	{ // Windows palette.
 		{ 150, 215 }, // TC_BLUE
 		{  12, 215 }, // TC_SILVER
 		{ 189, 215 }, // TC_GOLD

src/table/railtypes.h

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ @@
  */
 static const RailtypeInfo _original_railtypes[] = {
 	/** Railway */
-	{ /* Main Sprites */
+	{ // Main Sprites
 		{ SPR_RAIL_TRACK_Y, SPR_RAIL_TRACK_N_S, SPR_RAIL_TRACK_BASE, SPR_RAIL_SINGLE_Y, SPR_RAIL_SINGLE_X,
 			SPR_RAIL_SINGLE_NORTH, SPR_RAIL_SINGLE_SOUTH, SPR_RAIL_SINGLE_EAST, SPR_RAIL_SINGLE_WEST,
 			SPR_TRACKS_FOR_SLOPES_RAIL_BASE,
@@ @@ -79,7 +79,7 @@ static const RailtypeInfo _original_rail @@
 	},
 	/** Electrified railway */
-	{ /* Main Sprites */
+	{ // Main Sprites
 		{ SPR_RAIL_TRACK_Y, SPR_RAIL_TRACK_N_S, SPR_RAIL_TRACK_BASE, SPR_RAIL_SINGLE_Y, SPR_RAIL_SINGLE_X,
 			SPR_RAIL_SINGLE_NORTH, SPR_RAIL_SINGLE_SOUTH, SPR_RAIL_SINGLE_EAST, SPR_RAIL_SINGLE_WEST,
 			SPR_TRACKS_FOR_SLOPES_RAIL_BASE,
@@ @@ -151,7 +151,7 @@ static const RailtypeInfo _original_rail @@
 	},
 	/** Monorail */
-	{ /* Main Sprites */
+	{ // Main Sprites
 		{ SPR_MONO_TRACK_Y, SPR_MONO_TRACK_N_S, SPR_MONO_TRACK_BASE, SPR_MONO_SINGLE_Y, SPR_MONO_SINGLE_X,
 			SPR_MONO_SINGLE_NORTH, SPR_MONO_SINGLE_SOUTH, SPR_MONO_SINGLE_EAST, SPR_MONO_SINGLE_WEST,
 			SPR_TRACKS_FOR_SLOPES_MONO_BASE,
@@ @@ -219,7 +219,7 @@ static const RailtypeInfo _original_rail @@
 	},
 	/** Maglev */
-	{ /* Main sprites */
+	{ // Main sprites
 		{ SPR_MGLV_TRACK_Y, SPR_MGLV_TRACK_N_S, SPR_MGLV_TRACK_BASE, SPR_MGLV_SINGLE_Y, SPR_MGLV_SINGLE_X,
 			SPR_MGLV_SINGLE_NORTH, SPR_MGLV_SINGLE_SOUTH, SPR_MGLV_SINGLE_EAST, SPR_MGLV_SINGLE_WEST,
 			SPR_TRACKS_FOR_SLOPES_MAGLEV_BASE,

src/table/sprites.h

➞

Show inline comments

@@ @@ -270,7 +270,7 @@ enum Sprites { @@
 	SPR_MEDIUMHQ_EAST           = 2613,
 	SPR_MEDIUMHQ_EAST_WALL      = 2614,
 	SPR_MEDIUMHQ_WEST           = 2615,
 	SPR_MEDIUMHQ_WEST_WALL      = 2616, //very tiny piece of wall
+	SPR_MEDIUMHQ_WEST_WALL      = 2616, // very tiny piece of wall
 	SPR_MEDIUMHQ_SOUTH          = 2617,
 	SPR_LARGEHQ_NORTH_GROUND    = 2618,
 	SPR_LARGEHQ_NORTH_BUILD     = 2619,
@@ @@ -325,13 +325,13 @@ enum Sprites { @@
 	SPR_RAIL_PLATFORM_PILLARS_X_REAR  = 1076,
 	SPR_RAIL_PLATFORM_PILLARS_Y_REAR  = 1077,
 	SPR_RAIL_PLATFORM_PILLARS_X_FRONT = 1078,
 	SPR_RAIL_ROOF_STRUCTURE_X_TILE_A  = 1079, //First half of the roof structure
+	SPR_RAIL_ROOF_STRUCTURE_X_TILE_A  = 1079, // First half of the roof structure
 	SPR_RAIL_ROOF_STRUCTURE_Y_TILE_A  = 1080,
 	SPR_RAIL_ROOF_STRUCTURE_X_TILE_B  = 1081, //Second half of the roof structure
+	SPR_RAIL_ROOF_STRUCTURE_X_TILE_B  = 1081, // Second half of the roof structure
 	SPR_RAIL_ROOF_STRUCTURE_Y_TILE_B  = 1082,
 	SPR_RAIL_ROOF_GLASS_X_TILE_A      = 1083, //First half of the roof glass
+	SPR_RAIL_ROOF_GLASS_X_TILE_A      = 1083, // First half of the roof glass
 	SPR_RAIL_ROOF_GLASS_Y_TILE_A      = 1084,
 	SPR_RAIL_ROOF_GLASS_X_TILE_B      = 1085, //second half of the roof glass
+	SPR_RAIL_ROOF_GLASS_X_TILE_B      = 1085, // second half of the roof glass
 	SPR_RAIL_ROOF_GLASS_Y_TILE_B      = 1086,
 	SPR_MONO_SINGLE_Y                 = 1087,
 	SPR_MONO_SINGLE_X                 = 1088,
@@ @@ -408,7 +408,7 @@ enum Sprites { @@
 	SPR_AIRPORT_RUNWAY_EXIT_B       = 2646,
 	SPR_AIRPORT_RUNWAY_EXIT_C       = 2647,
 	SPR_AIRPORT_RUNWAY_EXIT_D       = 2648,
 	SPR_AIRPORT_RUNWAY_END          = 2649, //We should have different ends
+	SPR_AIRPORT_RUNWAY_END          = 2649, // We should have different ends
 	SPR_AIRPORT_TERMINAL_A          = 2650,
 	SPR_AIRPORT_TOWER               = 2651,
 	SPR_AIRPORT_CONCOURSE           = 2652,
@@ @@ -454,8 +454,8 @@ enum Sprites { @@
 	SPR_AIRPORT_HELIPAD             = SPR_OPENTTD_BASE + 86,
 	SPR_AIRPORT_HELIDEPOT_OFFICE    = 2095,
 	/* Road Stops */
 	/* Road stops have a ground tile and 3 buildings, one on each side
 	/* Road Stops
 	 * Road stops have a ground tile and 3 buildings, one on each side
 	 * (except the side where the entry is). These are marked _A _B and _C */
 	SPR_BUS_STOP_NE_GROUND          = 2692,
 	SPR_BUS_STOP_SE_GROUND          = 2693,
@@ @@ -490,15 +490,15 @@ enum Sprites { @@
 	SPR_TRUCK_STOP_SW_BUILD_C       = 2722,
 	SPR_TRUCK_STOP_NW_BUILD_C       = 2723,
 	/* Sprites for docks */
 	/* Docks consist of two tiles, the sloped one and the flat one */
 	/* Sprites for docks
 	 * Docks consist of two tiles, the sloped one and the flat one */
 	SPR_DOCK_SLOPE_NE               = 2727,
 	SPR_DOCK_SLOPE_SE               = 2728,
 	SPR_DOCK_SLOPE_SW               = 2729,
 	SPR_DOCK_SLOPE_NW               = 2730,
 	SPR_DOCK_FLAT_X                 = 2731, //for NE and SW
 	SPR_DOCK_FLAT_Y                 = 2732, //for NW and SE
 	SPR_BUOY                        = 4076, //XXX this sucks, because it displays wrong stuff on canals
 	SPR_DOCK_FLAT_X                 = 2731, // for NE and SW
 	SPR_DOCK_FLAT_Y                 = 2732, // for NW and SE
 	SPR_BUOY                        = 4076, // XXX this sucks, because it displays wrong stuff on canals
 	/* Sprites for road */
 	SPR_ROAD_Y                  = 1332,
@@ @@ -553,17 +553,17 @@ enum Sprites { @@
 	SPR_SHIP_DEPOT_NE           = 4073,
 	SPR_SHIP_DEPOT_SE_REAR      = 4074,
 	SPR_SHIP_DEPOT_SW_REAR      = 4075,
 	//here come sloped water sprites
 	SPR_WATER_SLOPE_Y_UP        = SPR_CANALS_BASE + 0, //Water flowing negative Y direction
 	SPR_WATER_SLOPE_X_DOWN      = SPR_CANALS_BASE + 1, //positive X
 	SPR_WATER_SLOPE_X_UP        = SPR_CANALS_BASE + 2, //negative X
 	SPR_WATER_SLOPE_Y_DOWN      = SPR_CANALS_BASE + 3,  //positive Y
 	//sprites for the shiplifts
 	//there are 4 kinds of shiplifts, each of them is 3 tiles long.
 	//the four kinds are running in the X and Y direction and
 	//are "lowering" either in the "+" or the "-" direction.
 	//the three tiles are the center tile (where the slope is)
 	//and a bottom and a top tile
 	/* here come sloped water sprites */
 	SPR_WATER_SLOPE_Y_UP        = SPR_CANALS_BASE + 0, // Water flowing negative Y direction
 	SPR_WATER_SLOPE_X_DOWN      = SPR_CANALS_BASE + 1, // positive X
 	SPR_WATER_SLOPE_X_UP        = SPR_CANALS_BASE + 2, // negative X
 	SPR_WATER_SLOPE_Y_DOWN      = SPR_CANALS_BASE + 3, // positive Y
 	/* sprites for the shiplifts
 	 * there are 4 kinds of shiplifts, each of them is 3 tiles long.
 	 * the four kinds are running in the X and Y direction and
 	 * are "lowering" either in the "+" or the "-" direction.
 	 * the three tiles are the center tile (where the slope is)
 	 * and a bottom and a top tile */
 	SPR_SHIPLIFT_BASE                 = SPR_CANALS_BASE +  4,
 	SPR_SHIPLIFT_Y_UP_CENTER_REAR     = SPR_CANALS_BASE +  4,
 	SPR_SHIPLIFT_X_DOWN_CENTER_REAR   = SPR_CANALS_BASE +  5,
@@ @@ -621,40 +621,40 @@ enum Sprites { @@
 	/* ramps */
 	SPR_BTWDN_ROAD_RAMP_Y_DOWN  = 2529,
 	SPR_BTWDN_ROAD_RAMP_X_DOWN  = 2530,
 	SPR_BTWDN_ROAD_RAMP_X_UP    = 2531, //for some weird reason the order is swapped
 	SPR_BTWDN_ROAD_RAMP_Y_UP    = 2532, //between X and Y.
 	SPR_BTWDN_ROAD_RAMP_X_UP    = 2531, // for some weird reason the order is swapped
 	SPR_BTWDN_ROAD_RAMP_Y_UP    = 2532, // between X and Y.
 	SPR_BTWDN_ROAD_Y_SLOPE_UP   = 2533,
 	SPR_BTWDN_ROAD_X_SLOPE_UP   = 2534,
 	SPR_BTWDN_ROAD_Y_SLOPE_DOWN = 2535,
 	SPR_BTWDN_ROAD_X_SLOPE_DOWN = 2536,
 	SPR_BTWDN_RAIL_RAMP_Y_DOWN  = 2537,
 	SPR_BTWDN_RAIL_RAMP_X_DOWN  = 2538,
 	SPR_BTWDN_RAIL_RAMP_X_UP    = 2539, //for some weird reason the order is swapped
 	SPR_BTWDN_RAIL_RAMP_Y_UP    = 2540, //between X and Y.
 	SPR_BTWDN_RAIL_RAMP_X_UP    = 2539, // for some weird reason the order is swapped
 	SPR_BTWDN_RAIL_RAMP_Y_UP    = 2540, // between X and Y.
 	SPR_BTWDN_RAIL_Y_SLOPE_UP   = 2541,
 	SPR_BTWDN_RAIL_X_SLOPE_UP   = 2542,
 	SPR_BTWDN_RAIL_Y_SLOPE_DOWN = 2543,
 	SPR_BTWDN_RAIL_X_SLOPE_DOWN = 2544,
 	SPR_BTWDN_MONO_RAMP_Y_DOWN  = 4352,
 	SPR_BTWDN_MONO_RAMP_X_DOWN  = 4353,
 	SPR_BTWDN_MONO_RAMP_X_UP    = 4354, //for some weird reason the order is swapped
 	SPR_BTWDN_MONO_RAMP_Y_UP    = 4355, //between X and Y.
 	SPR_BTWDN_MONO_RAMP_X_UP    = 4354, // for some weird reason the order is swapped
 	SPR_BTWDN_MONO_RAMP_Y_UP    = 4355, // between X and Y.
 	SPR_BTWDN_MONO_Y_SLOPE_UP   = 4356,
 	SPR_BTWDN_MONO_X_SLOPE_UP   = 4357,
 	SPR_BTWDN_MONO_Y_SLOPE_DOWN = 4358,
 	SPR_BTWDN_MONO_X_SLOPE_DOWN = 4359,
 	SPR_BTWDN_MGLV_RAMP_Y_DOWN  = 4392,
 	SPR_BTWDN_MGLV_RAMP_X_DOWN  = 4393,
 	SPR_BTWDN_MGLV_RAMP_X_UP    = 4394, //for some weird reason the order is swapped
 	SPR_BTWDN_MGLV_RAMP_Y_UP    = 4395, //between X and Y.
 	SPR_BTWDN_MGLV_RAMP_X_UP    = 4394, // for some weird reason the order is swapped
 	SPR_BTWDN_MGLV_RAMP_Y_UP    = 4395, // between X and Y.
 	SPR_BTWDN_MGLV_Y_SLOPE_UP   = 4396,
 	SPR_BTWDN_MGLV_X_SLOPE_UP   = 4397,
 	SPR_BTWDN_MGLV_Y_SLOPE_DOWN = 4398,
 	SPR_BTWDN_MGLV_X_SLOPE_DOWN = 4399,
 	/* Steel Girder with arches */
 	/* BTSGA == Bridge Type Steel Girder Arched */
 	/* This is bridge type number 2 */
 	/* Steel Girder with arches
 	 * BTSGA == Bridge Type Steel Girder Arched
 	 * This is bridge type number 2 */
 	SPR_BTSGA_RAIL_X_REAR       = 2499,
 	SPR_BTSGA_RAIL_Y_REAR       = 2500,
 	SPR_BTSGA_ROAD_X_REAR       = 2501,
@@ @@ -668,8 +668,8 @@ enum Sprites { @@
 	SPR_BTSGA_MGLV_X_REAR       = 4364,
 	SPR_BTSGA_MGLV_Y_REAR       = 4365,
 	/* BTSUS == Suspension bridge */
 	/* TILE_* denotes the different tiles a suspension bridge
 	/* BTSUS == Suspension bridge
 	 * TILE_* denotes the different tiles a suspension bridge
 	 * can have
 	 * TILE_A and TILE_B are the "beginnings" and "ends" of the
 	 *   suspension system. they have small rectangluar endcaps
@@ @@ -753,8 +753,8 @@ enum Sprites { @@
 	SPR_BTSUS_MGLV_X_REAR_TILE_F  = 4384,
 	SPR_BTSUS_MGLV_Y_REAR_TILE_F  = 4385,
 	/* cantilever bridges */
 	/* They have three different kinds of tiles:
 	/* cantilever bridges
 	 * They have three different kinds of tiles:
 	 * END(ing), MID(dle), BEG(ginning) */
 	SPR_BTCAN_RAIL_X_BEG          = 2507,
 	SPR_BTCAN_RAIL_X_MID          = 2508,
@@ @@ -819,8 +819,8 @@ enum Sprites { @@
 	SPR_BTGIR_MGLV_X        = 4402,
 	SPR_BTGIR_MGLV_Y        = 4403,
 	/* tubular bridges */
 	/* tubular bridges have 3 kinds of tiles:
 	/* tubular bridges
 	 * tubular bridges have 3 kinds of tiles:
 	 *  a start tile (with only half a tube on the far side, marked _BEG
 	 *  a middle tile (full tunnel), marked _MID
 	 *  and an end tile (half a tube on the near side, maked _END
@@ @@ -923,21 +923,21 @@ enum Sprites { @@
 	/* Town/house sprites */
 	SPR_LIFT = 1443,
 	//used in town_land.h
 	//CNST1..3 = Those are the different stages of construction
 	//The last 2 hexas correspond to the type of building it represent, if any
 	/* used in town_land.h
 	 * CNST1..3 = Those are the different stages of construction
 	 * The last 2 hexas correspond to the type of building it represent, if any */
 	SPR_CNST1_TALLOFFICE_00                 = 1421,
 	SPR_CNST2_TALLOFFICE_00                 = 1422,
 	SPR_CNST3_TALLOFFICE_00                 = 1423,
 	SPR_GROUND_TALLOFFICE_00                = 1424,
 	SPR_BUILD_TALLOFFICE_00                 = 1425, //temperate
+	SPR_BUILD_TALLOFFICE_00                 = 1425, // temperate
 	SPR_CNST1_OFFICE_01                     = 1426,
 	SPR_CNST2_OFFICE_01                     = 1427,
 	SPR_BUILD_OFFICE_01                     = 1428, //temperate
+	SPR_BUILD_OFFICE_01                     = 1428, // temperate
 	SPR_GROUND_OFFICE_01                    = 1429,
 	SPR_CNST1_SMLBLCKFLATS_02               = 1430, //Small Block of Flats
+	SPR_CNST1_SMLBLCKFLATS_02               = 1430, // Small Block of Flats
 	SPR_CNST2_SMLBLCKFLATS_02               = 1431,
 	SPR_BUILD_SMLBLCKFLATS_02               = 1432, //temperate
+	SPR_BUILD_SMLBLCKFLATS_02               = 1432, // temperate
 	SPR_GROUND_SMLBLCKFLATS_02              = 1433,
 	SPR_CNST1_TEMPCHURCH                    = 1434,
 	SPR_CNST2_TEMPCHURCH                    = 1435,
@@ @@ -947,7 +947,7 @@ enum Sprites { @@
 	SPR_CNST2_LARGEOFFICE_04                = 1441,
 	SPR_BUILD_LARGEOFFICE_04                = 1442, // temperate, sub-arctic, subtropical
 	SPR_BUILD_LARGEOFFICE_04_SNOW           = 4569, // same, with snow
-	// These are in fact two houses for the same houseID.  so V1 and V2
+	/* These are in fact two houses for the same houseID.  so V1 and V2 */
 	SPR_CNST1_TOWNHOUSE_06_V1               = 1444,
 	SPR_CNST2_TOWNHOUSE_06_V1               = 1445,
 	SPR_BUILD_TOWNHOUSE_06_V1               = 1446, // 1st variation
@@ @@ -1075,7 +1075,7 @@ enum Sprites { @@
 	SPR_IT_TOY_FACTORY_ROBOT        = 4720,
 	SPR_IT_POWER_PLANT_TRANSFORMERS = 2054,
 	/*small icons of cargo available in station waiting*/
+	/* small icons of cargo available in station waiting*/
 	SPR_CARGO_PASSENGER             = 4297,
 	SPR_CARGO_COAL                  = 4298,
 	SPR_CARGO_MAIL                  = 4299,
@@ @@ -1086,10 +1086,10 @@ enum Sprites { @@
 	SPR_CARGO_WOOD                  = 4304,
 	SPR_CARGO_IRON_ORE              = 4305,
 	SPR_CARGO_STEEL                 = 4306,
-	SPR_CARGO_VALUES_GOLD           = 4307,  /*shared between temperate and arctic*/
+	SPR_CARGO_VALUES_GOLD           = 4307,  //shared between temperate and arctic
 	SPR_CARGO_FRUIT                 = 4308,
 	SPR_CARGO_COPPER_ORE            = 4309,
-	SPR_CARGO_WATERCOLA             = 4310,  /*shared between desert and toyland*/
+	SPR_CARGO_WATERCOLA             = 4310,  //shared between desert and toyland
 	SPR_CARGO_DIAMONDS              = 4311,
 	SPR_CARGO_FOOD                  = 4312,
 	SPR_CARGO_PAPER                 = 4313,
@@ @@ -1289,8 +1289,8 @@ enum Sprites { @@
 /** Cursor sprite numbers */
 enum CursorSprite {
 	/* Terraform */
 	/* Cursors */
 	/* Terraform
 	 * Cursors */
 	SPR_CURSOR_MOUSE          = 0,
 	SPR_CURSOR_ZZZ            = 1,
 	SPR_CURSOR_BOUY           = 702,
@@ @@ -1386,7 +1386,7 @@ enum CursorSprite { @@
 	SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 113,
 };
-/// Animation macro in table/animcursors.h (_animcursors[])
+/** Animation macro in table/animcursors.h (_animcursors[]) */
 enum AnimCursors {
 	ANIMCURSOR_DEMOLISH     = -1, ///<  704 -  707 - demolish dynamite
 	ANIMCURSOR_LOWERLAND    = -2, ///<  699 -  701 - lower land tool
@@ @@ -1425,11 +1425,11 @@ enum SpriteSetup { @@
  */
 enum Modifiers {
 	SPRITE_MODIFIER_USE_OFFSET    = OFFSET_BIT,
-	/// Set when a sprite must not ever be displayed transparently
+	/** Set when a sprite must not ever be displayed transparently */
 	SPRITE_MODIFIER_OPAQUE        = OPAQUE_BIT,
-	///when a sprite is to be displayed transparently, this bit needs to be set.
+	/** when a sprite is to be displayed transparently, this bit needs to be set. */
 	PALETTE_MODIFIER_TRANSPARENT  = TRANSPARENT_BIT,
-	///this bit is set when a recolouring process is in action
+	/** this bit is set when a recolouring process is in action */
 	PALETTE_MODIFIER_COLOUR       = RECOLOUR_BIT,
 };
@@ @@ -1437,13 +1437,13 @@ enum Modifiers { @@
  * @note Do not modify this enum. Alter SpriteSetup instead
  * @see SpriteSetup */
 enum SpriteMasks {
-	///Maximum number of sprites that can be loaded at a given time.
+	/** Maximum number of sprites that can be loaded at a given time. */
 	MAX_SPRITES = 1 << SPRITE_WIDTH,
-	///The mask to for the main sprite
+	/** The mask to for the main sprite */
 	SPRITE_MASK = MAX_SPRITES - 1,
 	MAX_PALETTES = 1 << PALETTE_WIDTH,
-	///The mask for the auxiliary sprite (the one that takes care of recolouring)
+	/** The mask for the auxiliary sprite (the one that takes care of recolouring) */
 	PALETTE_MASK = MAX_PALETTES - 1,
 };
@@ @@ -1461,20 +1461,20 @@ enum Recolouring { @@
 static const SpriteID PALETTE_CRASH = 0x324;
 static const SpriteID PAL_NONE = 0;
 	//note: these numbers are already the modified once the renderer needs.
 	//the actual sprite number is the upper 16 bits of the number
 	/* note: these numbers are already the modified once the renderer needs.
 	 * the actual sprite number is the upper 16 bits of the number */
-	///Here a puslating red tile is drawn if you try to build a wrong tunnel or raise/lower land where it is not possible
+	/** Here a puslating red tile is drawn if you try to build a wrong tunnel or raise/lower land where it is not possible */
 static const SpriteID PALETTE_TILE_RED_PULSATING  = 0x303;
-	///makes a square red. is used when removing rails or other stuff
+	/** makes a square red. is used when removing rails or other stuff */
 static const SpriteID PALETTE_SEL_TILE_RED        = 0x304;
-	///This draws a blueish square (catchment areas for example)
+	/** This draws a blueish square (catchment areas for example) */
 static const SpriteID PALETTE_SEL_TILE_BLUE       = 0x305;
 	//0x306 is a real sprite (the little dot you get when you try to raise/lower a corner of the map
 	//here the colour switches begin
 	//use this if you add stuff to the value, so that the resulting colour
 	//is not a fixed value.
 	//NOTE THAT THE SWITCH 0x8000 is NOT present in _TO_COLOURS yet!
 	/* 0x306 is a real sprite (the little dot you get when you try to raise/lower a corner of the map
 	 * here the colour switches begin
 	 * use this if you add stuff to the value, so that the resulting colour
 	 * is not a fixed value.
 	 * NOTE THAT THE SWITCH 0x8000 is NOT present in _TO_COLOURS yet! */
 enum PaletteSprites {
 	PALETTE_TO_DARK_BLUE        = 0x307,
 	PALETTE_TO_PALE_GREEN       = 0x308,
@@ @@ -1486,32 +1486,32 @@ enum PaletteSprites { @@
 	PALETTE_TO_DARK_GREEN       = 0x30E,
 	PALETTE_TO_BLUE             = 0x30F,
 	PALETTE_TO_CREAM            = 0x310,
-	//maybe don't use as company colour because it doesn't display in the graphs?
+	/* maybe don't use as company colour because it doesn't display in the graphs? */
 	PALETTE_TO_MAUVE            = 0x311,
 	PALETTE_TO_PURPLE           = 0x312,
 	PALETTE_TO_ORANGE           = 0x313,
 	PALETTE_TO_BROWN            = 0x314,
 	PALETTE_TO_GREY             = 0x315,
 	PALETTE_TO_WHITE            = 0x316,
-	//sets colour to bare land stuff, for rail and road (and crossings)
+	/* sets colour to bare land stuff, for rail and road (and crossings) */
 	PALETTE_TO_BARE_LAND        = 0x317,
-	//XXX is 318-31A really not used?
+	/* XXX is 318-31A really not used? */
 	PALETTE_TO_STRUCT_BLUE      = 0x31B,
-	//structure colour to something brownish (for the cantilever bridges for example)
+	/* structure colour to something brownish (for the cantilever bridges for example) */
 	PALETTE_TO_STRUCT_BROWN     = 0x31C,
 	PALETTE_TO_STRUCT_WHITE     = 0x31D,
-	//sets bridge or structure to red, little concrete one and cantilever use this one for example
+	/* sets bridge or structure to red, little concrete one and cantilever use this one for example */
 	PALETTE_TO_STRUCT_RED       = 0x31E,
 	PALETTE_TO_STRUCT_GREEN     = 0x31F,
 	PALETTE_TO_STRUCT_CONCRETE  = 0x320, //Sets the suspension bridge to concrete, also other strucutures use it
 	PALETTE_TO_STRUCT_YELLOW    = 0x321, //Sets the bridge colour to yellow (suspension and tubular)
 	PALETTE_TO_TRANSPARENT      = 0x322, //This sets the sprite to transparent
 	//This is used for changing the tubular bridges to the silicon display, or some grayish colour
 	PALETTE_TO_STRUCT_CONCRETE  = 0x320, // Sets the suspension bridge to concrete, also other strucutures use it
 	PALETTE_TO_STRUCT_YELLOW    = 0x321, // Sets the bridge colour to yellow (suspension and tubular)
 	PALETTE_TO_TRANSPARENT      = 0x322, // This sets the sprite to transparent
 	/* This is used for changing the tubular bridges to the silicon display, or some grayish colour */
 	PALETTE_TO_STRUCT_GREY      = 0x323,
 	//XXX - const - PALETTE_CRASH               = 0x324,  //this changes stuff to the "crash colour"
 	//XXX another place where structures are coloured.
 	//I'm not sure which colours these are
 	/* XXX - const - PALETTE_CRASH               = 0x324,  // this changes stuff to the "crash colour"
 	 * XXX another place where structures are coloured.
 	 * I'm not sure which colours these are */
 	PALETTE_59E                 = 0x59E,
 	PALETTE_59F                 = 0x59F,
 };

src/table/station_land.h

➞

Show inline comments

@@ @@ -416,275 +416,275 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
 // control tower with concrete underground and no fence
 // concrete underground
 /* control tower with concrete underground and no fence
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_085[] = {
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_TOWER | (1 << PALETTE_MODIFIER_COLOUR))  // control tower
 	TILE_SEQ_END()
 };
 // new airportdepot, facing west
 // concrete underground
 /* new airportdepot, facing west
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_086[] = {
 	TILE_SEQ_LINE(14, 0,  0,  2, 16, 28, SPR_AIRFIELD_HANGAR_FRONT | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0, 0,  0,  2, 16, 28, SPR_AIRFIELD_HANGAR_REAR | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 // asphalt tile with fences in north
 // concrete underground
 /* asphalt tile with fences in north
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_087[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// end of runway
+/* end of runway */
 static const DrawTileSeqStruct _station_display_datas_088[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences
 	TILE_SEQ_END()
 };
-// runway tiles
+/* runway tiles */
 static const DrawTileSeqStruct _station_display_datas_089[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences
 	TILE_SEQ_END()
 };
 // turning radar with concrete underground fences on south -- needs 12 tiles
 // concrete underground
 //BEGIN
 /* turning radar with concrete underground fences on south -- needs 12 tiles
  * concrete underground
  *BEGIN */
 static const DrawTileSeqStruct _station_display_datas_090[] = {
 	TILE_SEQ_LINE( 7, 7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)   // turning radar
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))  //fences
+	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))  // fences
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_091[] = {
 	TILE_SEQ_LINE( 7, 7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_092[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_093[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_094[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_095[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_096[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_097[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_098[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_099[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0100[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0101[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
 	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-//END
+/* END */
 // turning radar with concrete underground fences on north -- needs 12 tiles
 // concrete underground
 //BEGIN
 /* turning radar with concrete underground fences on north -- needs 12 tiles
  * concrete underground
  *BEGIN */
 static const DrawTileSeqStruct _station_display_datas_0102[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)   // turning radar
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0103[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0104[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0105[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0106[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0107[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0108[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0109[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0110[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0111[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0112[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0113[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-//END
+/* END */
 // helipad for international airport
 // concrete underground
 /* helipad for international airport
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0114[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
 	TILE_SEQ_END()
 };
 // helipad for commuter airport
 // concrete underground
 /* helipad for commuter airport
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0115[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences left
 	TILE_SEQ_END()
 };
 // helipad for continental airport
 // concrete underground
 /* helipad for continental airport
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0116[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_END()
 };
 // asphalt tile with fences in north and south
 // concrete underground
 /* asphalt tile with fences in north and south
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0117[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// runway tiles with 2 corner fences
+/* runway tiles with 2 corner fences */
 static const DrawTileSeqStruct _station_display_datas_0118[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
-// runway tiles with 2 corner fences
+/* runway tiles with 2 corner fences */
 static const DrawTileSeqStruct _station_display_datas_0119[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// runway tiles with 2 corner fences
+/* runway tiles with 2 corner fences */
 static const DrawTileSeqStruct _station_display_datas_0120[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_END()
 };
-// runway tiles with 2 corner fences
+/* runway tiles with 2 corner fences */
 static const DrawTileSeqStruct _station_display_datas_0121[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 // ======== new 2x2 helidepot ========
 // helipad tiles with 2 corner fences top+right
 /* ======== new 2x2 helidepot ========
  * helipad tiles with 2 corner fences top+right */
 static const DrawTileSeqStruct _station_display_datas_0122[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
@@ @@ -692,15 +692,15 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
-// tarmac tiles with 2 corner fences bottom+right
+/* tarmac tiles with 2 corner fences bottom+right */
 static const DrawTileSeqStruct _station_display_datas_0123[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 // helidepot office with concrete underground and no fence
 // concrete underground, fences top + left
 /* helidepot office with concrete underground and no fence
  * concrete underground, fences top + left */
 static const DrawTileSeqStruct _station_display_datas_0124[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences left
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
@@ @@ -708,51 +708,51 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
-// N/S runway plain
+/* N/S runway plain */
 static const DrawTileSeqStruct _station_display_datas_0125[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_END()
 };
-// N/S runway end
+/* N/S runway end */
 static const DrawTileSeqStruct _station_display_datas_0126[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_END()
 };
-// N/S runway plain
+/* N/S runway plain */
 static const DrawTileSeqStruct _station_display_datas_0127[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
 	TILE_SEQ_END()
 };
-// N/S runway end
+/* N/S runway end */
 static const DrawTileSeqStruct _station_display_datas_0128[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
 	TILE_SEQ_END()
 };
-// West facing hangar
+/* West facing hangar */
 static const DrawTileSeqStruct _station_display_datas_0129[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_NEWHANGAR_W | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0,  0,  0,  2, 16, 28, SPR_NEWHANGAR_W_WALL | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// North facing hangar
+/* North facing hangar */
 static const DrawTileSeqStruct _station_display_datas_0130[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_NEWHANGAR_N | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// East facing hangar
+/* East facing hangar */
 static const DrawTileSeqStruct _station_display_datas_0131[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_NEWHANGAR_E | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 // helipad for district airport NS
 // concrete underground
 /* helipad for district airport NS
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0132[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
@@ @@ -760,78 +760,78 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
 // helipad for district airport NS
 // concrete underground
 /* helipad for district airport NS
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0133[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 // helidepot office with concrete underground and fence north
 // concrete underground
 /* helidepot office with concrete underground and fence north
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0134[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 // helidepot office with concrete underground and fence east
 // concrete underground
 /* helidepot office with concrete underground and fence east
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0135[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 // helidepot office with concrete underground and fence west
 // concrete underground
 /* helidepot office with concrete underground and fence west
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0136[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 // helidepot office with concrete underground and fence south
 // concrete underground
 /* helidepot office with concrete underground and fence south
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0137[] = {
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
-// terminal with fence to east
+/* terminal with fence to east */
 static const DrawTileSeqStruct _station_display_datas_0138[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_END()
 };
-// terminal with fence to south
+/* terminal with fence to south */
 static const DrawTileSeqStruct _station_display_datas_0139[] = {
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// terminal with fence to north
+/* terminal with fence to north */
 static const DrawTileSeqStruct _station_display_datas_0140[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_END()
 };
-// concrete with fence to east
+/* concrete with fence to east */
 static const DrawTileSeqStruct _station_display_datas_0141[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_END()
 };
-// concrete with fence to south
+/* concrete with fence to south */
 static const DrawTileSeqStruct _station_display_datas_0142[] = {
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 // helipad for district airport EW
 // concrete underground
 /* helipad for district airport EW
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0143[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
@@ @@ -839,103 +839,103 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
 // helipad for district airport EW
 // concrete underground
 /* helipad for district airport EW
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0144[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_END()
 };
 // turning radar with concrete underground fences on south -- needs 12 tiles
 // concrete underground
 //BEGIN
 /* turning radar with concrete underground fences on south -- needs 12 tiles
  * concrete underground
  *BEGIN */
 static const DrawTileSeqStruct _station_display_datas_0145[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)   // turning radar
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0146[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0147[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0148[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0149[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0150[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0151[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0152[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0153[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0154[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0155[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0156[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-//END
+/* END */
 // helipad for helistation
 // concrete underground
 /* helipad for helistation
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0157[] = {
 	TILE_SEQ_LINE( 0,  1,  2,  0,  0,  0, SPR_NEWHELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
@@ @@ -943,8 +943,8 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
 // helipad for helistation
 // concrete underground
 /* helipad for helistation
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0158[] = {
 	TILE_SEQ_LINE( 0,  1,  2,  0,  0,  0, SPR_NEWHELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
@@ @@ -952,61 +952,61 @@ static const DrawTileSeqStruct _station_ @@
 	TILE_SEQ_END()
 };
 // helipad for helistation
 // concrete underground
 /* helipad for helistation
  * concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0159[] = {
 	TILE_SEQ_LINE( 0,  1,  2,  0,  0,  0, SPR_NEWHELIPAD)
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
-// helidepot office with concrete underground - no fence
+/* helidepot office with concrete underground - no fence */
 static const DrawTileSeqStruct _station_display_datas_0160[] = {
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
-// concrete underground
+/* concrete underground */
 static const DrawTileSeqStruct _station_display_datas_0161[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
-// half grass half SPR_AIRPORT_APRON
+/* half grass half SPR_AIRPORT_APRON */
 static const DrawTileSeqStruct _station_display_datas_0162[] = {
 	TILE_SEQ_LINE(0,  0,  0,  0,  0,  0, SPR_GRASS_LEFT)
 	TILE_SEQ_END()
 };
-// half grass half SPR_AIRPORT_APRON
+/* half grass half SPR_AIRPORT_APRON */
 static const DrawTileSeqStruct _station_display_datas_0163[] = {
 	TILE_SEQ_LINE(0,  0,  0,  0,  0,  0, SPR_GRASS_RIGHT)
 	TILE_SEQ_END()
 };
-// drive-through truck stop X
+/* drive-through truck stop X */
 static const DrawTileSeqStruct _station_display_datas_0168[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  16,  3, 16, SPR_TRUCK_STOP_DT_X_W | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0, 13,  0,  16,  3, 16, SPR_TRUCK_STOP_DT_X_E | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// drive-through truck stop Y
+/* drive-through truck stop Y */
 static const DrawTileSeqStruct _station_display_datas_0169[] = {
 	TILE_SEQ_LINE(13,  0,  0,  3, 16, 16, SPR_TRUCK_STOP_DT_Y_W | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0,  0,  0,  3, 16, 16, SPR_TRUCK_STOP_DT_Y_E | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// drive-through bus stop X
+/* drive-through bus stop X */
 static const DrawTileSeqStruct _station_display_datas_0170[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  16,  3, 16, SPR_BUS_STOP_DT_X_W | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0, 13,  0,  16,  3, 16, SPR_BUS_STOP_DT_X_E | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
-// drive-through bus stop Y
+/* drive-through bus stop Y */
 static const DrawTileSeqStruct _station_display_datas_0171[] = {
 	TILE_SEQ_LINE(13,  0,  0,  3,  16, 16, SPR_BUS_STOP_DT_Y_W | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0,  0,  0,  3,  16, 16, SPR_BUS_STOP_DT_Y_E | (1 << PALETTE_MODIFIER_COLOUR))

src/table/town_land.h

➞

Show inline comments

@@ @@ -1823,443 +1823,443 @@ static const HouseSpec _original_house_s @@
 	MS(1963, MAX_YEAR, 187, 150, STR_200F_TALL_OFFICE_BLOCK,      140,  70,   8,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //00
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 00
 	MS(1957, MAX_YEAR,  85, 140, STR_2010_OFFICE_BLOCK,           130,  55,   8,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //01
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 01
 	MS(1968, MAX_YEAR,  40, 100, STR_2011_SMALL_BLOCK_OF_FLATS,    90,  20,   8,   3,   1,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //02
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 02
 	MS(   0, MAX_YEAR,   5,  90, STR_2012_CHURCH,                 230,   2,   2,   0,   0,
 	   BUILDING_IS_CHURCH | TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //03
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 03
 	MS(1975, MAX_YEAR, 220, 160, STR_2013_LARGE_OFFICE_BLOCK,     160,  85,  10,   4,   6,
 	   BUILDING_IS_ANIMATED | TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //04
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 04
 	MS(1975, MAX_YEAR, 220, 160, STR_2013_LARGE_OFFICE_BLOCK,     160,  85,  10,   4,   6,
 	   BUILDING_IS_ANIMATED | TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE  | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //05
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 05
 	MS(   0, MAX_YEAR,  30,  80, STR_2014_TOWN_HOUSES,             80,  12,   4,   1,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //06
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 06
 	MS(1959, MAX_YEAR, 140, 180, STR_2015_HOTEL,                  150,  22,   6,   1,   2,
 	   TILE_SIZE_1x2,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //07
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 07
 	MS(1959, MAX_YEAR,   0, 180, STR_2015_HOTEL,                  150,  22,   6,   1,   2,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //08
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 08
 	MS(1945, MAX_YEAR,   0,  65, STR_2016_STATUE,                  40,   0,   2,   0,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //09
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 09
 	MS(1945, MAX_YEAR,   0,  65, STR_2017_FOUNTAIN,                40,   0,   2,   0,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //0A
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0A
 	MS(   0, MAX_YEAR,   0,  60, STR_2018_PARK,                    75,   0,   2,   0,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //0B
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0B
 	MS(1935, MAX_YEAR,   0,  60, STR_2018_PARK,                    75,   0,   2,   0,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //0C
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0C
 	MS(1951, MAX_YEAR, 150, 130, STR_2019_OFFICE_BLOCK,           110,  65,   8,   2,   4,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //0D
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0D
 	MS(1930, 1960,      95, 110, STR_201A_SHOPS_AND_OFFICES,      100,  48,   6,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //0E
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0E
 	MS(1930, 1960,      95, 105, STR_201A_SHOPS_AND_OFFICES,      100,  48,   6,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //0F
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 0F
 	MS(1930, 1960,      95, 107, STR_201A_SHOPS_AND_OFFICES,      100,  48,   6,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //10
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 10
 	MS(1977, MAX_YEAR, 130, 200, STR_201B_MODERN_OFFICE_BUILDING, 150,  50,  10,   3,   6,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //11
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 11
 	MS(1983, MAX_YEAR,   6, 145, STR_201C_WAREHOUSE,              110,  10,   6,   3,   8,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //12
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 12
 	MS(1985, MAX_YEAR, 110, 155, STR_201D_OFFICE_BLOCK,           110,  55,   6,   2,   6,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //13
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 13
 	MS(   0, MAX_YEAR,  65, 250, STR_201E_STADIUM,                300,   5,   4,   0,   0,
 	   BUILDING_IS_STADIUM | TILE_SIZE_2x2,
 	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //14
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 14
 	MS(   0, MAX_YEAR,   0, 250, STR_201E_STADIUM,                300,   5,   4,   0,   0,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //15
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 15
 	MS(   0, MAX_YEAR,   0, 250, STR_201E_STADIUM,                300,   5,   4,   0,   0,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //16
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 16
 	MS(   0, MAX_YEAR,   0, 250, STR_201E_STADIUM,                300,   5,   4,   0,   0,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //17
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 17
 	MS(   0, 1951,      15,  70, STR_201F_OLD_HOUSES,              75,   6,   3,   1,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //18
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 18
 	MS(   0, 1952,      12,  75, STR_2036_COTTAGES,                75,   7,   3,   1,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //19
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 19
 	MS(1931, MAX_YEAR,  13,  71, STR_2037_HOUSES,                  75,   8,   3,   1,   0,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //1A
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1A
 	MS(1935, MAX_YEAR, 100, 135, STR_2038_FLATS,                  100,  35,   7,   2,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //1B
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1B
 	MS(1963, MAX_YEAR, 170, 145, STR_2039_TALL_OFFICE_BLOCK,      170,  50,   8,   3,   3,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //1C
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1C
 	MS(   0, 1955,     100, 132, STR_203A_SHOPS_AND_OFFICES,      135,  40,   6,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //1D
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1D
 	MS(1973, MAX_YEAR, 180, 155, STR_203B_SHOPS_AND_OFFICES,      180,  64,   8,   3,   3,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //1E
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1E
 	MS(   0, MAX_YEAR,  35, 220, STR_203C_THEATER,                230,  23,   8,   2,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //1F
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 1F
 	MS(1958, MAX_YEAR,  65, 250, STR_203D_STADIUM,                300,   5,   4,   0,   0,
 	   BUILDING_IS_STADIUM | TILE_SIZE_2x2,
 	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //20
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 20
 	MS(1958, MAX_YEAR,   0, 250, STR_203D_STADIUM,                300,   5,   4,   0,   0,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //21
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 21
 	MS(1958, MAX_YEAR,   0, 250, STR_203D_STADIUM,                300,   5,   4,   0,   0,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //22
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 22
 	MS(1958, MAX_YEAR,   0, 250, STR_203D_STADIUM,                300,   5,   4,   0,   0,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //23
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 23
 	MS(2000, MAX_YEAR, 140, 170, STR_203E_OFFICES,                250,  65,   8,   3,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //24
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 24
 	MS(   0, 1960,      15,  70, STR_203F_HOUSES,                  75,   6,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //25
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 25
 	MS(   0, 1960,      15,  70, STR_203F_HOUSES,                  75,   6,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //26
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 26
 	MS(1945, MAX_YEAR,  35, 210, STR_2040_CINEMA,                 230,  23,   8,   2,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //27
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 27
 	MS(1983, MAX_YEAR, 180, 250, STR_2041_SHOPPING_MALL,          300,   5,   8,   2,   3,
 	   TILE_SIZE_2x2,
 	   HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 |HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //28
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 28
 	MS(1983, MAX_YEAR,   0, 250, STR_2041_SHOPPING_MALL,          300,   5,   8,   2,   3,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //29
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 29
 	MS(1983, MAX_YEAR,   0, 250, STR_2041_SHOPPING_MALL,          300,   5,   8,   2,   3,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //2A
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 2A
 	MS(1983, MAX_YEAR,   0, 250, STR_2041_SHOPPING_MALL,          300,   5,   8,   2,   3,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //2B
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 2B
 	MS(   0, MAX_YEAR,  80, 100, STR_2038_FLATS,                   90,  20,   5,   2,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //2C
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2C
 	MS(   0, MAX_YEAR,  80, 100, STR_2038_FLATS,                   90,  20,   5,   2,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE  | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //2D
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2D
 	MS(   0, MAX_YEAR,  16,  70, STR_203F_HOUSES,                  70,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //2E
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2E
 	MS(   0, MAX_YEAR,  16,  70, STR_203F_HOUSES,                  70,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //2F
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 2F
 	MS(   0, 1963,      14,  80, STR_203F_HOUSES,                  70,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //30
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 30
 	MS(   0, 1963,      14,  80, STR_203F_HOUSES,                  70,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //31
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 31
 	MS(1966, MAX_YEAR, 135, 150, STR_200F_TALL_OFFICE_BLOCK,      120,  60,   8,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //32
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 32
 	MS(1966, MAX_YEAR, 135, 150, STR_200F_TALL_OFFICE_BLOCK,      120,  60,   8,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //33
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 33
 	MS(1970, MAX_YEAR, 170, 170, STR_200F_TALL_OFFICE_BLOCK,      130,  70,   9,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //34
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 34
 	MS(1970, MAX_YEAR, 170, 170, STR_200F_TALL_OFFICE_BLOCK,      130,  70,   9,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //35
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 35
 	MS(1974, MAX_YEAR, 210, 200, STR_200F_TALL_OFFICE_BLOCK,      140,  80,  10,   3,   5,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //36
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 36
 	MS(1974, MAX_YEAR, 210, 200, STR_200F_TALL_OFFICE_BLOCK,      140,  80,  10,   3,   5,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //37
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 37
 	MS(   0, MAX_YEAR,  10,  60, STR_203F_HOUSES,                  60,   5,   2,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //38
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 38
 	MS(   0, MAX_YEAR,  10,  60, STR_203F_HOUSES,                  60,   5,   2,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //39
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 39
 	MS(   0, MAX_YEAR,  25, 100, STR_201A_SHOPS_AND_OFFICES,       80,  20,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //3A
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3A
 	MS(   0, MAX_YEAR,  25, 100, STR_201A_SHOPS_AND_OFFICES,       80,  20,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //3B
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3B
 	MS(   0, MAX_YEAR,   6,  85, STR_2012_CHURCH,                 230,   2,   2,   0,   0,
 	   BUILDING_IS_CHURCH | TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //3C
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 3C
 	MS(   0, MAX_YEAR,   6,  85, STR_2012_CHURCH,                 230,   2,   2,   0,   0,
 	   BUILDING_IS_CHURCH | TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //3D
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 3D
 	MS(   0, MAX_YEAR,  17,  80, STR_203F_HOUSES,                  80,   7,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //3E
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3E
 	MS(   0, MAX_YEAR,  17,  80, STR_203F_HOUSES,                  80,   7,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //3F
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 3F
 	MS(   0, 1960,      90, 140, STR_201A_SHOPS_AND_OFFICES,      110,  45,   6,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //40
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 40
 	MS(   0, 1960,      90, 140, STR_201A_SHOPS_AND_OFFICES,      110,  45,   6,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //41
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 41
 	MS(1972, MAX_YEAR, 140, 160, STR_2015_HOTEL,                  160,  25,   6,   1,   3,
 	   TILE_SIZE_1x2,
 	   HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //42
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 42
 	MS(1972, MAX_YEAR,   0, 160, STR_2015_HOTEL,                  160,  25,   6,   1,   2,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //43
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 43
 	MS(1972, MAX_YEAR, 140, 160, STR_2015_HOTEL,                  160,  25,   6,   1,   3,
 	   TILE_SIZE_1x2,
 	   HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //44
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 44
 	MS(1972, MAX_YEAR,   0, 160, STR_2015_HOTEL,                  160,  25,   6,   1,   2,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //45
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 45
 	MS(1963, MAX_YEAR, 105, 130, STR_201A_SHOPS_AND_OFFICES,      105,  50,   7,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //46
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 46
 	MS(1963, MAX_YEAR, 105, 130, STR_201A_SHOPS_AND_OFFICES,      105,  50,   7,   2,   3,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //47
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 47
 	MS(1978, MAX_YEAR, 190, 190, STR_200F_TALL_OFFICE_BLOCK,      135,  75,   9,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //48
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 48
 	MS(1978, MAX_YEAR, 190, 190, STR_200F_TALL_OFFICE_BLOCK,      135,  75,   9,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //49
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 49
 	MS(1967, MAX_YEAR, 250, 140, STR_200F_TALL_OFFICE_BLOCK,      200,  60,   7,   2,   2,
 	   TILE_SIZE_2x1,
 	   HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //4A
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4A
 	MS(1967, MAX_YEAR,   0, 140, STR_200F_TALL_OFFICE_BLOCK,      200,  60,   7,   2,   2,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //4B
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4B
 	MS(1967, MAX_YEAR, 250, 140, STR_200F_TALL_OFFICE_BLOCK,      200,  60,   7,   2,   2,
 	   TILE_SIZE_2x1,
 	   HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //4C
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4C
 	MS(1967, MAX_YEAR,   0, 140, STR_200F_TALL_OFFICE_BLOCK,      200,  60,   7,   2,   2,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //4D
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 4D
 	MS(   0, MAX_YEAR,  16,  80, STR_203F_HOUSES,                  80,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //4E
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 4E
 	MS(   0, MAX_YEAR,  16,  80, STR_203F_HOUSES,                  80,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //4F
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 4F
 	MS(   0, MAX_YEAR,  16,  80, STR_203F_HOUSES,                  80,   5,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //50
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 50
 	MS(   0, MAX_YEAR,   7,  30, STR_203F_HOUSES,                  30,   4,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //51
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 51
 	MS(   0, MAX_YEAR,  45, 130, STR_2038_FLATS,                   95,  15,   6,   2,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //52
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 52
 	MS(   0, MAX_YEAR,   8,  90, STR_2012_CHURCH,                 200,   3,   2,   0,   0,
 	   BUILDING_IS_CHURCH | TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //53
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 53
 	MS(   0, MAX_YEAR,  18,  80, STR_203F_HOUSES,                  80,   7,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
 	   CT_PASSENGERS, CT_MAIL, CT_FOOD), //54
+	   CT_PASSENGERS, CT_MAIL, CT_FOOD), // 54
 	MS(1973, MAX_YEAR,  90, 110, STR_2038_FLATS,                   95,  24,   6,   2,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //55
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 55
 	MS(1962, MAX_YEAR, 120, 120, STR_2038_FLATS,                   95,  25,   6,   2,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //56
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 56
 	MS(1984, MAX_YEAR, 250, 190, STR_200F_TALL_OFFICE_BLOCK,      140,  80,   8,   3,   4,
 	   TILE_SIZE_2x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //57
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 57
 	MS(1984, MAX_YEAR,   0, 190, STR_200F_TALL_OFFICE_BLOCK,      140,  80,   8,   3,   4,
 	   TILE_NO_FLAG,
 	   HZ_SUBTROPIC,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //58
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 58
 	MS(   0, MAX_YEAR,  80, 110, STR_2038_FLATS,                   95,  23,   6,   2,   1,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //59
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 59
 	MS(1993, MAX_YEAR, 180, 180, STR_200F_TALL_OFFICE_BLOCK,      150,  90,   8,   3,   4,
 	   TILE_SIZE_1x1,
 	   HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_GOODS), //5A
+	   CT_PASSENGERS, CT_MAIL, CT_GOODS), // 5A
 	MS(   0, MAX_YEAR,   8,  90, STR_2012_CHURCH,                 200,   3,   2,   0,   0,
 	   BUILDING_IS_CHURCH | TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //5B
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5B
 	MS(   0, MAX_YEAR,  18,  90, STR_203F_HOUSES,                  90,   5,   6,   2,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //5C
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5C
 	MS(   0, MAX_YEAR,   7,  70, STR_203F_HOUSES,                  50,   3,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //5D
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5D
 	MS(   0, MAX_YEAR,  15,  80, STR_203F_HOUSES,                  75,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //5E
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5E
 	MS(   0, MAX_YEAR,  17,  80, STR_203F_HOUSES,                  75,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //5F
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 5F
 	MS(   0, MAX_YEAR,  19,  80, STR_203F_HOUSES,                  75,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //60
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 60
 	MS(   0, MAX_YEAR,  21,  80, STR_203F_HOUSES,                  75,   6,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //61
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 61
 	MS(   0, MAX_YEAR,  75, 160, STR_200F_TALL_OFFICE_BLOCK,      130,  20,   8,   4,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //62
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 62
 	MS(   0, MAX_YEAR,  35,  90, STR_203F_HOUSES,                  80,   9,   4,   1,   2,
 	   TILE_SIZE_1x2,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //63
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 63
 	MS(   0, MAX_YEAR,   0,  90, STR_203F_HOUSES,                  80,   0,   4,   1,   2,
 	   TILE_NO_FLAG,
 	   HZ_NOZNS,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //64
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 64
 	MS(   0, MAX_YEAR,  85, 150, STR_200F_TALL_OFFICE_BLOCK,      130,  18,   8,   4,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //65
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 65
 	MS(   0, MAX_YEAR,  11,  60, STR_2059_IGLOO,                   45,   3,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //66
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 66
 	MS(   0, MAX_YEAR,  10,  60, STR_205A_TEPEES,                  45,   3,   3,   1,   1,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //67
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 67
 	MS(   0, MAX_YEAR,  67, 140, STR_201A_SHOPS_AND_OFFICES,      130,  22,   8,   4,   4,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), //68
+	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), // 68
 	MS(   0, MAX_YEAR,  86, 145, STR_201A_SHOPS_AND_OFFICES,      130,  23,   8,   4,   4,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), //69
+	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), // 69
 	MS(   0, MAX_YEAR,  95, 165, STR_200F_TALL_OFFICE_BLOCK,      130,  28,   8,   4,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //6A
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 6A
 	MS(   0, MAX_YEAR,  30,  90, STR_2016_STATUE,                  70,  10,   4,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //6B
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 6B
 	MS(   0, MAX_YEAR,  25,  75, STR_205B_TEAPOT_HOUSE,            65,   8,   3,   1,   2,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_CANDY), //6C
+	   CT_PASSENGERS, CT_MAIL, CT_CANDY), // 6C
 	MS(   0, MAX_YEAR,  18,  85, STR_205C_PIGGY_BANK,              95,   7,   3,   2,   4,
 	   TILE_SIZE_1x1,
 	   HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
 	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), //6D
+	   CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), // 6D
 };
 #undef MS

src/table/tree_land.h

➞

Show inline comments

@@ @@ -28,203 +28,203 @@ static const TreePos _tree_layout_xy[][4 @@
 };
 static const PalSpriteID _tree_layout_sprite[164 + (79 - 48 + 1)][4] = {
 	{ { 0x652, PAL_NONE }, { 0x659, PAL_NONE }, { 0x660, PAL_NONE }, { 0x667, PAL_NONE } }, /* 0 */
 	{ { 0x652, PAL_NONE }, { 0x667, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x675, PAL_NONE } }, /* 1 */
 	{ { 0x652, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x659, PAL_NONE }, { 0x675, PAL_NONE } }, /* 2 */
 	{ { 0x652, PAL_NONE }, { 0x652, PAL_NONE }, { 0x660, PAL_NONE }, { 0x66e, PAL_NONE } }, /* 3 */
 	{ { 0x660, PAL_NONE }, { 0x667, PAL_NONE }, { 0x659, PAL_NONE }, { 0x652, PAL_NONE } }, /* 4 */
 	{ { 0x660, PAL_NONE }, { 0x675, PAL_NONE }, { 0x660, PAL_NONE }, { 0x660, PAL_NONE } }, /* 5 */
 	{ { 0x660, PAL_NONE }, { 0x652, PAL_NONE }, { 0x652, PAL_NONE }, { 0x66e, PAL_NONE } }, /* 6 */
 	{ { 0x660, PAL_NONE }, { 0x675, PAL_NONE }, { 0x667, PAL_NONE }, { 0x659, PAL_NONE } }, /* 7 */
 	{ { 0x675, PAL_NONE }, { 0x660, PAL_NONE }, { 0x675, PAL_NONE }, { 0x675, PAL_NONE } }, /* 8 */
 	{ { 0x675, PAL_NONE }, { 0x659, PAL_NONE }, { 0x652, PAL_NONE }, { 0x652, PAL_NONE } }, /* 9 */
 	{ { 0x675, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x652, PAL_NONE }, { 0x652, PAL_NONE } }, /* 10 */
 	{ { 0x675, PAL_NONE }, { 0x667, PAL_NONE }, { 0x659, PAL_NONE }, { 0x667, PAL_NONE } }, /* 11 */
 	{ { 0x628, PAL_NONE }, { 0x652, PAL_NONE }, { 0x660, PAL_NONE }, { 0x62f, PAL_NONE } }, /* 12 */
 	{ { 0x628, PAL_NONE }, { 0x636, PAL_NONE }, { 0x675, PAL_NONE }, { 0x644, PAL_NONE } }, /* 13 */
 	{ { 0x628, PAL_NONE }, { 0x652, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x66e, PAL_NONE } }, /* 14 */
 	{ { 0x628, PAL_NONE }, { 0x667, PAL_NONE }, { 0x644, PAL_NONE }, { 0x652, PAL_NONE } }, /* 15 */
 	{ { 0x644, PAL_NONE }, { 0x659, PAL_NONE }, { 0x660, PAL_NONE }, { 0x628, PAL_NONE } }, /* 16 */
 	{ { 0x644, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x659, PAL_NONE }, { 0x636, PAL_NONE } }, /* 17 */
 	{ { 0x644, PAL_NONE }, { 0x675, PAL_NONE }, { 0x652, PAL_NONE }, { 0x63d, PAL_NONE } }, /* 18 */
 	{ { 0x644, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x652, PAL_NONE } }, /* 19 */
 	{ { 0x636, PAL_NONE }, { 0x636, PAL_NONE }, { 0x628, PAL_NONE }, { 0x636, PAL_NONE } }, /* 20 */
 	{ { 0x636, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, /* 21 */
 	{ { 0x636, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, /* 22 */
 	{ { 0x636, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, /* 23 */
 	{ { 0x64b, PAL_NONE }, { 0x628, PAL_NONE }, { 0x62f, PAL_NONE }, { 0x636, PAL_NONE } }, /* 24 */
 	{ { 0x64b, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x644, PAL_NONE }, { 0x636, PAL_NONE } }, /* 25 */
 	{ { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x628, PAL_NONE } }, /* 26 */
 	{ { 0x64b, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x63d, PAL_NONE } }, /* 27 */
 	{ { 0x62f, PAL_NONE }, { 0x644, PAL_NONE }, { 0x644, PAL_NONE }, { 0x636, PAL_NONE } }, /* 28 */
 	{ { 0x62f, PAL_NONE }, { 0x62f, PAL_NONE }, { 0x636, PAL_NONE }, { 0x628, PAL_NONE } }, /* 29 */
 	{ { 0x62f, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, /* 30 */
 	{ { 0x62f, PAL_NONE }, { 0x636, PAL_NONE }, { 0x62f, PAL_NONE }, { 0x636, PAL_NONE } }, /* 31 */
 	{ { 0x67c, PAL_NONE }, { 0x675, PAL_NONE }, { 0x683, PAL_NONE }, { 0x67c, PAL_NONE } }, /* 32 */
 	{ { 0x67c, PAL_NONE }, { 0x69f, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x659, PAL_NONE } }, /* 33 */
 	{ { 0x67c, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x6a6, PAL_NONE } }, /* 34 */
 	{ { 0x67c, PAL_NONE }, { 0x691, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x68a, PAL_NONE } }, /* 35 */
 	{ { 0x68a, PAL_NONE }, { 0x68a, PAL_NONE }, { 0x698, PAL_NONE }, { 0x68a, PAL_NONE } }, /* 36 */
 	{ { 0x68a, PAL_NONE }, { 0x698, PAL_NONE }, { 0x683, PAL_NONE }, { 0x68a, PAL_NONE } }, /* 37 */
 	{ { 0x68a, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x691, PAL_NONE }, { 0x68a, PAL_NONE } }, /* 38 */
 	{ { 0x68a, PAL_NONE }, { 0x683, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x69f, PAL_NONE } }, /* 39 */
 	{ { 0x698, PAL_NONE }, { 0x68a, PAL_NONE }, { 0x698, PAL_NONE }, { 0x652, PAL_NONE } }, /* 40 */
 	{ { 0x698, PAL_NONE }, { 0x698, PAL_NONE }, { 0x660, PAL_NONE }, { 0x667, PAL_NONE } }, /* 41 */
 	{ { 0x698, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x698, PAL_NONE } }, /* 42 */
 	{ { 0x698, PAL_NONE }, { 0x698, PAL_NONE }, { 0x698, PAL_NONE }, { 0x691, PAL_NONE } }, /* 43 */
 	{ { 0x6a6, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x660, PAL_NONE } }, /* 44 */
 	{ { 0x6a6, PAL_NONE }, { 0x69f, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x652, PAL_NONE } }, /* 45 */
 	{ { 0x6a6, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x691, PAL_NONE } }, /* 46 */
 	{ { 0x6a6, PAL_NONE }, { 0x691, PAL_NONE }, { 0x69f, PAL_NONE }, { 0x6a6, PAL_NONE } }, /* 47 */
 	{ { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 48 */
 	{ { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6d0, PAL_NONE } }, /* 49 */
 	{ { 0x6ad, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 50 */
 	{ { 0x6ad, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 51 */
 	{ { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 52 */
 	{ { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6c9, PAL_NONE } }, /* 53 */
 	{ { 0x6d0, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6c2, PAL_NONE } }, /* 54 */
 	{ { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 55 */
 	{ { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE } }, /* 56 */
 	{ { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 57 */
 	{ { 0x6d7, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 58 */
 	{ { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 59 */
 	{ { 0x6c2, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE } }, /* 60 */
 	{ { 0x6c2, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 61 */
 	{ { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 62 */
 	{ { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6c9, PAL_NONE } }, /* 63 */
 	{ { 0x6c9, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6b4, PAL_NONE }, { 0x6c2, PAL_NONE } }, /* 64 */
 	{ { 0x6c9, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6d7, PAL_NONE } }, /* 65 */
 	{ { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, /* 66 */
 	{ { 0x6c9, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, /* 67 */
 	{ { 0x6b4, PAL_NONE }, { 0x6b4, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6c9, PAL_NONE } }, /* 68 */
 	{ { 0x6b4, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6ad, PAL_NONE } }, /* 69 */
 	{ { 0x6b4, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, /* 70 */
 	{ { 0x6b4, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, /* 71 */
 	{ { 0x6bb, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6c2, PAL_NONE } }, /* 72 */
 	{ { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6d7, PAL_NONE } }, /* 73 */
 	{ { 0x6bb, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, /* 74 */
 	{ { 0x6bb, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, /* 75 */
 	{ { 0x6de, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6c2, PAL_NONE } }, /* 76 */
 	{ { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6d0, PAL_NONE } }, /* 77 */
 	{ { 0x6de, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, /* 78 */
 	{ { 0x6de, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, /* 79 */
 	{ { 0x72b, PAL_NONE }, { 0x732, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x739, PAL_NONE } }, /* 80 */
 	{ { 0x72b, PAL_NONE }, { 0x747, PAL_NONE }, { 0x755, PAL_NONE }, { 0x72b, PAL_NONE } }, /* 81 */
 	{ { 0x72b, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x76a, PAL_NONE }, { 0x786, PAL_NONE } }, /* 82 */
 	{ { 0x72b, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x72b, PAL_NONE } }, /* 83 */
 	{ { 0x732, PAL_NONE }, { 0x732, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x739, PAL_NONE } }, /* 84 */
 	{ { 0x732, PAL_NONE }, { 0x747, PAL_NONE }, { 0x732, PAL_NONE }, { 0x732, PAL_NONE } }, /* 85 */
 	{ { 0x732, PAL_NONE }, { 0x732, PAL_NONE }, { 0x755, PAL_NONE }, { 0x794, PAL_NONE } }, /* 86 */
 	{ { 0x732, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x732, PAL_NONE }, { 0x78d, PAL_NONE } }, /* 87 */
 	{ { 0x747, PAL_NONE }, { 0x732, PAL_NONE }, { 0x747, PAL_NONE }, { 0x740, PAL_NONE } }, /* 88 */
 	{ { 0x747, PAL_NONE }, { 0x747, PAL_NONE }, { 0x732, PAL_NONE }, { 0x76a, PAL_NONE } }, /* 89 */
 	{ { 0x747, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x755, PAL_NONE }, { 0x747, PAL_NONE } }, /* 90 */
 	{ { 0x747, PAL_NONE }, { 0x786, PAL_NONE }, { 0x732, PAL_NONE }, { 0x747, PAL_NONE } }, /* 91 */
 	{ { 0x74e, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x794, PAL_NONE } }, /* 92 */
 	{ { 0x74e, PAL_NONE }, { 0x755, PAL_NONE }, { 0x732, PAL_NONE }, { 0x74e, PAL_NONE } }, /* 93 */
 	{ { 0x74e, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x786, PAL_NONE }, { 0x747, PAL_NONE } }, /* 94 */
 	{ { 0x74e, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x732, PAL_NONE }, { 0x794, PAL_NONE } }, /* 95 */
 	{ { 0x76a, PAL_NONE }, { 0x76a, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x74e, PAL_NONE } }, /* 96 */
 	{ { 0x76a, PAL_NONE }, { 0x794, PAL_NONE }, { 0x732, PAL_NONE }, { 0x76a, PAL_NONE } }, /* 97 */
 	{ { 0x76a, PAL_NONE }, { 0x732, PAL_NONE }, { 0x786, PAL_NONE }, { 0x76a, PAL_NONE } }, /* 98 */
 	{ { 0x76a, PAL_NONE }, { 0x786, PAL_NONE }, { 0x732, PAL_NONE }, { 0x78d, PAL_NONE } }, /* 99 */
 	{ { 0x78d, PAL_NONE }, { 0x78d, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x794, PAL_NONE } }, /* 100 */
 	{ { 0x78d, PAL_NONE }, { 0x732, PAL_NONE }, { 0x739, PAL_NONE }, { 0x747, PAL_NONE } }, /* 101 */
 	{ { 0x78d, PAL_NONE }, { 0x732, PAL_NONE }, { 0x786, PAL_NONE }, { 0x76a, PAL_NONE } }, /* 102 */
 	{ { 0x78d, PAL_NONE }, { 0x786, PAL_NONE }, { 0x78d, PAL_NONE }, { 0x794, PAL_NONE } }, /* 103 */
 	{ { 0x786, PAL_NONE }, { 0x786, PAL_NONE }, { 0x740, PAL_NONE }, { 0x732, PAL_NONE } }, /* 104 */
 	{ { 0x786, PAL_NONE }, { 0x786, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x732, PAL_NONE } }, /* 105 */
 	{ { 0x786, PAL_NONE }, { 0x732, PAL_NONE }, { 0x786, PAL_NONE }, { 0x786, PAL_NONE } }, /* 106 */
 	{ { 0x786, PAL_NONE }, { 0x786, PAL_NONE }, { 0x78d, PAL_NONE }, { 0x794, PAL_NONE } }, /* 107 */
 	{ { 0x778, PAL_NONE }, { 0x778, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x778, PAL_NONE } }, /* 108 */
 	{ { 0x778, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x778, PAL_NONE }, { 0x77f, PAL_NONE } }, /* 109 */
 	{ { 0x778, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x778, PAL_NONE } }, /* 110 */
 	{ { 0x778, PAL_NONE }, { 0x778, PAL_NONE }, { 0x778, PAL_NONE }, { 0x77f, PAL_NONE } }, /* 111 */
 	{ { 0x75c, PAL_NONE }, { 0x71d, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x724, PAL_NONE } }, /* 112 */
 	{ { 0x75c, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x763, PAL_NONE } }, /* 113 */
 	{ { 0x75c, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x771, PAL_NONE }, { 0x71d, PAL_NONE } }, /* 114 */
 	{ { 0x75c, PAL_NONE }, { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x75c, PAL_NONE } }, /* 115 */
 	{ { 0x771, PAL_NONE }, { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x71d, PAL_NONE } }, /* 116 */
 	{ { 0x771, PAL_NONE }, { 0x747, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x771, PAL_NONE } }, /* 117 */
 	{ { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x771, PAL_NONE }, { 0x724, PAL_NONE } }, /* 118 */
 	{ { 0x771, PAL_NONE }, { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x763, PAL_NONE } }, /* 119 */
 	{ { 0x71d, PAL_NONE }, { 0x71d, PAL_NONE }, { 0x771, PAL_NONE }, { 0x724, PAL_NONE } }, /* 120 */
 	{ { 0x71d, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x763, PAL_NONE }, { 0x71d, PAL_NONE } }, /* 121 */
 	{ { 0x71d, PAL_NONE }, { 0x724, PAL_NONE }, { 0x794, PAL_NONE }, { 0x71d, PAL_NONE } }, /* 122 */
 	{ { 0x71d, PAL_NONE }, { 0x71d, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x78d, PAL_NONE } }, /* 123 */
 	{ { 0x794, PAL_NONE }, { 0x724, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x794, PAL_NONE } }, /* 124 */
 	{ { 0x794, PAL_NONE }, { 0x794, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x71d, PAL_NONE } }, /* 125 */
 	{ { 0x794, PAL_NONE }, { 0x724, PAL_NONE }, { 0x794, PAL_NONE }, { 0x71d, PAL_NONE } }, /* 126 */
 	{ { 0x794, PAL_NONE }, { 0x794, PAL_NONE }, { 0x771, PAL_NONE }, { 0x78d, PAL_NONE } }, /* 127 */
 	{ { 0x79b, PALETTE_TO_RED },    { 0x79b, PALETTE_TO_PALE_GREEN }, { 0x79b, PALETTE_TO_MAUVE },      { 0x79b, PALETTE_TO_PURPLE } }, /* 128 */
 	{ { 0x79b, PAL_NONE },          { 0x79b, PALETTE_TO_GREY },       { 0x79b, PALETTE_TO_GREEN },      { 0x79b, PALETTE_TO_WHITE } },  /* 129 */
 	{ { 0x79b, PALETTE_TO_GREEN },  { 0x79b, PALETTE_TO_ORANGE },     { 0x79b, PALETTE_TO_PINK },       { 0x79b, PAL_NONE } },          /* 130 */
 	{ { 0x79b, PALETTE_TO_YELLOW }, { 0x79b, PALETTE_TO_RED },        { 0x79b, PALETTE_TO_CREAM },      { 0x79b, PALETTE_TO_RED } },    /* 131 */
 	{ { 0x7a2, PAL_NONE },          { 0x7a2, PALETTE_TO_RED },        { 0x7a2, PALETTE_TO_PINK },       { 0x7a2, PALETTE_TO_PURPLE } }, /* 132 */
 	{ { 0x7a2, PALETTE_TO_MAUVE },  { 0x7a2, PALETTE_TO_GREEN },      { 0x7a2, PALETTE_TO_PINK },       { 0x7a2, PALETTE_TO_GREY } },   /* 133 */
 	{ { 0x7a2, PALETTE_TO_RED },    { 0x7a2, PALETTE_TO_PALE_GREEN }, { 0x7a2, PALETTE_TO_YELLOW },     { 0x7a2, PALETTE_TO_WHITE } },  /* 134 */
 	{ { 0x7a2, PALETTE_TO_ORANGE }, { 0x7a2, PALETTE_TO_MAUVE },      { 0x7a2, PALETTE_TO_CREAM },      { 0x7a2, PALETTE_TO_BROWN } },  /* 135 */
 	{ { 0x7a9, PALETTE_TO_RED },    { 0x7a9, PAL_NONE },              { 0x7a9, PALETTE_TO_ORANGE },     { 0x7a9, PALETTE_TO_GREY } },   /* 136 */
 	{ { 0x7a9, PALETTE_TO_ORANGE }, { 0x7a9, PALETTE_TO_GREEN },      { 0x7a9, PALETTE_TO_PALE_GREEN }, { 0x7a9, PALETTE_TO_MAUVE } },  /* 137 */
 	{ { 0x7a9, PALETTE_TO_PINK },   { 0x7a9, PALETTE_TO_RED },        { 0x7a9, PALETTE_TO_GREEN },      { 0x7a9, PALETTE_TO_BROWN } },  /* 138 */
 	{ { 0x7a9, PALETTE_TO_GREEN },  { 0x7a9, PAL_NONE },              { 0x7a9, PALETTE_TO_RED },        { 0x7a9, PALETTE_TO_CREAM } },  /* 139 */
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          /* 140 */
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          /* 141 */
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          /* 142 */
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          /* 143 */
 	{ { 0x7b7, PALETTE_TO_PINK },   { 0x7b7, PALETTE_TO_RED },        { 0x7b7, PALETTE_TO_ORANGE },     { 0x7b7, PALETTE_TO_MAUVE } },  /* 144 */
 	{ { 0x7b7, PALETTE_TO_RED },    { 0x7b7, PAL_NONE },              { 0x7b7, PALETTE_TO_GREY },       { 0x7b7, PALETTE_TO_CREAM } },  /* 145 */
 	{ { 0x7b7, PALETTE_TO_GREEN },  { 0x7b7, PALETTE_TO_BROWN },      { 0x7b7, PALETTE_TO_PINK },       { 0x7b7, PALETTE_TO_RED } },    /* 146 */
 	{ { 0x7b7, PAL_NONE },          { 0x7b7, PALETTE_TO_PALE_GREEN }, { 0x7b7, PALETTE_TO_ORANGE },     { 0x7b7, PALETTE_TO_RED } },    /* 147 */
 	{ { 0x7be, PALETTE_TO_RED },    { 0x7be, PALETTE_TO_PINK },       { 0x7be, PALETTE_TO_GREEN },      { 0x7be, PAL_NONE } },          /* 148 */
 	{ { 0x7be, PALETTE_TO_GREEN },  { 0x7be, PALETTE_TO_BROWN },      { 0x7be, PALETTE_TO_PURPLE },     { 0x7be, PALETTE_TO_GREY } },   /* 149 */
 	{ { 0x7be, PALETTE_TO_MAUVE },  { 0x7be, PALETTE_TO_CREAM },      { 0x7be, PALETTE_TO_ORANGE },     { 0x7be, PALETTE_TO_RED } },    /* 150 */
 	{ { 0x7be, PAL_NONE },          { 0x7be, PALETTE_TO_RED },        { 0x7be, PALETTE_TO_PALE_GREEN }, { 0x7be, PALETTE_TO_PINK } },   /* 151 */
 	{ { 0x7c5, PALETTE_TO_YELLOW }, { 0x7c5, PALETTE_TO_RED },        { 0x7c5, PALETTE_TO_WHITE },      { 0x7c5, PALETTE_TO_CREAM } },  /* 152 */
 	{ { 0x7c5, PALETTE_TO_RED },    { 0x7c5, PALETTE_TO_PALE_GREEN }, { 0x7c5, PALETTE_TO_BROWN },      { 0x7c5, PALETTE_TO_YELLOW } }, /* 153 */
 	{ { 0x7c5, PAL_NONE },          { 0x7c5, PALETTE_TO_PURPLE },     { 0x7c5, PALETTE_TO_GREEN },      { 0x7c5, PALETTE_TO_YELLOW } }, /* 154 */
 	{ { 0x7c5, PALETTE_TO_PINK },   { 0x7c5, PALETTE_TO_CREAM },      { 0x7c5, PAL_NONE },              { 0x7c5, PALETTE_TO_GREY } },   /* 155 */
 	{ { 0x7cc, PALETTE_TO_YELLOW }, { 0x7cc, PALETTE_TO_GREY },       { 0x7cc, PALETTE_TO_PURPLE },     { 0x7cc, PALETTE_TO_BROWN } },  /* 156 */
 	{ { 0x7cc, PALETTE_TO_GREEN },  { 0x7cc, PAL_NONE },              { 0x7cc, PALETTE_TO_CREAM },      { 0x7cc, PALETTE_TO_WHITE } },  /* 157 */
 	{ { 0x7cc, PALETTE_TO_RED },    { 0x7cc, PALETTE_TO_PALE_GREEN }, { 0x7cc, PALETTE_TO_MAUVE },      { 0x7cc, PALETTE_TO_RED } },    /* 158 */
 	{ { 0x7cc, PALETTE_TO_PINK },   { 0x7cc, PALETTE_TO_ORANGE },     { 0x7cc, PALETTE_TO_GREEN },      { 0x7cc, PALETTE_TO_YELLOW } }, /* 159 */
 	{ { 0x7d3, PALETTE_TO_RED },    { 0x7d3, PALETTE_TO_PINK },       { 0x7d3, PALETTE_TO_BROWN },      { 0x7d3, PALETTE_TO_WHITE } },  /* 160 */
 	{ { 0x7d3, PALETTE_TO_GREEN },  { 0x7d3, PALETTE_TO_ORANGE },     { 0x7d3, PALETTE_TO_GREY },       { 0x7d3, PALETTE_TO_MAUVE } },  /* 161 */
 	{ { 0x7d3, PALETTE_TO_YELLOW }, { 0x7d3, PALETTE_TO_PALE_GREEN }, { 0x7d3, PAL_NONE },              { 0x7d3, PALETTE_TO_CREAM } },  /* 162 */
 	{ { 0x7d3, PALETTE_TO_GREY },   { 0x7d3, PALETTE_TO_RED },        { 0x7d3, PALETTE_TO_WHITE },      { 0x7d3, PAL_NONE } },          /* 163 */
 	{ { 0x652, PAL_NONE }, { 0x659, PAL_NONE }, { 0x660, PAL_NONE }, { 0x667, PAL_NONE } }, // 0
 	{ { 0x652, PAL_NONE }, { 0x667, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x675, PAL_NONE } }, // 1
 	{ { 0x652, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x659, PAL_NONE }, { 0x675, PAL_NONE } }, // 2
 	{ { 0x652, PAL_NONE }, { 0x652, PAL_NONE }, { 0x660, PAL_NONE }, { 0x66e, PAL_NONE } }, // 3
 	{ { 0x660, PAL_NONE }, { 0x667, PAL_NONE }, { 0x659, PAL_NONE }, { 0x652, PAL_NONE } }, // 4
 	{ { 0x660, PAL_NONE }, { 0x675, PAL_NONE }, { 0x660, PAL_NONE }, { 0x660, PAL_NONE } }, // 5
 	{ { 0x660, PAL_NONE }, { 0x652, PAL_NONE }, { 0x652, PAL_NONE }, { 0x66e, PAL_NONE } }, // 6
 	{ { 0x660, PAL_NONE }, { 0x675, PAL_NONE }, { 0x667, PAL_NONE }, { 0x659, PAL_NONE } }, // 7
 	{ { 0x675, PAL_NONE }, { 0x660, PAL_NONE }, { 0x675, PAL_NONE }, { 0x675, PAL_NONE } }, // 8
 	{ { 0x675, PAL_NONE }, { 0x659, PAL_NONE }, { 0x652, PAL_NONE }, { 0x652, PAL_NONE } }, // 9
 	{ { 0x675, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x652, PAL_NONE }, { 0x652, PAL_NONE } }, // 10
 	{ { 0x675, PAL_NONE }, { 0x667, PAL_NONE }, { 0x659, PAL_NONE }, { 0x667, PAL_NONE } }, // 11
 	{ { 0x628, PAL_NONE }, { 0x652, PAL_NONE }, { 0x660, PAL_NONE }, { 0x62f, PAL_NONE } }, // 12
 	{ { 0x628, PAL_NONE }, { 0x636, PAL_NONE }, { 0x675, PAL_NONE }, { 0x644, PAL_NONE } }, // 13
 	{ { 0x628, PAL_NONE }, { 0x652, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x66e, PAL_NONE } }, // 14
 	{ { 0x628, PAL_NONE }, { 0x667, PAL_NONE }, { 0x644, PAL_NONE }, { 0x652, PAL_NONE } }, // 15
 	{ { 0x644, PAL_NONE }, { 0x659, PAL_NONE }, { 0x660, PAL_NONE }, { 0x628, PAL_NONE } }, // 16
 	{ { 0x644, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x659, PAL_NONE }, { 0x636, PAL_NONE } }, // 17
 	{ { 0x644, PAL_NONE }, { 0x675, PAL_NONE }, { 0x652, PAL_NONE }, { 0x63d, PAL_NONE } }, // 18
 	{ { 0x644, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x652, PAL_NONE } }, // 19
 	{ { 0x636, PAL_NONE }, { 0x636, PAL_NONE }, { 0x628, PAL_NONE }, { 0x636, PAL_NONE } }, // 20
 	{ { 0x636, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, // 21
 	{ { 0x636, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, // 22
 	{ { 0x636, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, // 23
 	{ { 0x64b, PAL_NONE }, { 0x628, PAL_NONE }, { 0x62f, PAL_NONE }, { 0x636, PAL_NONE } }, // 24
 	{ { 0x64b, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x644, PAL_NONE }, { 0x636, PAL_NONE } }, // 25
 	{ { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x63d, PAL_NONE }, { 0x628, PAL_NONE } }, // 26
 	{ { 0x64b, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x63d, PAL_NONE } }, // 27
 	{ { 0x62f, PAL_NONE }, { 0x644, PAL_NONE }, { 0x644, PAL_NONE }, { 0x636, PAL_NONE } }, // 28
 	{ { 0x62f, PAL_NONE }, { 0x62f, PAL_NONE }, { 0x636, PAL_NONE }, { 0x628, PAL_NONE } }, // 29
 	{ { 0x62f, PAL_NONE }, { 0x64b, PAL_NONE }, { 0x636, PAL_NONE }, { 0x636, PAL_NONE } }, // 30
 	{ { 0x62f, PAL_NONE }, { 0x636, PAL_NONE }, { 0x62f, PAL_NONE }, { 0x636, PAL_NONE } }, // 31
 	{ { 0x67c, PAL_NONE }, { 0x675, PAL_NONE }, { 0x683, PAL_NONE }, { 0x67c, PAL_NONE } }, // 32
 	{ { 0x67c, PAL_NONE }, { 0x69f, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x659, PAL_NONE } }, // 33
 	{ { 0x67c, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x6a6, PAL_NONE } }, // 34
 	{ { 0x67c, PAL_NONE }, { 0x691, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x68a, PAL_NONE } }, // 35
 	{ { 0x68a, PAL_NONE }, { 0x68a, PAL_NONE }, { 0x698, PAL_NONE }, { 0x68a, PAL_NONE } }, // 36
 	{ { 0x68a, PAL_NONE }, { 0x698, PAL_NONE }, { 0x683, PAL_NONE }, { 0x68a, PAL_NONE } }, // 37
 	{ { 0x68a, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x691, PAL_NONE }, { 0x68a, PAL_NONE } }, // 38
 	{ { 0x68a, PAL_NONE }, { 0x683, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x69f, PAL_NONE } }, // 39
 	{ { 0x698, PAL_NONE }, { 0x68a, PAL_NONE }, { 0x698, PAL_NONE }, { 0x652, PAL_NONE } }, // 40
 	{ { 0x698, PAL_NONE }, { 0x698, PAL_NONE }, { 0x660, PAL_NONE }, { 0x667, PAL_NONE } }, // 41
 	{ { 0x698, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x698, PAL_NONE } }, // 42
 	{ { 0x698, PAL_NONE }, { 0x698, PAL_NONE }, { 0x698, PAL_NONE }, { 0x691, PAL_NONE } }, // 43
 	{ { 0x6a6, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x660, PAL_NONE } }, // 44
 	{ { 0x6a6, PAL_NONE }, { 0x69f, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x652, PAL_NONE } }, // 45
 	{ { 0x6a6, PAL_NONE }, { 0x67c, PAL_NONE }, { 0x6a6, PAL_NONE }, { 0x691, PAL_NONE } }, // 46
 	{ { 0x6a6, PAL_NONE }, { 0x691, PAL_NONE }, { 0x69f, PAL_NONE }, { 0x6a6, PAL_NONE } }, // 47
 	{ { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 48
 	{ { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6d0, PAL_NONE } }, // 49
 	{ { 0x6ad, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 50
 	{ { 0x6ad, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 51
 	{ { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 52
 	{ { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6c9, PAL_NONE } }, // 53
 	{ { 0x6d0, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6c2, PAL_NONE } }, // 54
 	{ { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 55
 	{ { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE } }, // 56
 	{ { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 57
 	{ { 0x6d7, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 58
 	{ { 0x6d7, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 59
 	{ { 0x6c2, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE } }, // 60
 	{ { 0x6c2, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 61
 	{ { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 62
 	{ { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6c9, PAL_NONE } }, // 63
 	{ { 0x6c9, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6b4, PAL_NONE }, { 0x6c2, PAL_NONE } }, // 64
 	{ { 0x6c9, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6d7, PAL_NONE } }, // 65
 	{ { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, // 66
 	{ { 0x6c9, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, // 67
 	{ { 0x6b4, PAL_NONE }, { 0x6b4, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6c9, PAL_NONE } }, // 68
 	{ { 0x6b4, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6ad, PAL_NONE } }, // 69
 	{ { 0x6b4, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, // 70
 	{ { 0x6b4, PAL_NONE }, { 0x6ad, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, // 71
 	{ { 0x6bb, PAL_NONE }, { 0x6d0, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6c2, PAL_NONE } }, // 72
 	{ { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6d7, PAL_NONE } }, // 73
 	{ { 0x6bb, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, // 74
 	{ { 0x6bb, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, // 75
 	{ { 0x6de, PAL_NONE }, { 0x6d7, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6c2, PAL_NONE } }, // 76
 	{ { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6d0, PAL_NONE } }, // 77
 	{ { 0x6de, PAL_NONE }, { 0x6de, PAL_NONE }, { 0x6bb, PAL_NONE }, { 0x6b4, PAL_NONE } }, // 78
 	{ { 0x6de, PAL_NONE }, { 0x6c9, PAL_NONE }, { 0x6c2, PAL_NONE }, { 0x6de, PAL_NONE } }, // 79
 	{ { 0x72b, PAL_NONE }, { 0x732, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x739, PAL_NONE } }, // 80
 	{ { 0x72b, PAL_NONE }, { 0x747, PAL_NONE }, { 0x755, PAL_NONE }, { 0x72b, PAL_NONE } }, // 81
 	{ { 0x72b, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x76a, PAL_NONE }, { 0x786, PAL_NONE } }, // 82
 	{ { 0x72b, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x72b, PAL_NONE } }, // 83
 	{ { 0x732, PAL_NONE }, { 0x732, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x739, PAL_NONE } }, // 84
 	{ { 0x732, PAL_NONE }, { 0x747, PAL_NONE }, { 0x732, PAL_NONE }, { 0x732, PAL_NONE } }, // 85
 	{ { 0x732, PAL_NONE }, { 0x732, PAL_NONE }, { 0x755, PAL_NONE }, { 0x794, PAL_NONE } }, // 86
 	{ { 0x732, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x732, PAL_NONE }, { 0x78d, PAL_NONE } }, // 87
 	{ { 0x747, PAL_NONE }, { 0x732, PAL_NONE }, { 0x747, PAL_NONE }, { 0x740, PAL_NONE } }, // 88
 	{ { 0x747, PAL_NONE }, { 0x747, PAL_NONE }, { 0x732, PAL_NONE }, { 0x76a, PAL_NONE } }, // 89
 	{ { 0x747, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x755, PAL_NONE }, { 0x747, PAL_NONE } }, // 90
 	{ { 0x747, PAL_NONE }, { 0x786, PAL_NONE }, { 0x732, PAL_NONE }, { 0x747, PAL_NONE } }, // 91
 	{ { 0x74e, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x794, PAL_NONE } }, // 92
 	{ { 0x74e, PAL_NONE }, { 0x755, PAL_NONE }, { 0x732, PAL_NONE }, { 0x74e, PAL_NONE } }, // 93
 	{ { 0x74e, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x786, PAL_NONE }, { 0x747, PAL_NONE } }, // 94
 	{ { 0x74e, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x732, PAL_NONE }, { 0x794, PAL_NONE } }, // 95
 	{ { 0x76a, PAL_NONE }, { 0x76a, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x74e, PAL_NONE } }, // 96
 	{ { 0x76a, PAL_NONE }, { 0x794, PAL_NONE }, { 0x732, PAL_NONE }, { 0x76a, PAL_NONE } }, // 97
 	{ { 0x76a, PAL_NONE }, { 0x732, PAL_NONE }, { 0x786, PAL_NONE }, { 0x76a, PAL_NONE } }, // 98
 	{ { 0x76a, PAL_NONE }, { 0x786, PAL_NONE }, { 0x732, PAL_NONE }, { 0x78d, PAL_NONE } }, // 99
 	{ { 0x78d, PAL_NONE }, { 0x78d, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x794, PAL_NONE } }, // 100
 	{ { 0x78d, PAL_NONE }, { 0x732, PAL_NONE }, { 0x739, PAL_NONE }, { 0x747, PAL_NONE } }, // 101
 	{ { 0x78d, PAL_NONE }, { 0x732, PAL_NONE }, { 0x786, PAL_NONE }, { 0x76a, PAL_NONE } }, // 102
 	{ { 0x78d, PAL_NONE }, { 0x786, PAL_NONE }, { 0x78d, PAL_NONE }, { 0x794, PAL_NONE } }, // 103
 	{ { 0x786, PAL_NONE }, { 0x786, PAL_NONE }, { 0x740, PAL_NONE }, { 0x732, PAL_NONE } }, // 104
 	{ { 0x786, PAL_NONE }, { 0x786, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x732, PAL_NONE } }, // 105
 	{ { 0x786, PAL_NONE }, { 0x732, PAL_NONE }, { 0x786, PAL_NONE }, { 0x786, PAL_NONE } }, // 106
 	{ { 0x786, PAL_NONE }, { 0x786, PAL_NONE }, { 0x78d, PAL_NONE }, { 0x794, PAL_NONE } }, // 107
 	{ { 0x778, PAL_NONE }, { 0x778, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x778, PAL_NONE } }, // 108
 	{ { 0x778, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x778, PAL_NONE }, { 0x77f, PAL_NONE } }, // 109
 	{ { 0x778, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x77f, PAL_NONE }, { 0x778, PAL_NONE } }, // 110
 	{ { 0x778, PAL_NONE }, { 0x778, PAL_NONE }, { 0x778, PAL_NONE }, { 0x77f, PAL_NONE } }, // 111
 	{ { 0x75c, PAL_NONE }, { 0x71d, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x724, PAL_NONE } }, // 112
 	{ { 0x75c, PAL_NONE }, { 0x72b, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x763, PAL_NONE } }, // 113
 	{ { 0x75c, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x771, PAL_NONE }, { 0x71d, PAL_NONE } }, // 114
 	{ { 0x75c, PAL_NONE }, { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x75c, PAL_NONE } }, // 115
 	{ { 0x771, PAL_NONE }, { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x71d, PAL_NONE } }, // 116
 	{ { 0x771, PAL_NONE }, { 0x747, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x771, PAL_NONE } }, // 117
 	{ { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x771, PAL_NONE }, { 0x724, PAL_NONE } }, // 118
 	{ { 0x771, PAL_NONE }, { 0x771, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x763, PAL_NONE } }, // 119
 	{ { 0x71d, PAL_NONE }, { 0x71d, PAL_NONE }, { 0x771, PAL_NONE }, { 0x724, PAL_NONE } }, // 120
 	{ { 0x71d, PAL_NONE }, { 0x74e, PAL_NONE }, { 0x763, PAL_NONE }, { 0x71d, PAL_NONE } }, // 121
 	{ { 0x71d, PAL_NONE }, { 0x724, PAL_NONE }, { 0x794, PAL_NONE }, { 0x71d, PAL_NONE } }, // 122
 	{ { 0x71d, PAL_NONE }, { 0x71d, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x78d, PAL_NONE } }, // 123
 	{ { 0x794, PAL_NONE }, { 0x724, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x794, PAL_NONE } }, // 124
 	{ { 0x794, PAL_NONE }, { 0x794, PAL_NONE }, { 0x75c, PAL_NONE }, { 0x71d, PAL_NONE } }, // 125
 	{ { 0x794, PAL_NONE }, { 0x724, PAL_NONE }, { 0x794, PAL_NONE }, { 0x71d, PAL_NONE } }, // 126
 	{ { 0x794, PAL_NONE }, { 0x794, PAL_NONE }, { 0x771, PAL_NONE }, { 0x78d, PAL_NONE } }, // 127
 	{ { 0x79b, PALETTE_TO_RED },    { 0x79b, PALETTE_TO_PALE_GREEN }, { 0x79b, PALETTE_TO_MAUVE },      { 0x79b, PALETTE_TO_PURPLE } }, // 128
 	{ { 0x79b, PAL_NONE },          { 0x79b, PALETTE_TO_GREY },       { 0x79b, PALETTE_TO_GREEN },      { 0x79b, PALETTE_TO_WHITE } },  // 129
 	{ { 0x79b, PALETTE_TO_GREEN },  { 0x79b, PALETTE_TO_ORANGE },     { 0x79b, PALETTE_TO_PINK },       { 0x79b, PAL_NONE } },          // 130
 	{ { 0x79b, PALETTE_TO_YELLOW }, { 0x79b, PALETTE_TO_RED },        { 0x79b, PALETTE_TO_CREAM },      { 0x79b, PALETTE_TO_RED } },    // 131
 	{ { 0x7a2, PAL_NONE },          { 0x7a2, PALETTE_TO_RED },        { 0x7a2, PALETTE_TO_PINK },       { 0x7a2, PALETTE_TO_PURPLE } }, // 132
 	{ { 0x7a2, PALETTE_TO_MAUVE },  { 0x7a2, PALETTE_TO_GREEN },      { 0x7a2, PALETTE_TO_PINK },       { 0x7a2, PALETTE_TO_GREY } },   // 133
 	{ { 0x7a2, PALETTE_TO_RED },    { 0x7a2, PALETTE_TO_PALE_GREEN }, { 0x7a2, PALETTE_TO_YELLOW },     { 0x7a2, PALETTE_TO_WHITE } },  // 134
 	{ { 0x7a2, PALETTE_TO_ORANGE }, { 0x7a2, PALETTE_TO_MAUVE },      { 0x7a2, PALETTE_TO_CREAM },      { 0x7a2, PALETTE_TO_BROWN } },  // 135
 	{ { 0x7a9, PALETTE_TO_RED },    { 0x7a9, PAL_NONE },              { 0x7a9, PALETTE_TO_ORANGE },     { 0x7a9, PALETTE_TO_GREY } },   // 136
 	{ { 0x7a9, PALETTE_TO_ORANGE }, { 0x7a9, PALETTE_TO_GREEN },      { 0x7a9, PALETTE_TO_PALE_GREEN }, { 0x7a9, PALETTE_TO_MAUVE } },  // 137
 	{ { 0x7a9, PALETTE_TO_PINK },   { 0x7a9, PALETTE_TO_RED },        { 0x7a9, PALETTE_TO_GREEN },      { 0x7a9, PALETTE_TO_BROWN } },  // 138
 	{ { 0x7a9, PALETTE_TO_GREEN },  { 0x7a9, PAL_NONE },              { 0x7a9, PALETTE_TO_RED },        { 0x7a9, PALETTE_TO_CREAM } },  // 139
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          // 140
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          // 141
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          // 142
 	{ { 0x7b0, PAL_NONE },          { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE },              { 0x7b0, PAL_NONE } },          // 143
 	{ { 0x7b7, PALETTE_TO_PINK },   { 0x7b7, PALETTE_TO_RED },        { 0x7b7, PALETTE_TO_ORANGE },     { 0x7b7, PALETTE_TO_MAUVE } },  // 144
 	{ { 0x7b7, PALETTE_TO_RED },    { 0x7b7, PAL_NONE },              { 0x7b7, PALETTE_TO_GREY },       { 0x7b7, PALETTE_TO_CREAM } },  // 145
 	{ { 0x7b7, PALETTE_TO_GREEN },  { 0x7b7, PALETTE_TO_BROWN },      { 0x7b7, PALETTE_TO_PINK },       { 0x7b7, PALETTE_TO_RED } },    // 146
 	{ { 0x7b7, PAL_NONE },          { 0x7b7, PALETTE_TO_PALE_GREEN }, { 0x7b7, PALETTE_TO_ORANGE },     { 0x7b7, PALETTE_TO_RED } },    // 147
 	{ { 0x7be, PALETTE_TO_RED },    { 0x7be, PALETTE_TO_PINK },       { 0x7be, PALETTE_TO_GREEN },      { 0x7be, PAL_NONE } },          // 148
 	{ { 0x7be, PALETTE_TO_GREEN },  { 0x7be, PALETTE_TO_BROWN },      { 0x7be, PALETTE_TO_PURPLE },     { 0x7be, PALETTE_TO_GREY } },   // 149
 	{ { 0x7be, PALETTE_TO_MAUVE },  { 0x7be, PALETTE_TO_CREAM },      { 0x7be, PALETTE_TO_ORANGE },     { 0x7be, PALETTE_TO_RED } },    // 150
 	{ { 0x7be, PAL_NONE },          { 0x7be, PALETTE_TO_RED },        { 0x7be, PALETTE_TO_PALE_GREEN }, { 0x7be, PALETTE_TO_PINK } },   // 151
 	{ { 0x7c5, PALETTE_TO_YELLOW }, { 0x7c5, PALETTE_TO_RED },        { 0x7c5, PALETTE_TO_WHITE },      { 0x7c5, PALETTE_TO_CREAM } },  // 152
 	{ { 0x7c5, PALETTE_TO_RED },    { 0x7c5, PALETTE_TO_PALE_GREEN }, { 0x7c5, PALETTE_TO_BROWN },      { 0x7c5, PALETTE_TO_YELLOW } }, // 153
 	{ { 0x7c5, PAL_NONE },          { 0x7c5, PALETTE_TO_PURPLE },     { 0x7c5, PALETTE_TO_GREEN },      { 0x7c5, PALETTE_TO_YELLOW } }, // 154
 	{ { 0x7c5, PALETTE_TO_PINK },   { 0x7c5, PALETTE_TO_CREAM },      { 0x7c5, PAL_NONE },              { 0x7c5, PALETTE_TO_GREY } },   // 155
 	{ { 0x7cc, PALETTE_TO_YELLOW }, { 0x7cc, PALETTE_TO_GREY },       { 0x7cc, PALETTE_TO_PURPLE },     { 0x7cc, PALETTE_TO_BROWN } },  // 156
 	{ { 0x7cc, PALETTE_TO_GREEN },  { 0x7cc, PAL_NONE },              { 0x7cc, PALETTE_TO_CREAM },      { 0x7cc, PALETTE_TO_WHITE } },  // 157
 	{ { 0x7cc, PALETTE_TO_RED },    { 0x7cc, PALETTE_TO_PALE_GREEN }, { 0x7cc, PALETTE_TO_MAUVE },      { 0x7cc, PALETTE_TO_RED } },    // 158
 	{ { 0x7cc, PALETTE_TO_PINK },   { 0x7cc, PALETTE_TO_ORANGE },     { 0x7cc, PALETTE_TO_GREEN },      { 0x7cc, PALETTE_TO_YELLOW } }, // 159
 	{ { 0x7d3, PALETTE_TO_RED },    { 0x7d3, PALETTE_TO_PINK },       { 0x7d3, PALETTE_TO_BROWN },      { 0x7d3, PALETTE_TO_WHITE } },  // 160
 	{ { 0x7d3, PALETTE_TO_GREEN },  { 0x7d3, PALETTE_TO_ORANGE },     { 0x7d3, PALETTE_TO_GREY },       { 0x7d3, PALETTE_TO_MAUVE } },  // 161
 	{ { 0x7d3, PALETTE_TO_YELLOW }, { 0x7d3, PALETTE_TO_PALE_GREEN }, { 0x7d3, PAL_NONE },              { 0x7d3, PALETTE_TO_CREAM } },  // 162
 	{ { 0x7d3, PALETTE_TO_GREY },   { 0x7d3, PALETTE_TO_RED },        { 0x7d3, PALETTE_TO_WHITE },      { 0x7d3, PAL_NONE } },          // 163
 	/* the extra things follow */
 	{ { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 0 */
 	{ { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x708, PAL_NONE } }, /* 1 */
 	{ { 0x6e5, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 2 */
 	{ { 0x6e5, PAL_NONE }, { 0x708, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 3 */
 	{ { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 4 */
 	{ { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x701, PAL_NONE } }, /* 5 */
 	{ { 0x708, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6fa, PAL_NONE } }, /* 6 */
 	{ { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 7 */
 	{ { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE } }, /* 8 */
 	{ { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 9 */
 	{ { 0x70f, PAL_NONE }, { 0x708, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 10 */
 	{ { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 11 */
 	{ { 0x6fa, PAL_NONE }, { 0x708, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE } }, /* 12 */
 	{ { 0x6fa, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 13 */
 	{ { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 14 */
 	{ { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x701, PAL_NONE } }, /* 15 */
 	{ { 0x701, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6ec, PAL_NONE }, { 0x6fa, PAL_NONE } }, /* 16 */
 	{ { 0x701, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x716, PAL_NONE }, { 0x70f, PAL_NONE } }, /* 17 */
 	{ { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, /* 18 */
 	{ { 0x701, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, /* 19 */
 	{ { 0x6ec, PAL_NONE }, { 0x6ec, PAL_NONE }, { 0x716, PAL_NONE }, { 0x701, PAL_NONE } }, /* 20 */
 	{ { 0x6ec, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6e5, PAL_NONE } }, /* 21 */
 	{ { 0x6ec, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, /* 22 */
 	{ { 0x6ec, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, /* 23 */
 	{ { 0x6f3, PAL_NONE }, { 0x708, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6fa, PAL_NONE } }, /* 24 */
 	{ { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x70f, PAL_NONE } }, /* 25 */
 	{ { 0x6f3, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, /* 26 */
 	{ { 0x6f3, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, /* 27 */
 	{ { 0x716, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6fa, PAL_NONE } }, /* 28 */
 	{ { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x716, PAL_NONE }, { 0x708, PAL_NONE } }, /* 29 */
 	{ { 0x716, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, /* 30 */
 	{ { 0x716, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, /* 31 */
 	{ { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 0
 	{ { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x708, PAL_NONE } }, // 1
 	{ { 0x6e5, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 2
 	{ { 0x6e5, PAL_NONE }, { 0x708, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 3
 	{ { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 4
 	{ { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x701, PAL_NONE } }, // 5
 	{ { 0x708, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6fa, PAL_NONE } }, // 6
 	{ { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 7
 	{ { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE } }, // 8
 	{ { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 9
 	{ { 0x70f, PAL_NONE }, { 0x708, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 10
 	{ { 0x70f, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 11
 	{ { 0x6fa, PAL_NONE }, { 0x708, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE } }, // 12
 	{ { 0x6fa, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 13
 	{ { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 14
 	{ { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x701, PAL_NONE } }, // 15
 	{ { 0x701, PAL_NONE }, { 0x708, PAL_NONE }, { 0x6ec, PAL_NONE }, { 0x6fa, PAL_NONE } }, // 16
 	{ { 0x701, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x716, PAL_NONE }, { 0x70f, PAL_NONE } }, // 17
 	{ { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, // 18
 	{ { 0x701, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, // 19
 	{ { 0x6ec, PAL_NONE }, { 0x6ec, PAL_NONE }, { 0x716, PAL_NONE }, { 0x701, PAL_NONE } }, // 20
 	{ { 0x6ec, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6e5, PAL_NONE } }, // 21
 	{ { 0x6ec, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, // 22
 	{ { 0x6ec, PAL_NONE }, { 0x6e5, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, // 23
 	{ { 0x6f3, PAL_NONE }, { 0x708, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6fa, PAL_NONE } }, // 24
 	{ { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x70f, PAL_NONE } }, // 25
 	{ { 0x6f3, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, // 26
 	{ { 0x6f3, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, // 27
 	{ { 0x716, PAL_NONE }, { 0x70f, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6fa, PAL_NONE } }, // 28
 	{ { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x716, PAL_NONE }, { 0x708, PAL_NONE } }, // 29
 	{ { 0x716, PAL_NONE }, { 0x716, PAL_NONE }, { 0x6f3, PAL_NONE }, { 0x6ec, PAL_NONE } }, // 30
 	{ { 0x716, PAL_NONE }, { 0x701, PAL_NONE }, { 0x6fa, PAL_NONE }, { 0x716, PAL_NONE } }, // 31
 };
 #endif /* TREE_LAND_H */

src/table/unicode.h

➞

Show inline comments

@@ @@ -18,40 +18,40 @@ enum { @@
  * This is not used for FreeType rendering */
 static DefaultUnicodeMapping _default_unicode_map[] = {
 	{ 0x00A0, 0x20 }, /* Non-breaking space / Up arrow */
 	{ 0x00A4, CLRL }, /* Currency sign */
 	{ 0x00A6, CLRL }, /* Broken bar */
 	{ 0x00A7, CLRL }, /* Section sign */
 	{ 0x00A8, CLRL }, /* Diaeresis */
 	{ 0x00A9, CLRL }, /* Copyright sign */
 	{ 0x00AA, CLRA }, /* Feminine ordinal indicator / Down arrow */
 	{ 0x00AC, CLRA }, /* Not sign / Tick mark */
 	{ 0x00AD, 0x20 }, /* Soft hyphen / X mark */
 	{ 0x00AF, CLRA }, /* Macron / Right arrow */
 	{ 0x00B0, CLRL }, /* Degree sign */
 	{ 0x00B1, CLRL }, /* Plus-Minus sign */
 	{ 0x00B2, CLRL }, /* Superscript 2 */
 	{ 0x00B3, CLRL }, /* Superscript 3 */
 	{ 0x00B4, CLRA }, /* Acute accent / Train symbol */
 	{ 0x00B5, CLRA }, /* Micro sign / Truck symbol */
 	{ 0x00B6, CLRA }, /* Pilcrow sign / Bus symbol */
 	{ 0x00B7, CLRA }, /* Middle dot / Aircraft symbol */
 	{ 0x00B8, CLRA }, /* Cedilla / Ship symbol */
 	{ 0x00B9, CLRA }, /* Superscript 1 / Superscript -1 */
 	{ 0x00BA, CLRL }, /* Masculine ordinal indicator */
 	{ 0x00BC, CLRA }, /* One quarter / Small up arrow */
 	{ 0x00BD, CLRA }, /* One half / Small down arrow */
 	{ 0x00BE, CLRL }, /* Three quarters */
 	{ 0x00D0, CLRL }, /* Capital letter eth */
 	{ 0x00D7, CLRL }, /* Multiplication sign */
 	{ 0x00D8, CLRL }, /* Capital letter O with stroke */
 	{ 0x00D9, CLRL }, /* Capital letter U with grave */
 	{ 0x00DE, CLRL }, /* Capital letter thorn */
 	{ 0x00E6, CLRL }, /* Small letter ae */
 	{ 0x00F0, CLRL }, /* Small letter eth */
 	{ 0x00F7, CLRL }, /* Divison sign */
 	{ 0x00F8, CLRL }, /* Small letter o with stroke */
 	{ 0x00FE, CLRL }, /* Small letter thorn */
 	{ 0x0178, 0x9F }, /* Capital letter Y with diaeresis */
 	{ 0x010D, 0x63 }, /* Small letter c with caron */
 	{ 0x00A0, 0x20 }, // Non-breaking space / Up arrow
 	{ 0x00A4, CLRL }, // Currency sign
 	{ 0x00A6, CLRL }, // Broken bar
 	{ 0x00A7, CLRL }, // Section sign
 	{ 0x00A8, CLRL }, // Diaeresis
 	{ 0x00A9, CLRL }, // Copyright sign
 	{ 0x00AA, CLRA }, // Feminine ordinal indicator / Down arrow
 	{ 0x00AC, CLRA }, // Not sign / Tick mark
 	{ 0x00AD, 0x20 }, // Soft hyphen / X mark
 	{ 0x00AF, CLRA }, // Macron / Right arrow
 	{ 0x00B0, CLRL }, // Degree sign
 	{ 0x00B1, CLRL }, // Plus-Minus sign
 	{ 0x00B2, CLRL }, // Superscript 2
 	{ 0x00B3, CLRL }, // Superscript 3
 	{ 0x00B4, CLRA }, // Acute accent / Train symbol
 	{ 0x00B5, CLRA }, // Micro sign / Truck symbol
 	{ 0x00B6, CLRA }, // Pilcrow sign / Bus symbol
 	{ 0x00B7, CLRA }, // Middle dot / Aircraft symbol
 	{ 0x00B8, CLRA }, // Cedilla / Ship symbol
 	{ 0x00B9, CLRA }, // Superscript 1 / Superscript -1
 	{ 0x00BA, CLRL }, // Masculine ordinal indicator
 	{ 0x00BC, CLRA }, // One quarter / Small up arrow
 	{ 0x00BD, CLRA }, // One half / Small down arrow
 	{ 0x00BE, CLRL }, // Three quarters
 	{ 0x00D0, CLRL }, // Capital letter eth
 	{ 0x00D7, CLRL }, // Multiplication sign
 	{ 0x00D8, CLRL }, // Capital letter O with stroke
 	{ 0x00D9, CLRL }, // Capital letter U with grave
 	{ 0x00DE, CLRL }, // Capital letter thorn
 	{ 0x00E6, CLRL }, // Small letter ae
 	{ 0x00F0, CLRL }, // Small letter eth
 	{ 0x00F7, CLRL }, // Divison sign
 	{ 0x00F8, CLRL }, // Small letter o with stroke
 	{ 0x00FE, CLRL }, // Small letter thorn
 	{ 0x0178, 0x9F }, // Capital letter Y with diaeresis
 	{ 0x010D, 0x63 }, // Small letter c with caron
 };

0 comments (0 inline, 0 general)