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

Fix aspect propagation issues with combined shunt/normal signals

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-29 23:28:53 +01:00
parent 05c7c528f5
commit e399853f2c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/signal_func.h
View File

@@ -204,9 +204,16 @@ inline void AdjustSignalAspectIfNonIncStyle(TileIndex tile, Track track, uint8 &
if (aspect > 0 && (_signal_style_masks.non_aspect_inc != 0 || _signal_style_masks.combined_normal_shunt != 0)) AdjustSignalAspectIfNonIncStyleIntl(tile, track, aspect);
}
inline uint8 IncrementAspectForSignal(uint8 aspect, bool combined_normal_mode)
{
aspect = std::min<uint8>(aspect + 1, GetMaximumSignalAspect());
if (combined_normal_mode) aspect = std::min<uint8>(aspect + 1, 7);
return aspect;
}
inline uint8 GetForwardAspectFollowingTrackAndIncrement(TileIndex tile, Trackdir trackdir, bool combined_normal_mode = false)
{
return std::min<uint8>(GetForwardAspectFollowingTrack(tile, trackdir) + (combined_normal_mode ? 2 : 1), GetMaximumSignalAspect());
return IncrementAspectForSignal(GetForwardAspectFollowingTrack(tile, trackdir), combined_normal_mode);
}
void UpdateSignalReserveThroughBit(TileIndex tile, Track track, bool update_signal);