Mercurial > hg > openttd
changeset 8263:aeaa4ef701df draft
(svn r11827) -Codechange: do not include enum_type.hpp unnecessary.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sun, 13 Jan 2008 00:28:01 +0000 |
parents | b3a92515b463 |
children | 2495310e220f |
files | src/fileio.h src/openttd.h src/pathfind.h src/player_type.h src/rail_type.h src/table/namegen.h src/track_type.h |
diffstat | 7 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.h +++ b/src/fileio.h @@ -7,6 +7,7 @@ #include <map> #include <string> +#include "core/enum_type.hpp" void FioSeekTo(uint32 pos, int mode); void FioSeekToFile(uint8 slot, uint32 pos);
--- a/src/openttd.h +++ b/src/openttd.h @@ -8,7 +8,6 @@ #define VARDEF extern #endif -#include "core/enum_type.hpp" #include "strings_type.h" // Forward declarations of structs. @@ -95,10 +94,6 @@ INVALID_TRANSPORT = 0xff, }; -/** Define basic enum properties */ -template <> struct EnumPropsT<TransportType> : MakeEnumPropsT<TransportType, byte, TRANSPORT_BEGIN, TRANSPORT_END, INVALID_TRANSPORT> {}; -typedef TinyEnumT<TransportType> TransportTypeByte; - /* Display Options */ enum { DO_SHOW_TOWN_NAMES = 0,
--- a/src/pathfind.h +++ b/src/pathfind.h @@ -55,7 +55,7 @@ TrackdirByte the_dir; - TransportTypeByte tracktype; + TransportType tracktype; uint sub_type; byte var2;
--- a/src/player_type.h +++ b/src/player_type.h @@ -5,6 +5,8 @@ #ifndef PLAYER_TYPE_H #define PLAYER_TYPE_H +#include "core/enum_type.hpp" + /** * Enum for all players/owners. */
--- a/src/rail_type.h +++ b/src/rail_type.h @@ -5,6 +5,8 @@ #ifndef RAIL_TYPE_H #define RAIL_TYPE_H +#include "core/enum_type.hpp" + /** * Enumeration for all possible railtypes. *