From 119ea7a1959835f242daf988e5a0aabf7a2f41dd Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Sun, 21 Apr 2019 23:13:27 +0100 Subject: [PATCH] Codechange: Remove StationHadVehicleOfTypeByte type --- src/station_base.h | 2 +- src/station_type.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/station_base.h b/src/station_base.h index 794fbdfdfc..b211e2bd48 100644 --- a/src/station_base.h +++ b/src/station_base.h @@ -470,7 +470,7 @@ public: BitmapTileArea catchment_tiles; ///< NOSAVE: Set of individual tiles covered by catchment area - StationHadVehicleOfTypeByte had_vehicle_of_type; + StationHadVehicleOfType had_vehicle_of_type; byte time_since_load; byte time_since_unload; diff --git a/src/station_type.h b/src/station_type.h index 48c1c343c9..9afbc22056 100644 --- a/src/station_type.h +++ b/src/station_type.h @@ -61,7 +61,7 @@ enum StationFacility : byte { DECLARE_ENUM_AS_BIT_SET(StationFacility) /** The vehicles that may have visited a station */ -enum StationHadVehicleOfType { +enum StationHadVehicleOfType : byte { 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 @@ -72,7 +72,6 @@ enum StationHadVehicleOfType { HVOT_WAYPOINT = 1 << 6, ///< Station is a waypoint (NewGRF only!) }; DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType) -typedef SimpleTinyEnumT StationHadVehicleOfTypeByte; /** The different catchment areas used */ enum CatchmentArea {