@@ -12,7 +12,7 @@
|
||||
|
||||
#include "core/enum_type.hpp"
|
||||
|
||||
typedef uint32 RailTypeLabel;
|
||||
typedef uint32_t RailTypeLabel;
|
||||
|
||||
static const RailTypeLabel RAILTYPE_LABEL_RAIL = 'RAIL';
|
||||
static const RailTypeLabel RAILTYPE_LABEL_ELECTRIC = 'ELRL';
|
||||
@@ -41,9 +41,9 @@ template <> struct EnumPropsT<RailType> : MakeEnumPropsT<RailType, byte, RAILTYP
|
||||
|
||||
/**
|
||||
* The different railtypes we support, but then a bitmask of them.
|
||||
* @note Must be treated as a uint64 type, narrowing it causes bit membership tests to give wrong results, as in bug #6951.
|
||||
* @note Must be treated as a uint64_t type, narrowing it causes bit membership tests to give wrong results, as in bug #6951.
|
||||
*/
|
||||
enum RailTypes : uint64 {
|
||||
enum RailTypes : uint64_t {
|
||||
RAILTYPES_NONE = 0, ///< No rail types
|
||||
RAILTYPES_RAIL = 1 << RAILTYPE_RAIL, ///< Non-electrified rails
|
||||
RAILTYPES_ELECTRIC = 1 << RAILTYPE_ELECTRIC, ///< Electrified rails
|
||||
|
Reference in New Issue
Block a user