Merge branch 'master' into jgrpp

Remove 'byte' typedef

src/station_type.h

@@ -45,13 +45,13 @@ enum StationType {
 };
 
 /** Types of RoadStops */
-enum RoadStopType {
+enum RoadStopType : uint8_t {
 	ROADSTOP_BUS,    ///< A standard stop for buses
 	ROADSTOP_TRUCK,  ///< A standard stop for trucks
 };
 
 /** The facilities a station might be having */
-enum StationFacility : byte {
+enum StationFacility : uint8_t {
 	FACIL_NONE       = 0,      ///< The station has no facilities at all
 	FACIL_TRAIN      = 1 << 0, ///< Station with train station
 	FACIL_TRUCK_STOP = 1 << 1, ///< Station with truck stops
@@ -63,7 +63,7 @@ enum StationFacility : byte {
 DECLARE_ENUM_AS_BIT_SET(StationFacility)
 
 /** The vehicles that may have visited a station */
-enum StationHadVehicleOfType : byte {
+enum StationHadVehicleOfType : uint8_t {
 	HVOT_NONE     = 0,      ///< Station has seen no vehicles
 	HVOT_TRAIN    = 1 << 1, ///< Station has seen a train
 	HVOT_BUS      = 1 << 2, ///< Station has seen a bus
@@ -88,7 +88,7 @@ enum CatchmentArea {
 	MAX_CATCHMENT      = 10, ///< Maximum catchment for airports with "modified catchment" enabled
 };
 
-enum StationDelivery : byte {
+enum StationDelivery : uint8_t {
 	SD_NEAREST_FIRST = 0, ///< Station delivers cargo only to the nearest accepting industry
 	SD_BALANCED      = 1  ///< Station delivers cargo equally among accepting industries
 };