summaryrefslogtreecommitdiff
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
commit85b907c3ef7f3804549eb7f19578722cfea8de8b (patch)
treeb2422353437f4d1f208caf309e6959160a835a59
parent5671f5d258722effb08b094cc90664ec8e641cce (diff)
downloadopenttd-85b907c3ef7f3804549eb7f19578722cfea8de8b.tar.xz
(svn r4374) Never directly commit something you prepared the evening before, mysteriously it will break in the morning, fix r4373
-rw-r--r--road.h26
-rw-r--r--road_map.h21
-rw-r--r--tunnelbridge_cmd.c2
3 files changed, 28 insertions, 21 deletions
diff --git a/road.h b/road.h
new file mode 100644
index 000000000..1d8d4b862
--- /dev/null
+++ b/road.h
@@ -0,0 +1,26 @@
+/* $Id$ */
+
+#ifndef ROAD_H
+#define ROAD_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);
+}
+
+#endif
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,
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 6711beb21..504579a3a 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -84,7 +84,7 @@ enum {
BRIDGE_PARTLY_LEVELED_FOUNDATION = 1 << 1 | 1 << 2 | 1 << 4 | 1 << 8,
// no foundations (X,Y direction) (tileh's 0, 3, 6, 9, 12)
BRIDGE_NO_FOUNDATION = 1 << 0 | 1 << 3 | 1 << 6 | 1 << 9 | 1 << 12,
- BRIDGE_HORZ_RAMP = (BRIDGE_PARTLY_LEVELED_FOUNDATION | BRIDGE_NO_FOUNDATION) & ~0
+ BRIDGE_HORZ_RAMP = (BRIDGE_PARTLY_LEVELED_FOUNDATION | BRIDGE_NO_FOUNDATION) & ~(1 << 0)
};
static inline const PalSpriteID *GetBridgeSpriteTable(int index, byte table)