summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2019-04-21 23:13:27 +0100
committerPeterN <peter@fuzzle.org>2019-04-29 17:40:22 +0100
commit119ea7a1959835f242daf988e5a0aabf7a2f41dd (patch)
treef058ff92b7bc170cd382d679344e4d6ab668ce53 /src
parentfb6ae81415f5e8dab48f09cd5cfde994a90c950f (diff)
downloadopenttd-119ea7a1959835f242daf988e5a0aabf7a2f41dd.tar.xz
Codechange: Remove StationHadVehicleOfTypeByte type
Diffstat (limited to 'src')
-rw-r--r--src/station_base.h2
-rw-r--r--src/station_type.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/station_base.h b/src/station_base.h
index 794fbdfdf..b211e2bd4 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 48c1c343c..9afbc2205 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<StationHadVehicleOfType, byte> StationHadVehicleOfTypeByte;
/** The different catchment areas used */
enum CatchmentArea {