Changeset - r23679:1cd02c6f1d6a
[Not reviewed]
master
0 1 0
Charles Pigott - 6 years ago 2019-04-22 10:14:42
charlespigott@googlemail.com
Codechange: Remove RoadTypesByte
1 file changed with 1 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/road_type.h
Show inline comments
 
@@ -30,23 +30,22 @@ DECLARE_POSTFIX_INCREMENT(RoadType)
 
template <> struct EnumPropsT<RoadType> : MakeEnumPropsT<RoadType, byte, ROADTYPE_BEGIN, ROADTYPE_END, INVALID_ROADTYPE, 2> {};
 

	
 
/**
 
 * The different roadtypes we support, but then a bitmask of them
 
 * @note currently only roadtypes with ROADTYPE_ROAD and ROADTYPE_TRAM are supported.
 
 */
 
enum RoadTypes {
 
enum RoadTypes : byte {
 
	ROADTYPES_NONE     = 0,                                ///< No roadtypes
 
	ROADTYPES_ROAD     = 1 << ROADTYPE_ROAD,               ///< Road
 
	ROADTYPES_TRAM     = 1 << ROADTYPE_TRAM,               ///< Trams
 
	ROADTYPES_ALL      = ROADTYPES_ROAD | ROADTYPES_TRAM,  ///< Road + trams
 
	ROADTYPES_END,                                         ///< Used for iterations?
 
	INVALID_ROADTYPES  = 0xFF,                             ///< Invalid roadtypes
 
};
 
DECLARE_ENUM_AS_BIT_SET(RoadTypes)
 
template <> struct EnumPropsT<RoadTypes> : MakeEnumPropsT<RoadTypes, byte, ROADTYPES_NONE, ROADTYPES_END, INVALID_ROADTYPES, 2> {};
 
typedef SimpleTinyEnumT<RoadTypes, byte> RoadTypesByte;
 

	
 

	
 
/**
 
 * Enumeration for the road parts on a tile.
 
 *
 
 * This enumeration defines the possible road parts which
0 comments (0 inline, 0 general)