summaryrefslogtreecommitdiff
path: root/src/tunnelbridge_map.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-21 22:37:10 +0000
committerrubidium <rubidium@openttd.org>2009-07-21 22:37:10 +0000
commit8405d7d7e762546e3e78d1e0c16bb226c36266fa (patch)
tree11d3829fce669b25be64f203da5d93319a0c3cdc /src/tunnelbridge_map.h
parent8083d67780d6a85c558080ec99dd2d24ae755d0f (diff)
downloadopenttd-8405d7d7e762546e3e78d1e0c16bb226c36266fa.tar.xz
(svn r16907) -Codechange: make a more clear distinction between reservation functions that return a bool and that return TrackBits; GetRailStationReservation vs GetRailwayStationReservation, which one returns the bool and which one the TrackBits?
Diffstat (limited to 'src/tunnelbridge_map.h')
-rw-r--r--src/tunnelbridge_map.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tunnelbridge_map.h b/src/tunnelbridge_map.h
index 5bb2a7465..aa68accba 100644
--- a/src/tunnelbridge_map.h
+++ b/src/tunnelbridge_map.h
@@ -88,7 +88,7 @@ static inline TileIndex GetOtherTunnelBridgeEnd(TileIndex t)
* @param t the tile
* @return reservation state
*/
-static inline bool GetTunnelBridgeReservation(TileIndex t)
+static inline bool HasTunnelBridgeReservation(TileIndex t)
{
assert(IsTileType(t, MP_TUNNELBRIDGE));
assert(GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL);
@@ -114,9 +114,9 @@ static inline void SetTunnelBridgeReservation(TileIndex t, bool b)
* @param t the tile
* @return reserved track bits
*/
-static inline TrackBits GetRailTunnelBridgeReservation(TileIndex t)
+static inline TrackBits GetTunnelBridgeReservationTrackBits(TileIndex t)
{
- return GetTunnelBridgeReservation(t) ? DiagDirToDiagTrackBits(GetTunnelBridgeDirection(t)) : TRACK_BIT_NONE;
+ return HasTunnelBridgeReservation(t) ? DiagDirToDiagTrackBits(GetTunnelBridgeDirection(t)) : TRACK_BIT_NONE;
}
#endif /* TUNNELBRIDGE_MAP_H */