diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2019-04-21 23:01:29 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-04-29 17:40:22 +0100 |
| commit | fb6ae81415f5e8dab48f09cd5cfde994a90c950f (patch) | |
| tree | 0bbc93273279959940578dbce33a4cde12977ba4 | |
| parent | 09567bf0b3c6b4e07bdf6ca68286fc302cdcdf69 (diff) | |
| download | openttd-fb6ae81415f5e8dab48f09cd5cfde994a90c950f.tar.xz | |
Codechange: Remove StationFacilityByte type
| -rw-r--r-- | src/base_station_base.h | 2 | ||||
| -rw-r--r-- | src/station_type.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/base_station_base.h b/src/base_station_base.h index d7a67bd65..70164b193 100644 --- a/src/base_station_base.h +++ b/src/base_station_base.h @@ -61,7 +61,7 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> { Town *town; ///< The town this station is associated with OwnerByte owner; ///< The owner of this station - StationFacilityByte facilities; ///< The facilities that this station has + StationFacility facilities; ///< The facilities that this station has uint8 num_specs; ///< Number of specs in the speclist StationSpecList *speclist; ///< List of station specs of this station diff --git a/src/station_type.h b/src/station_type.h index 42d64fcf8..48c1c343c 100644 --- a/src/station_type.h +++ b/src/station_type.h @@ -49,7 +49,7 @@ enum RoadStopType { }; /** The facilities a station might be having */ -enum StationFacility { +enum StationFacility : byte { 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 @@ -59,7 +59,6 @@ enum StationFacility { FACIL_WAYPOINT = 1 << 7, ///< Station is a waypoint }; DECLARE_ENUM_AS_BIT_SET(StationFacility) -typedef SimpleTinyEnumT<StationFacility, byte> StationFacilityByte; /** The vehicles that may have visited a station */ enum StationHadVehicleOfType { |