summaryrefslogtreecommitdiff
path: root/road_map.h
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-04-12 05:26:36 +0000
committertron <tron@openttd.org>2006-04-12 05:26:36 +0000
commit4615a265524960e5f6f90cbc31b13e9afcf9c64e (patch)
treeb2422353437f4d1f208caf309e6959160a835a59 /road_map.h
parent82afa4caf2273662556c57494d2252feaced8b6f (diff)
downloadopenttd-4615a265524960e5f6f90cbc31b13e9afcf9c64e.tar.xz
(svn r4374) Never directly commit something you prepared the evening before, mysteriously it will break in the morning, fix r4373
Diffstat (limited to 'road_map.h')
-rw-r--r--road_map.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/road_map.h b/road_map.h
index b93dd8581..e6b692620 100644
--- a/road_map.h
+++ b/road_map.h
@@ -5,28 +5,9 @@
#include "macros.h"
#include "rail.h"
+#include "road.h"
#include "tile.h"
-typedef enum RoadBits {
- ROAD_NW = 1,
- ROAD_SW = 2,
- ROAD_SE = 4,
- ROAD_NE = 8,
- ROAD_X = ROAD_SW | ROAD_NE,
- ROAD_Y = ROAD_NW | ROAD_SE,
- ROAD_ALL = ROAD_X | ROAD_Y
-} RoadBits;
-
-static inline RoadBits ComplementRoadBits(RoadBits r)
-{
- return ROAD_ALL ^ r;
-}
-
-static inline RoadBits DiagDirToRoadBits(DiagDirection d)
-{
- return 1 << (3 ^ d);
-}
-
typedef enum RoadType {
ROAD_NORMAL,