Mercurial > hg > openttd
changeset 3518:b177fef8b678 draft
(svn r4374) Never directly commit something you prepared the evening before, mysteriously it will break in the morning, fix r4373
| author | tron <tron@openttd.org> |
|---|---|
| date | Wed, 12 Apr 2006 05:26:36 +0000 |
| parents | 11b895175f3f |
| children | 4fddce7e73a8 |
| files | road.h road_map.h tunnelbridge_cmd.c |
| diffstat | 3 files changed, 28 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /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
--- 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,
--- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -84,7 +84,7 @@ 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)