(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

7 files changed, 183 insertions, 80 deletions

diff --git a/src/table/ai_rail.h b/src/table/ai_rail.h
index 8e6a49c50..218f33f3d 100644
--- a/src/table/ai_rail.h
+++ b/src/table/ai_rail.h
@@ -12,24 +12,23 @@ typedef struct {
 	byte p2;
 	byte p3;
 	byte dir;
-	AiDefaultBlockData data[VARARRAY_SIZE];
+	const AiDefaultBlockData *data;
 } AiDefaultRailBlock;
 
 typedef struct {
 	byte dir;
-	AiDefaultBlockData data[VARARRAY_SIZE];
+	const AiDefaultBlockData *data;
 } AiDefaultRoadBlock;
 
 
-#define MKHDR(a,b,c,d,e) a,b,c,d,e,{
+#define MKHDR(a,b,c,d,e) a,b,c,d,e,
 #define MKDEPOT(a, b, c)   {0, a, {b, c}}
 #define MKSTATION(a, b, c) {1, a, {b, c}}
 #define MKRAIL(a, b, c)    {2, a, {b, c}}
 #define MKCLRRAIL(a, b, c) {3, a, {b, c}}
-#define MKEND              {4, 0, {0, 0}}}
+#define MKEND              {4, 0, {0, 0}}
 
-static const AiDefaultRailBlock _raildata_ai_0 = {
-	MKHDR(1, 2, 1, 0, 1)
+static const AiDefaultBlockData _raildata_ai_0_data[] = {
 	MKDEPOT(2, -1, 1),
 	MKSTATION(0x15, 0, -1),
 	MKRAIL(0x26, 0, 1),
@@ -37,8 +36,11 @@ static const AiDefaultRailBlock _raildata_ai_0 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_1 = {
-	MKHDR(1, 2, 1, 0, 3)
+static const AiDefaultRailBlock _raildata_ai_0 = {
+	1, 2, 1, 0, 1, _raildata_ai_0_data
+};
+
+static const AiDefaultBlockData _raildata_ai_1_data[] = {
 	MKDEPOT(2, -1, -1),
 	MKRAIL(0x26, 0, -1),
 	MKSTATION(0x15, 0, 0),
@@ -46,8 +48,11 @@ static const AiDefaultRailBlock _raildata_ai_1 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_2 = {
-	MKHDR(1, 2, 1, 0, 0)
+static const AiDefaultRailBlock _raildata_ai_1 = {
+	1, 2, 1, 0, 3, _raildata_ai_1_data
+};
+
+static const AiDefaultBlockData _raildata_ai_2_data[] = {
 	MKDEPOT(1, -1, -1),
 	MKRAIL(0x15, -1, 0),
 	MKSTATION(0x14, 0, 0),
@@ -55,8 +60,11 @@ static const AiDefaultRailBlock _raildata_ai_2 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_3 = {
-	MKHDR(1, 2, 1, 0, 2)
+static const AiDefaultRailBlock _raildata_ai_2 = {
+	1, 2, 1, 0, 0, _raildata_ai_2_data
+};
+
+static const AiDefaultBlockData _raildata_ai_3_data[] = {
 	MKDEPOT(1, 1, -1),
 	MKRAIL(0x15, 1, 0),
 	MKSTATION(0x14, -1, 0),
@@ -64,24 +72,33 @@ static const AiDefaultRailBlock _raildata_ai_3 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_4 = {
-	MKHDR(1, 2, 2, 0, 255)
+static const AiDefaultRailBlock _raildata_ai_3 = {
+	1, 2, 1, 0, 2, _raildata_ai_3_data
+};
+
+static const AiDefaultBlockData _raildata_ai_4_data[] = {
 	MKSTATION(0x15, 0, 0),
 	MKCLRRAIL(3, 0, -1),
 	MKCLRRAIL(1, 0, 2),
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_5 = {
-	MKHDR(1, 2, 2, 0, 255)
+static const AiDefaultRailBlock _raildata_ai_4 = {
+	1, 2, 2, 0, 255, _raildata_ai_4_data
+};
+
+static const AiDefaultBlockData _raildata_ai_5_data[] = {
 	MKSTATION(0x14, 0, 0),
 	MKCLRRAIL(0, -1, 0),
 	MKCLRRAIL(2, 2, 0),
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_6 = {
-	MKHDR(2, 3, 1, 0, 1)
+static const AiDefaultRailBlock _raildata_ai_5 = {
+	1, 2, 2, 0, 255, _raildata_ai_5_data
+};
+
+static const AiDefaultBlockData _raildata_ai_6_data[] = {
 	MKSTATION(0x27, 0, -2),
 	MKRAIL(0xC2, 0, 1),
 	MKRAIL(0xC2, 1, 1),
@@ -92,8 +109,11 @@ static const AiDefaultRailBlock _raildata_ai_6 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_7 = {
-	MKHDR(2, 3, 1, 0, 3)
+static const AiDefaultRailBlock _raildata_ai_6 = {
+	2, 3, 1, 0, 1, _raildata_ai_6_data
+};
+
+static const AiDefaultBlockData _raildata_ai_7_data[] = {
 	MKDEPOT(1, 0, -3),
 	MKRAIL(0x1A, 0, -2),
 	MKRAIL(0x26, 1, -2),
@@ -104,8 +124,11 @@ static const AiDefaultRailBlock _raildata_ai_7 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_8 = {
-	MKHDR(2, 3, 1, 0, 2)
+static const AiDefaultRailBlock _raildata_ai_7 = {
+	2, 3, 1, 0, 3, _raildata_ai_7_data
+};
+
+static const AiDefaultBlockData _raildata_ai_8_data[] = {
 	MKSTATION(0x26, -2, 0),
 	MKRAIL(0xC1, 1, 0),
 	MKRAIL(0xC1, 1, 1),
@@ -116,8 +139,11 @@ static const AiDefaultRailBlock _raildata_ai_8 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_9 = {
-	MKHDR(2, 3, 1, 0, 0)
+static const AiDefaultRailBlock _raildata_ai_8 = {
+	2, 3, 1, 0, 2, _raildata_ai_8_data
+};
+
+static const AiDefaultBlockData _raildata_ai_9_data[] = {
 	MKDEPOT(2, -3, -1),
 	MKRAIL(0x29, -2, -1),
 	MKRAIL(0x15, -2, 0),
@@ -128,8 +154,11 @@ static const AiDefaultRailBlock _raildata_ai_9 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_10 = {
-	MKHDR(2, 3, 2, 0, 255)
+static const AiDefaultRailBlock _raildata_ai_9 = {
+	2, 3, 1, 0, 0, _raildata_ai_9_data
+};
+
+static const AiDefaultBlockData _raildata_ai_10_data[] = {
 	MKRAIL(0x1A, 0, -3),
 	MKRAIL(0x20, 1, -3),
 	MKRAIL(0xC2, 0, -2),
@@ -144,8 +173,11 @@ static const AiDefaultRailBlock _raildata_ai_10 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_11 = {
-	MKHDR(2, 3, 2, 0, 255)
+static const AiDefaultRailBlock _raildata_ai_10 = {
+	2, 3, 2, 0, 255, _raildata_ai_10_data
+};
+
+static const AiDefaultBlockData _raildata_ai_11_data[] = {
 	MKRAIL(0x29, -3, 0),
 	MKRAIL(0x10, -3, 1),
 	MKRAIL(0xC1, -2, 0),
@@ -160,8 +192,11 @@ static const AiDefaultRailBlock _raildata_ai_11 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_12 = {
-	MKHDR(2, 3, 2, 1, 3)
+static const AiDefaultRailBlock _raildata_ai_11 = {
+	2, 3, 2, 0, 255, _raildata_ai_11_data
+};
+
+static const AiDefaultBlockData _raildata_ai_12_data[] = {
 	MKRAIL(0x88, -1, -3),
 	MKRAIL(0x6, 0, -3),
 	MKRAIL(0x2, -1, -2),
@@ -179,8 +214,11 @@ static const AiDefaultRailBlock _raildata_ai_12 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_13 = {
-	MKHDR(2, 3, 2, 1, 0)
+static const AiDefaultRailBlock _raildata_ai_12 = {
+	2, 3, 2, 1, 3, _raildata_ai_12_data
+};
+
+static const AiDefaultBlockData _raildata_ai_13_data[] = {
 	MKRAIL(0x21, -3, 0),
 	MKRAIL(0x50, -3, 1),
 	MKRAIL(0x81, -2, 0),
@@ -198,8 +236,11 @@ static const AiDefaultRailBlock _raildata_ai_13 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_14 = {
-	MKHDR(2, 3, 2, 1, 1)
+static const AiDefaultRailBlock _raildata_ai_13 = {
+	2, 3, 2, 1, 0, _raildata_ai_13_data
+};
+
+static const AiDefaultBlockData _raildata_ai_14_data[] = {
 	MKRAIL(0x88, -1, -3),
 	MKRAIL(0x6, 0, -3),
 	MKRAIL(0x2, -1, -2),
@@ -217,8 +258,11 @@ static const AiDefaultRailBlock _raildata_ai_14 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_15 = {
-	MKHDR(2, 3, 2, 1, 2)
+static const AiDefaultRailBlock _raildata_ai_14 = {
+	2, 3, 2, 1, 1, _raildata_ai_14_data
+};
+
+static const AiDefaultBlockData _raildata_ai_15_data[] = {
 	MKRAIL(0x21, -3, 0),
 	MKRAIL(0x50, -3, 1),
 	MKRAIL(0x81, -2, 0),
@@ -236,8 +280,11 @@ static const AiDefaultRailBlock _raildata_ai_15 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_16 = {
-	MKHDR(1, 3, 1, 0, 1)
+static const AiDefaultRailBlock _raildata_ai_15 = {
+	2, 3, 2, 1, 2, _raildata_ai_15_data
+};
+
+static const AiDefaultBlockData _raildata_ai_16_data[] = {
 	MKSTATION(0x17, 0, -2),
 	MKRAIL(0x1A, 0, 1),
 	MKCLRRAIL(1, 0, 2),
@@ -245,8 +292,11 @@ static const AiDefaultRailBlock _raildata_ai_16 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_17 = {
-	MKHDR(1, 3, 1, 0, 3)
+static const AiDefaultRailBlock _raildata_ai_16 = {
+	1, 3, 1, 0, 1, _raildata_ai_16_data
+};
+
+static const AiDefaultBlockData _raildata_ai_17_data[] = {
 	MKCLRRAIL(3, 0, -2),
 	MKRAIL(0x26, 0, -1),
 	MKDEPOT(2, -1, -1),
@@ -254,8 +304,11 @@ static const AiDefaultRailBlock _raildata_ai_17 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_18 = {
-	MKHDR(1, 3, 1, 0, 0)
+static const AiDefaultRailBlock _raildata_ai_17 = {
+	1, 3, 1, 0, 3, _raildata_ai_17_data
+};
+
+static const AiDefaultBlockData _raildata_ai_18_data[] = {
 	MKCLRRAIL(0, -2, 0),
 	MKRAIL(0x29, -1, 0),
 	MKDEPOT(3, -1, 1),
@@ -263,8 +316,11 @@ static const AiDefaultRailBlock _raildata_ai_18 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_19 = {
-	MKHDR(1, 3, 1, 0, 2)
+static const AiDefaultRailBlock _raildata_ai_18 = {
+	1, 3, 1, 0, 0, _raildata_ai_18_data
+};
+
+static const AiDefaultBlockData _raildata_ai_19_data[] = {
 	MKSTATION(0x16, -2, 0),
 	MKDEPOT(2, 0, -1),
 	MKRAIL(0x20, 1, -1),
@@ -273,8 +329,11 @@ static const AiDefaultRailBlock _raildata_ai_19 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_20 = {
-	MKHDR(2, 3, 1, 0, 1)
+static const AiDefaultRailBlock _raildata_ai_19 = {
+	1, 3, 1, 0, 2, _raildata_ai_19_data
+};
+
+static const AiDefaultBlockData _raildata_ai_20_data[] = {
 	MKSTATION(0x26, -2, 0),
 	MKRAIL(0xC1, 1, 0),
 	MKRAIL(0xC1, 1, 1),
@@ -285,8 +344,11 @@ static const AiDefaultRailBlock _raildata_ai_20 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_21 = {
-	MKHDR(2, 3, 1, 0, 3)
+static const AiDefaultRailBlock _raildata_ai_20 = {
+	2, 3, 1, 0, 1, _raildata_ai_20_data
+};
+
+static const AiDefaultBlockData _raildata_ai_21_data[] = {
 	MKDEPOT(2, -3, -1),
 	MKRAIL(0x3F, -2, -1),
 	MKRAIL(0x10, -2, 0),
@@ -297,8 +359,11 @@ static const AiDefaultRailBlock _raildata_ai_21 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_22 = {
-	MKHDR(2, 3, 1, 0, 0)
+static const AiDefaultRailBlock _raildata_ai_21 = {
+	2, 3, 1, 0, 3, _raildata_ai_21_data
+};
+
+static const AiDefaultBlockData _raildata_ai_22_data[] = {
 	MKSTATION(0x27, 0, -2),
 	MKRAIL(0xC2, 0, 1),
 	MKRAIL(0xC2, 1, 1),
@@ -310,8 +375,11 @@ static const AiDefaultRailBlock _raildata_ai_22 = {
 	MKEND
 };
 
-static const AiDefaultRailBlock _raildata_ai_23 = {
-	MKHDR(2, 3, 1, 0, 2)
+static const AiDefaultRailBlock _raildata_ai_22 = {
+	2, 3, 1, 0, 0, _raildata_ai_22_data
+};
+
+static const AiDefaultBlockData _raildata_ai_23_data[] = {
 	MKDEPOT(1, 0, -3),
 	MKRAIL(0x1A, 0, -2),
 	MKRAIL(0x29, 1, -2),
@@ -322,7 +390,9 @@ static const AiDefaultRailBlock _raildata_ai_23 = {
 	MKEND
 };
 
-
+static const AiDefaultRailBlock _raildata_ai_23 = {
+	2, 3, 1, 0, 2, _raildata_ai_23_data
+};
 
 static const AiDefaultRailBlock * const _default_rail_track_data[] = {
 	&_raildata_ai_0,
@@ -356,8 +426,7 @@ static const AiDefaultRailBlock * const _default_rail_track_data[] = {
 
 #define MKHDR(a) a,{
 
-static const AiDefaultRoadBlock _roaddata_ai_0 = {
-	MKHDR(0)
+static const AiDefaultBlockData _roaddata_ai_0_data[] = {
 	MKDEPOT(2, -1,1),
 	MKSTATION(0x2, -1,0),
 	MKRAIL(0xC, 0,0),
@@ -369,8 +438,11 @@ static const AiDefaultRoadBlock _roaddata_ai_0 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_1 = {
-	MKHDR(0)
+static const AiDefaultRoadBlock _roaddata_ai_0 = {
+	0, _roaddata_ai_0_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_1_data[] = {
 	MKDEPOT(1, 0,-1),
 	MKSTATION(0x1, 1,-1),
 	MKRAIL(0x3, 0,0),
@@ -382,8 +454,11 @@ static const AiDefaultRoadBlock _roaddata_ai_1 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_2 = {
-	MKHDR(0)
+static const AiDefaultRoadBlock _roaddata_ai_1 = {
+	0, _roaddata_ai_1_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_2_data[] = {
 	MKDEPOT(3, 1,1),
 	MKSTATION(0x3, 0,1),
 	MKRAIL(0x6, 0,0),
@@ -395,8 +470,11 @@ static const AiDefaultRoadBlock _roaddata_ai_2 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_3 = {
-	MKHDR(0)
+static const AiDefaultRoadBlock _roaddata_ai_2 = {
+	0, _roaddata_ai_2_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_3_data[] = {
 	MKDEPOT(0, 1,0),
 	MKSTATION(0x0, 1,1),
 	MKRAIL(0x6, 0,0),
@@ -408,8 +486,11 @@ static const AiDefaultRoadBlock _roaddata_ai_3 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_4 = {
-	MKHDR(1)
+static const AiDefaultRoadBlock _roaddata_ai_3 = {
+	0, _roaddata_ai_3_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_4_data[] = {
 	MKSTATION(0x2, -1,0),
 	MKRAIL(0x8, 0,0),
 	MKCLRRAIL(0, 0,-1),
@@ -418,8 +499,11 @@ static const AiDefaultRoadBlock _roaddata_ai_4 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_5 = {
-	MKHDR(1)
+static const AiDefaultRoadBlock _roaddata_ai_4 = {
+	1, _roaddata_ai_4_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_5_data[] = {
 	MKSTATION(0x3, 0,1),
 	MKRAIL(0x4, 0,0),
 	MKCLRRAIL(0, -1,0),
@@ -428,8 +512,11 @@ static const AiDefaultRoadBlock _roaddata_ai_5 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_6 = {
-	MKHDR(1)
+static const AiDefaultRoadBlock _roaddata_ai_5 = {
+	1, _roaddata_ai_5_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_6_data[] = {
 	MKSTATION(0x0, 1,1),
 	MKRAIL(0x2, 0,1),
 	MKCLRRAIL(0, 0,0),
@@ -438,8 +525,11 @@ static const AiDefaultRoadBlock _roaddata_ai_6 = {
 	MKEND
 };
 
-static const AiDefaultRoadBlock _roaddata_ai_7 = {
-	MKHDR(1)
+static const AiDefaultRoadBlock _roaddata_ai_6 = {
+	1, _roaddata_ai_6_data
+};
+
+static const AiDefaultBlockData _roaddata_ai_7_data[] = {
 	MKSTATION(0x1, 1,-1),
 	MKRAIL(0x1, 1,0),
 	MKCLRRAIL(0, 0,0),
@@ -448,6 +538,10 @@ static const AiDefaultRoadBlock _roaddata_ai_7 = {
 	MKEND
 };
 
+static const AiDefaultRoadBlock _roaddata_ai_7 = {
+	1, _roaddata_ai_7_data
+};
+
 
 static const AiDefaultRoadBlock * const _road_default_block_data[] = {
 	&_roaddata_ai_0,
diff --git a/src/table/engines.h b/src/table/engines.h
index 08c4cea00..8fd8a7ee6 100644
--- a/src/table/engines.h
+++ b/src/table/engines.h
@@ -490,7 +490,7 @@ const RailVehicleInfo orig_rail_vehicle_info[NUM_TRAIN_ENGINES] = {
  * @param g sound effect
  * @param h refittable
  */
-#define SVI(a, b, c, d, e, f, g, h) { a, b, c, d, e, f, g, h }
+#define SVI(a, b, c, d, e, f, g, h) { a, b, c, d, e, f, {g}, h }
 const ShipVehicleInfo orig_ship_vehicle_info[NUM_SHIP_ENGINES] = {
 	//   image_index  cargo_type     cargo_amount                 refittable
 	//   |    base_cost |              |    running_cost          |
@@ -522,7 +522,7 @@ const ShipVehicleInfo orig_ship_vehicle_info[NUM_SHIP_ENGINES] = {
  * @param h mail_capacity
  * @param i passenger_capacity
  */
-#define AVI(a, b, c, d, e, f, g, h, i) { a, b, c, d, e, f, g, h, i }
+#define AVI(a, b, c, d, e, f, g, h, i) { a, b, c, d, {e}, f, g, h, i }
 #define H 0
 #define P AIR_CTOL
 #define J AIR_CTOL | AIR_FAST
@@ -589,7 +589,7 @@ const AircraftVehicleInfo orig_aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES] = {
  * @param f capacity
  * @param g cargo_type
  */
-#define RVI(a, b, c, d, e, f, g) { a, b, c, d, e, f, g }
+#define RVI(a, b, c, d, e, f, g) { a, b, c, {d}, e, f, g }
 const RoadVehicleInfo orig_road_vehicle_info[NUM_ROAD_ENGINES] = {
 	//    image_index       sfx                                 max_speed
 	//    |    base_cost    |                                   |   capacity
diff --git a/src/table/namegen.h b/src/table/namegen.h
index a5d9974d6..d5a4b6107 100644
--- a/src/table/namegen.h
+++ b/src/table/namegen.h
@@ -1727,6 +1727,9 @@ typedef enum CzechAllow {
 	CZA_LONG = 4,
 	CZA_ALL = ~0
 } CzechAllow;
+
+DECLARE_ENUM_AS_BIT_SET(CzechAllow);
+
 // All these flags must be satisfied (in the stem->others direction):
 typedef enum CzechChoose {
 	CZC_NONE = 0, // No requirements.
@@ -1736,6 +1739,8 @@ typedef enum CzechChoose {
 	CZC_ANY = ~0
 } CzechChoose;
 
+DECLARE_ENUM_AS_BIT_SET(CzechChoose);
+
 typedef struct CzechNameSubst {
 	CzechGender gender;
 	CzechAllow allow;
diff --git a/src/table/sprites.h b/src/table/sprites.h
index 071c5ddfb..4d5b91571 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -1336,6 +1336,9 @@ enum Recoloring {
 };
 
 #define PALETTE_RECOLOR_SPRITE(a) (a << PALETTE_SPRITE_START | PALETTE_MODIFIER_COLOR)
+
+static const PalSpriteID PALETTE_CRASH = PALETTE_RECOLOR_SPRITE(0x324);
+
 enum PaletteSprites {
 	//note: these numbers are already the modified once the renderer needs.
 	//the actual sprite number is the upper 16 bits of the number
@@ -1384,7 +1387,8 @@ enum PaletteSprites {
 	PALETTE_TO_TRANSPARENT      = 0x322 << PALETTE_SPRITE_START | PALETTE_MODIFIER_TRANSPARENT, //This sets the sprite to transparent
 	//This is used for changing the tubular bridges to the silicon display, or some grayish color
 	PALETTE_TO_STRUCT_GREY      = PALETTE_RECOLOR_SPRITE(0x323),
-	PALETTE_CRASH               = PALETTE_RECOLOR_SPRITE(0x324),  //this changes stuff to the "crash color"
+
+	//XXX - const - PALETTE_CRASH               = PALETTE_RECOLOR_SPRITE(0x324),  //this changes stuff to the "crash color"
 	//XXX another place where structures are colored.
 	//I'm not sure which colors these are
 	PALETTE_59E                 = PALETTE_RECOLOR_SPRITE(0x59E),
diff --git a/src/table/station_land.h b/src/table/station_land.h
index 1c5864c2a..443987208 100644
--- a/src/table/station_land.h
+++ b/src/table/station_land.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#define TILE_SEQ_END()	{ 0x80, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_END()	{ (byte)0x80, 0, 0, 0, 0, 0, 0 }
 
 static const DrawTileSeqStruct _station_display_datas_0[] = {
 	{  0,  0,  0, 16,  5,  2, SPR_RAIL_PLATFORM_X_REAR  | PALETTE_MODIFIER_COLOR },
@@ -30,7 +30,7 @@ static const DrawTileSeqStruct _station_display_datas_4[] = {
 	{  0,  0,  0, 16,  5,  7, SPR_RAIL_PLATFORM_PILLARS_X_REAR | PALETTE_MODIFIER_COLOR },
 	{  0, 11,  0, 16,  5,  2, SPR_RAIL_PLATFORM_X_FRONT        | PALETTE_MODIFIER_COLOR },
 	{  0,  0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_X_TILE_A | PALETTE_MODIFIER_COLOR },
-	{  0,  0,0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_X_TILE_A     | PALETTE_TO_TRANSPARENT },
+	{  0,  0,(byte)0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_X_TILE_A     | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
@@ -38,7 +38,7 @@ static const DrawTileSeqStruct _station_display_datas_5[] = {
 	{  0,  0,  0,  5, 16,  2, SPR_RAIL_PLATFORM_PILLARS_Y_REAR | PALETTE_MODIFIER_COLOR },
 	{ 11,  0,  0,  5, 16,  2, SPR_RAIL_PLATFORM_Y_FRONT        | PALETTE_MODIFIER_COLOR },
 	{  0,  0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_Y_TILE_A | PALETTE_MODIFIER_COLOR },
-	{  0,  0,0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_Y_TILE_A     | PALETTE_TO_TRANSPARENT },
+	{  0,  0,(byte)0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_Y_TILE_A     | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
@@ -46,7 +46,7 @@ static const DrawTileSeqStruct _station_display_datas_6[] = {
 	{  0,  0,  0, 16,  5,  2, SPR_RAIL_PLATFORM_X_REAR          | PALETTE_MODIFIER_COLOR },
 	{  0, 11,  0, 16,  5,  2, SPR_RAIL_PLATFORM_PILLARS_X_FRONT | PALETTE_MODIFIER_COLOR },
 	{  0,  0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_X_TILE_B  | PALETTE_MODIFIER_COLOR },
-	{  0,  0,0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_X_TILE_B      | PALETTE_TO_TRANSPARENT },
+	{  0,  0,(byte)0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_X_TILE_B      | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
@@ -54,7 +54,7 @@ static const DrawTileSeqStruct _station_display_datas_7[] = {
 	{  0,  0,  0,  5, 16,  2, SPR_RAIL_PLATFORM_Y_REAR          | PALETTE_MODIFIER_COLOR },
 	{ 11,  0,  0,  5, 16,  2, SPR_RAIL_PLATFORM_PILLARS_Y_FRONT | PALETTE_MODIFIER_COLOR },
 	{  0,  0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_Y_TILE_B  | PALETTE_MODIFIER_COLOR },
-	{  0,  0,0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_Y_TILE_B      | PALETTE_TO_TRANSPARENT },
+	{  0,  0,(byte)0x80, 0,  0,  0, SPR_RAIL_ROOF_GLASS_Y_TILE_B      | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
diff --git a/src/table/track_land.h b/src/table/track_land.h
index 78031e840..06b33205e 100644
--- a/src/table/track_land.h
+++ b/src/table/track_land.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 
 #define TILE_SEQ_LINE(img, dx, dy, sx, sy) { dx, dy, 0, sx, sy, 23, img },
-#define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0 }
 
 
 static const DrawTileSeqStruct _depot_gfx_NE[] = {
diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h
index 9b9e7d6cd..4c5908fb6 100644
--- a/src/table/unmovable_land.h
+++ b/src/table/unmovable_land.h
@@ -10,7 +10,7 @@ typedef struct DrawTileUnmovableStruct {
 	byte unused;
 } DrawTileUnmovableStruct;
 
-#define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0 }
 
 static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = {
 	{0xA29, 7, 7, 2, 2, 70, 0},