summaryrefslogtreecommitdiff
path: root/src/rail_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/rail_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/rail_map.h')
-rw-r--r--src/rail_map.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rail_map.h b/src/rail_map.h
index bfdc19f6d..8fe1bf2ba 100644
--- a/src/rail_map.h
+++ b/src/rail_map.h
@@ -253,7 +253,7 @@ static inline WaypointID GetWaypointIndex(TileIndex t)
* @param t the tile to query
* @return the track bits
*/
-static inline TrackBits GetTrackReservation(TileIndex t)
+static inline TrackBits GetRailReservationTrackBits(TileIndex t)
{
assert(IsPlainRailTile(t));
byte track_b = GB(_m[t].m2, 8, 3);
@@ -289,7 +289,7 @@ static inline bool TryReserveTrack(TileIndex tile, Track t)
{
assert(HasTrack(tile, t));
TrackBits bits = TrackToTrackBits(t);
- TrackBits res = GetTrackReservation(tile);
+ TrackBits res = GetRailReservationTrackBits(tile);
if ((res & bits) != TRACK_BIT_NONE) return false; // already reserved
res |= bits;
if (TracksOverlap(res)) return false; // crossing reservation present
@@ -306,7 +306,7 @@ static inline bool TryReserveTrack(TileIndex tile, Track t)
static inline void UnreserveTrack(TileIndex tile, Track t)
{
assert(HasTrack(tile, t));
- TrackBits res = GetTrackReservation(tile);
+ TrackBits res = GetRailReservationTrackBits(tile);
res &= ~TrackToTrackBits(t);
SetTrackReservation(tile, res);
}
@@ -318,7 +318,7 @@ static inline void UnreserveTrack(TileIndex tile, Track t)
* @param t the waypoint/depot tile
* @return reservation state
*/
-static inline bool GetDepotWaypointReservation(TileIndex t)
+static inline bool HasDepotWaypointReservation(TileIndex t)
{
assert(IsRailWaypoint(t) || IsRailDepot(t));
return HasBit(_m[t].m5, 4);
@@ -343,9 +343,9 @@ static inline void SetDepotWaypointReservation(TileIndex t, bool b)
* @param t the tile
* @return reserved track bits
*/
-static inline TrackBits GetRailWaypointReservation(TileIndex t)
+static inline TrackBits GetWaypointReservationTrackBits(TileIndex t)
{
- return GetDepotWaypointReservation(t) ? GetRailWaypointBits(t) : TRACK_BIT_NONE;
+ return HasDepotWaypointReservation(t) ? GetRailWaypointBits(t) : TRACK_BIT_NONE;
}
/**
@@ -354,9 +354,9 @@ static inline TrackBits GetRailWaypointReservation(TileIndex t)
* @param t the tile
* @return reserved track bits
*/
-static inline TrackBits GetRailDepotReservation(TileIndex t)
+static inline TrackBits GetDepotReservationTrackBits(TileIndex t)
{
- return GetDepotWaypointReservation(t) ? TrackToTrackBits(GetRailDepotTrack(t)) : TRACK_BIT_NONE;
+ return HasDepotWaypointReservation(t) ? TrackToTrackBits(GetRailDepotTrack(t)) : TRACK_BIT_NONE;
}