diff options
author | rubidium <rubidium@openttd.org> | 2009-05-26 11:19:04 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-26 11:19:04 +0000 |
commit | b19d0e0254883d0db9d8f3d01dacd94e0229f9ac (patch) | |
tree | 152d2b425ceec441a36bcb95f34afeace8d2ee31 /src/track_type.h | |
parent | 984bd3b98d6a7ad40fdfa9ef74da79dbd7de8840 (diff) | |
download | openttd-b19d0e0254883d0db9d8f3d01dacd94e0229f9ac.tar.xz |
(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
Diffstat (limited to 'src/track_type.h')
-rw-r--r-- | src/track_type.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/track_type.h b/src/track_type.h index f344a0a49..6177416f5 100644 --- a/src/track_type.h +++ b/src/track_type.h @@ -52,12 +52,8 @@ enum TrackBits { TRACK_BIT_DEPOT = 0x80U, ///< Bitflag for a depot INVALID_TRACK_BIT = 0xFF ///< Flag for an invalid trackbits value }; - -/** Define basic enum properties */ -template <> struct EnumPropsT<TrackBits> : MakeEnumPropsT<TrackBits, byte, TRACK_BIT_NONE, TRACK_BIT_ALL, INVALID_TRACK_BIT> {}; -typedef TinyEnumT<TrackBits> TrackBitsByte; - DECLARE_ENUM_AS_BIT_SET(TrackBits); +typedef SimpleTinyEnumT<TrackBits, byte> TrackBitsByte; /** * Enumeration for tracks and directions. @@ -118,11 +114,8 @@ enum TrackdirBits { TRACKDIR_BIT_MASK = 0x3F3F, ///< Bitmask for bit-operations INVALID_TRACKDIR_BIT = 0xFFFF, ///< Flag for an invalid trackdirbit value }; - -/** Define basic enum properties */ -template <> struct EnumPropsT<TrackdirBits> : MakeEnumPropsT<TrackdirBits, uint16, TRACKDIR_BIT_NONE, TRACKDIR_BIT_MASK, INVALID_TRACKDIR_BIT> {}; -typedef TinyEnumT<TrackdirBits> TrackdirBitsShort; DECLARE_ENUM_AS_BIT_SET(TrackdirBits); +typedef SimpleTinyEnumT<TrackdirBits, uint16> TrackdirBitsShort; typedef uint32 TrackStatus; |