diff options
| author | Peter Nelson <peter1138@openttd.org> | 2018-07-23 00:05:23 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2018-07-26 13:27:40 +0100 |
| commit | bf8d7df7367055dcfad6cc1c21fd9c762ffc2fe4 (patch) | |
| tree | 8fe03509c7d1ef6ef092521632e2cc32a36e3287 /src/rail_type.h | |
| parent | 5db883fbe9b8ef6171bfafc145a80932c3920504 (diff) | |
| download | openttd-bf8d7df7367055dcfad6cc1c21fd9c762ffc2fe4.tar.xz | |
Change: Extend rail types to 64 (6 bit storage)
Diffstat (limited to 'src/rail_type.h')
| -rw-r--r-- | src/rail_type.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rail_type.h b/src/rail_type.h index ee589898b..ebca7ec35 100644 --- a/src/rail_type.h +++ b/src/rail_type.h @@ -32,7 +32,7 @@ enum RailType { RAILTYPE_ELECTRIC = 1, ///< Electric rails RAILTYPE_MONO = 2, ///< Monorail RAILTYPE_MAGLEV = 3, ///< Maglev - RAILTYPE_END = 16, ///< Used for iterations + RAILTYPE_END = 64, ///< Used for iterations INVALID_RAILTYPE = 0xFF, ///< Flag for invalid railtype DEF_RAILTYPE_FIRST = RAILTYPE_END, ///< Default railtype: first available @@ -43,7 +43,7 @@ enum RailType { /** Allow incrementing of Track variables */ DECLARE_POSTFIX_INCREMENT(RailType) /** Define basic enum properties */ -template <> struct EnumPropsT<RailType> : MakeEnumPropsT<RailType, byte, RAILTYPE_BEGIN, RAILTYPE_END, INVALID_RAILTYPE, 4> {}; +template <> struct EnumPropsT<RailType> : MakeEnumPropsT<RailType, byte, RAILTYPE_BEGIN, RAILTYPE_END, INVALID_RAILTYPE, 6> {}; typedef TinyEnumT<RailType> RailTypeByte; /** @@ -55,7 +55,7 @@ enum RailTypes { RAILTYPES_ELECTRIC = 1 << RAILTYPE_ELECTRIC, ///< Electrified rails RAILTYPES_MONO = 1 << RAILTYPE_MONO, ///< Monorail! RAILTYPES_MAGLEV = 1 << RAILTYPE_MAGLEV, ///< Ever fast maglev - INVALID_RAILTYPES = UINT_MAX, ///< Invalid railtypes + INVALID_RAILTYPES = UINT64_MAX, ///< Invalid railtypes }; DECLARE_ENUM_AS_BIT_SET(RailTypes) |