diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-02 22:57:47 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-02 22:57:47 +0000 |
| commit | 7831346ef8924c757fbd763c225c7b29b665604f (patch) | |
| tree | 7514d56ab72b15863906486d7256f8e5dd2cef01 /src/road_type.h | |
| parent | 6dd3703a4caafff9a56d878ffac6ce322739067d (diff) | |
| download | openttd-7831346ef8924c757fbd763c225c7b29b665604f.tar.xz | |
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
Diffstat (limited to 'src/road_type.h')
| -rw-r--r-- | src/road_type.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/road_type.h b/src/road_type.h index 8cdf64df0..4554de2d3 100644 --- a/src/road_type.h +++ b/src/road_type.h @@ -16,7 +16,6 @@ enum RoadType { ROADTYPE_BEGIN = 0, ///< Used for iterations ROADTYPE_ROAD = 0, ///< Basic road type ROADTYPE_TRAM = 1, ///< Trams - ROADTYPE_HWAY = 2, ///< Only a placeholder. Not sure what we are going to do with this road type. ROADTYPE_END, ///< Used for iterations INVALID_ROADTYPE = 0xFF ///< flag for invalid roadtype }; @@ -27,16 +26,12 @@ DECLARE_POSTFIX_INCREMENT(RoadType); * @note currently only roadtypes with ROADTYPE_ROAD and ROADTYPE_TRAM are supported. */ enum RoadTypes { - ROADTYPES_NONE = 0, ///< No roadtypes - ROADTYPES_ROAD = 1 << ROADTYPE_ROAD, ///< Road - ROADTYPES_TRAM = 1 << ROADTYPE_TRAM, ///< Trams - ROADTYPES_HWAY = 1 << ROADTYPE_HWAY, ///< Highway (or whatever substitute) - ROADTYPES_ROADTRAM = ROADTYPES_ROAD | ROADTYPES_TRAM, ///< Road + trams - ROADTYPES_ROADHWAY = ROADTYPES_ROAD | ROADTYPES_HWAY, ///< Road + highway (or whatever substitute) - ROADTYPES_TRAMHWAY = ROADTYPES_TRAM | ROADTYPES_HWAY, ///< Trams + highway (or whatever substitute) - ROADTYPES_ALL = ROADTYPES_ROAD | ROADTYPES_TRAM | ROADTYPES_HWAY, ///< Road + trams + highway (or whatever substitute) - ROADTYPES_END, ///< Used for iterations? - INVALID_ROADTYPES = 0xFF ///< Invalid roadtypes + 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> {}; |