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

Add function to get maximum signal aspect

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-25 23:45:50 +01:00
parent 89f66236ff
commit fa89036a27
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/signal_func.h
View File

@@ -22,6 +22,11 @@
extern uint8 _extra_aspects;
extern uint64 _aspect_cfg_hash;
static inline uint8 GetMaximumSignalAspect()
{
return _extra_aspects + 1;
}
struct SignalStyleMasks {
uint16 non_aspect_inc = 0;
uint16 next_only = 0;
@@ -197,7 +202,7 @@ inline void AdjustSignalAspectIfNonIncStyle(TileIndex tile, Track track, uint8 &
inline uint8 GetForwardAspectFollowingTrackAndIncrement(TileIndex tile, Trackdir trackdir)
{
return std::min<uint8>(GetForwardAspectFollowingTrack(tile, trackdir) + 1, _extra_aspects + 1);
return std::min<uint8>(GetForwardAspectFollowingTrack(tile, trackdir) + 1, GetMaximumSignalAspect());
}
void UpdateSignalReserveThroughBit(TileIndex tile, Track track, bool update_signal);