(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.

1 files changed, 5 insertions, 4 deletions

diff --git a/rail_map.h b/rail_map.h
index 800e06bfa..44a42f9aa 100644
--- a/rail_map.h
+++ b/rail_map.h
@@ -18,7 +18,7 @@ typedef enum RailTileType {
 static inline RailTileType GetRailTileType(TileIndex t)
 {
 	assert(IsTileType(t, MP_RAILWAY));
-	return _m[t].m5 & RAIL_TILE_TYPE_MASK;
+	return (RailTileType)(_m[t].m5 & RAIL_TILE_TYPE_MASK);
 }
 
 /**
@@ -119,6 +119,7 @@ typedef enum Track {
 
 /** Bitfield corresponding to Track */
 typedef enum TrackBits {
+	TRACK_BIT_NONE  = 0U,
 	TRACK_BIT_X     = 1U << TRACK_X,
 	TRACK_BIT_Y     = 1U << TRACK_Y,
 	TRACK_BIT_UPPER = 1U << TRACK_UPPER,
@@ -264,7 +265,7 @@ typedef enum SignalStates {
 
 static inline SignalState GetSingleSignalState(TileIndex t, byte signalbit)
 {
-	return HASBIT(_m[t].m2, signalbit + 4);
+	return (SignalState)HASBIT(_m[t].m2, signalbit + 4);
 }
 
 
@@ -297,8 +298,8 @@ static inline void SetRailGroundType(TileIndex t, RailGroundType rgt)
 static inline RailGroundType GetRailGroundType(TileIndex t)
 {
 	/* TODO Unify this */
-	if (GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT) return GB(_m[t].m4, 0, 4);
-	return GB(_m[t].m2, 0, 4);
+	if (GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT) return (RailGroundType)GB(_m[t].m4, 0, 4);
+	return (RailGroundType)GB(_m[t].m2, 0, 4);
 }
 
 static inline bool IsBarrenRailGround(TileIndex t)