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/settings_internal.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/settings_internal.h')
-rw-r--r-- | src/settings_internal.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/settings_internal.h b/src/settings_internal.h index 9aaece98f..df3597226 100644 --- a/src/settings_internal.h +++ b/src/settings_internal.h @@ -24,9 +24,7 @@ enum SettingDescTypeLong { SDT_END, /* 10 more possible primitives */ }; - -template <> struct EnumPropsT<SettingDescTypeLong> : MakeEnumPropsT<SettingDescTypeLong, byte, SDT_BEGIN, SDT_END, SDT_END> {}; -typedef TinyEnumT<SettingDescTypeLong> SettingDescType; +typedef SimpleTinyEnumT<SettingDescTypeLong, byte> SettingDescType; enum SettingGuiFlagLong { @@ -42,10 +40,8 @@ enum SettingGuiFlagLong { SGF_NEWGAME_ONLY = 1 << 6, ///< this setting cannot be changed in inside a game SGF_END = 1 << 7, }; - DECLARE_ENUM_AS_BIT_SET(SettingGuiFlagLong); -template <> struct EnumPropsT<SettingGuiFlagLong> : MakeEnumPropsT<SettingGuiFlagLong, byte, SGF_NONE, SGF_END, SGF_END> {}; -typedef TinyEnumT<SettingGuiFlagLong> SettingGuiFlag; +typedef SimpleTinyEnumT<SettingGuiFlagLong, byte> SettingGuiFlag; typedef bool OnChange(int32 var); ///< callback prototype on data modification |