Merge branch 'master' into jgrpp

Remove 'byte' typedef

src/rail.h

@@ -212,12 +212,12 @@ public:
 	/**
 	 * Original railtype number to use when drawing non-newgrf railtypes, or when drawing stations.
 	 */
-	byte fallback_railtype;
+	uint8_t fallback_railtype;
 
 	/**
 	 * Multiplier for curve maximum speed advantage
 	 */
-	byte curve_speed;
+	uint8_t curve_speed;
 
 	/**
 	 * Bit mask of rail type flags
@@ -227,7 +227,7 @@ public:
 	/**
 	 * Bit mask of rail type control flags
 	 */
-	byte ctrl_flags;
+	uint8_t ctrl_flags;
 
 	/**
 	 * Signal extra aspects
@@ -267,7 +267,7 @@ public:
 	/**
 	 * Colour on mini-map
 	 */
-	byte map_colour;
+	uint8_t map_colour;
 
 	/**
 	 * Introduction date.
@@ -292,7 +292,7 @@ public:
 	/**
 	 * The sorting order of this railtype for the toolbar dropdown.
 	 */
-	byte sorting_order;
+	uint8_t sorting_order;
 
 	/**
 	 * NewGRF providing the Action3 for the railtype. nullptr if not available.