diff options
| author | KUDr <kudr@openttd.org> | 2006-05-27 16:12:16 +0000 |
|---|---|---|
| committer | KUDr <kudr@openttd.org> | 2006-05-27 16:12:16 +0000 |
| commit | 5e73dce0e71791b87e5b096a890578eefcc26639 (patch) | |
| tree | e4580db6e03032a997fce1392929b7190dc3b03d /road_map.h | |
| parent | 3d01010440440cfbffd1e5d3b0cf1f23f0503a76 (diff) | |
| download | openttd-5e73dce0e71791b87e5b096a890578eefcc26639.tar.xz | |
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
Diffstat (limited to 'road_map.h')
| -rw-r--r-- | road_map.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/road_map.h b/road_map.h index 9ec47bbea..20e84c5be 100644 --- a/road_map.h +++ b/road_map.h @@ -18,7 +18,7 @@ typedef enum RoadTileType { static inline RoadTileType GetRoadTileType(TileIndex t) { assert(IsTileType(t, MP_STREET)); - return GB(_m[t].m5, 4, 4); + return (RoadTileType)(GB(_m[t].m5, 4, 4)); } static inline bool IsLevelCrossing(TileIndex t) @@ -34,7 +34,7 @@ static inline bool IsLevelCrossingTile(TileIndex t) static inline RoadBits GetRoadBits(TileIndex t) { assert(GetRoadTileType(t) == ROAD_TILE_NORMAL); - return GB(_m[t].m5, 0, 4); + return (RoadBits)(GB(_m[t].m5, 0, 4)); } static inline void SetRoadBits(TileIndex t, RoadBits r) @@ -143,13 +143,13 @@ static inline void StartRoadWorks(TileIndex t) { assert(!HasRoadWorks(t)); /* Remove any trees or lamps in case or roadwork */ - SetGroundType(t, min(GetGroundType(t), RGT_PAVED) + RGT_ROADWORK_OFFSET); + SetGroundType(t, (RoadGroundType)(min(GetGroundType(t), RGT_PAVED) + RGT_ROADWORK_OFFSET)); } static inline void TerminateRoadWorks(TileIndex t) { assert(HasRoadWorks(t)); - SetGroundType(t, GetGroundType(t) - RGT_ROADWORK_OFFSET); + SetGroundType(t, (RoadGroundType)(GetGroundType(t) - RGT_ROADWORK_OFFSET)); /* Stop the counter */ SB(_m[t].m4, 0, 4, 0); } |