summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-01-13 00:28:01 +0000
committerrubidium <rubidium@openttd.org>2008-01-13 00:28:01 +0000
commita78d73805f467d3ced0a70a1758435498fd1dbac (patch)
treea6f7dc27debf05db7b7a9dad906e02a054c38796
parentaa1d429d7f8d94a3fba4b413fc9f15021ddda6a4 (diff)
downloadopenttd-a78d73805f467d3ced0a70a1758435498fd1dbac.tar.xz
(svn r11827) -Codechange: do not include enum_type.hpp unnecessary.
-rw-r--r--src/fileio.h1
-rw-r--r--src/openttd.h5
-rw-r--r--src/pathfind.h2
-rw-r--r--src/player_type.h2
-rw-r--r--src/rail_type.h2
-rw-r--r--src/table/namegen.h2
-rw-r--r--src/track_type.h2
7 files changed, 9 insertions, 7 deletions
diff --git a/src/fileio.h b/src/fileio.h
index a8dfc5644..d60d8ed2e 100644
--- 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);
diff --git a/src/openttd.h b/src/openttd.h
index aea9a5336..40114baf6 100644
--- 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 @@ enum TransportType {
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,
diff --git a/src/pathfind.h b/src/pathfind.h
index d01dcc564..d381b45a4 100644
--- a/src/pathfind.h
+++ b/src/pathfind.h
@@ -55,7 +55,7 @@ struct TrackPathFinder {
TrackdirByte the_dir;
- TransportTypeByte tracktype;
+ TransportType tracktype;
uint sub_type;
byte var2;
diff --git a/src/player_type.h b/src/player_type.h
index 0e183fabe..bf33923be 100644
--- 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.
*/
diff --git a/src/rail_type.h b/src/rail_type.h
index c52e0251b..73876bd4a 100644
--- 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.
*
diff --git a/src/table/namegen.h b/src/table/namegen.h
index a9cc514e5..c9695e302 100644
--- a/src/table/namegen.h
+++ b/src/table/namegen.h
@@ -3,7 +3,7 @@
/** @file table/namegen.h Namepart tables for the town name generator */
#include "../stdafx.h"
-#include "../openttd.h"
+#include "../core/enum_type.hpp"
static const char *name_original_english_1[] = {
"Great ",
diff --git a/src/track_type.h b/src/track_type.h
index bd8ccde15..6042bca50 100644
--- a/src/track_type.h
+++ b/src/track_type.h
@@ -5,6 +5,8 @@
#ifndef TRACK_TYPE_H
#define TRACK_TYPE_H
+#include "core/enum_type.hpp"
+
/**
* These are used to specify a single track.
* Can be translated to a trackbit with TrackToTrackbit