dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial implementation of two rail types per tile

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-12-21 03:27:58 +00:00
parent 8128d027c0
commit 65b9a103ad
24 changed files with 768 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/rail.cpp
View File

@@ -179,6 +179,102 @@ RailType GetTileRailType(TileIndex tile)
return INVALID_RAILTYPE;
}
/**
* Return the rail type of tile and track piece, or INVALID_RAILTYPE if this is no rail tile and return_invalid is true.
*/
RailType GenericGetRailTypeByTrack(TileIndex t, Track track, bool return_invalid)
{
if (IsPlainRailTile(t)) {
TrackBits bits = GetTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return (TrackToTrackBits(track) & TRACK_BIT_RT_1) ? GetRailType(t) : GetSecondaryRailType(t);
} else {
return GetRailType(t);
}
} else if (IsRailTunnelBridgeTile(t)) {
TrackBits bits = GetTunnelBridgeTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return (TrackToTrackBits(track) & GetAcrossBridgePossibleTrackBits(t)) ? GetRailType(t) : GetSecondaryRailType(t);
} else {
return GetRailType(t);
}
} else {
return return_invalid ? GetTileRailType(t) : GetRailType(t);
}
}
/**
* Return the rail type of tile and track piece, or INVALID_RAILTYPE if this is no rail tile and return_invalid is true.
*/
RailType GenericGetRailTypeByTrackBit(TileIndex t, TrackBits tb, bool return_invalid)
{
if (IsPlainRailTile(t)) {
TrackBits bits = GetTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return (tb & TRACK_BIT_RT_1) ? GetRailType(t) : GetSecondaryRailType(t);
} else {
return GetRailType(t);
}
} else if (IsRailTunnelBridgeTile(t)) {
TrackBits bits = GetTunnelBridgeTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return (tb & GetAcrossBridgePossibleTrackBits(t)) ? GetRailType(t) : GetSecondaryRailType(t);
} else {
return GetRailType(t);
}
} else {
return return_invalid ? GetTileRailType(t) : GetRailType(t);
}
}
/**
* Return the rail type of tile and entrance direction, or INVALID_RAILTYPE if this is no rail tile and return_invalid is true.
*/
RailType GenericGetRailTypeByEntryDir(TileIndex t, DiagDirection enterdir, bool return_invalid)
{
if (IsPlainRailTile(t)) {
TrackBits bits = GetTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return (bits & DiagdirReachesTracks(enterdir) & TRACK_BIT_RT_1) ? GetRailType(t) : GetSecondaryRailType(t);
} else {
return GetRailType(t);
}
} else if (IsRailTunnelBridgeTile(t)) {
TrackBits bits = GetTunnelBridgeTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return (bits & DiagdirReachesTracks(enterdir) & GetAcrossBridgePossibleTrackBits(t)) ? GetRailType(t) : GetSecondaryRailType(t);
} else {
return GetRailType(t);
}
} else {
return return_invalid ? GetTileRailType(t) : GetRailType(t);
}
}
/**
* Return the secondary rail type of tile, or INVALID_RAILTYPE if this tile has no secondary rail type
*/
RailType GetTileSecondaryRailTypeIfValid(TileIndex t)
{
if (IsPlainRailTile(t)) {
TrackBits bits = GetTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return GetSecondaryRailType(t);
} else {
return INVALID_RAILTYPE;
}
} else if (IsRailTunnelBridgeTile(t)) {
TrackBits bits = GetTunnelBridgeTrackBits(t);
if (bits == TRACK_BIT_HORZ || bits == TRACK_BIT_VERT) {
return GetSecondaryRailType(t);
} else {
return INVALID_RAILTYPE;
}
} else {
return INVALID_RAILTYPE;
}
}
/**
* Finds out if a company has a certain railtype available
* @param company the company in question