mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Remove StationHadVehicleOfTypeByte type

This commit is contained in:
Charles Pigott 2019-04-21 23:13:27 +01:00 committed by PeterN
parent fb6ae81415
commit 119ea7a195
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/station_base.h
View File

@ -470,7 +470,7 @@ public:
BitmapTileArea catchment_tiles; ///< NOSAVE: Set of individual tiles covered by catchment area 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_load;
byte time_since_unload; byte time_since_unload;

3
src/station_type.h
View File

@ -61,7 +61,7 @@ enum StationFacility : byte {
DECLARE_ENUM_AS_BIT_SET(StationFacility) DECLARE_ENUM_AS_BIT_SET(StationFacility)
/** The vehicles that may have visited a station */ /** The vehicles that may have visited a station */
enum StationHadVehicleOfType { enum StationHadVehicleOfType : byte {
HVOT_NONE = 0, ///< Station has seen no vehicles HVOT_NONE = 0, ///< Station has seen no vehicles
HVOT_TRAIN = 1 << 1, ///< Station has seen a train HVOT_TRAIN = 1 << 1, ///< Station has seen a train
HVOT_BUS = 1 << 2, ///< Station has seen a bus 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!) HVOT_WAYPOINT = 1 << 6, ///< Station is a waypoint (NewGRF only!)
}; };
DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType) DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType)
typedef SimpleTinyEnumT<StationHadVehicleOfType, byte> StationHadVehicleOfTypeByte;
/** The different catchment areas used */ /** The different catchment areas used */
enum CatchmentArea { enum CatchmentArea {