diff options
author | rubidium <rubidium@openttd.org> | 2009-07-04 11:26:57 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-07-04 11:26:57 +0000 |
commit | 571dfb90557e20f0f3b62288856eef68cc95ed1f (patch) | |
tree | d811e87b06b0b8fd7bd210b2d2007956d498d5c8 /src/station_type.h | |
parent | 65f77a7bee0158dcc3aedc0a360ff65597dad1c8 (diff) | |
download | openttd-571dfb90557e20f0f3b62288856eef68cc95ed1f.tar.xz |
(svn r16736) -Codechange: give some station enums a name and use that instead of 'byte'.
Diffstat (limited to 'src/station_type.h')
-rw-r--r-- | src/station_type.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/station_type.h b/src/station_type.h index 3f2e6846b..513e72571 100644 --- a/src/station_type.h +++ b/src/station_type.h @@ -5,6 +5,8 @@ #ifndef STATION_TYPE_H #define STATION_TYPE_H +#include "core/enum_type.hpp" + typedef uint16 StationID; typedef uint16 RoadStopID; @@ -32,15 +34,17 @@ enum RoadStopType { ROADSTOP_TRUCK ///< A standard stop for trucks }; -enum { +enum StationFacility { FACIL_TRAIN = 0x01, FACIL_TRUCK_STOP = 0x02, FACIL_BUS_STOP = 0x04, FACIL_AIRPORT = 0x08, FACIL_DOCK = 0x10, }; +DECLARE_ENUM_AS_BIT_SET(StationFacility); +typedef SimpleTinyEnumT<StationFacility, byte> StationFacilityByte; -enum { +enum StationHadVehicleOfType { // HVOT_PENDING_DELETE = 1 << 0, // not needed anymore HVOT_TRAIN = 1 << 1, HVOT_BUS = 1 << 2, @@ -51,6 +55,8 @@ enum { * can we do? ;-) */ HVOT_BUOY = 1 << 6 }; +DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType); +typedef SimpleTinyEnumT<StationHadVehicleOfType, byte> StationHadVehicleOfTypeByte; enum CatchmentArea { CA_NONE = 0, |