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

Move signal style mask variables into a single struct

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-25 10:18:48 +01:00
parent c1b54f1c31
commit 2f7664fc93
6 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_newsignals.cpp
View File

@@ -89,7 +89,7 @@ NewSignalsResolverObject::NewSignalsResolverObject(const GRFFile *grffile, TileI
uint GetNewSignalsRestrictedSignalsInfo(const TraceRestrictProgram *prog, TileIndex tile, uint8 signal_style)
{
uint result = 0;
if (signal_style != 0 && HasBit(_always_reserve_through_style_mask, signal_style)) result |= 2;
if (signal_style != 0 && HasBit(_signal_style_masks.always_reserve_through, signal_style)) result |= 2;
if (prog != nullptr) {
result |= 1;
if ((prog->actions_used_flags & TRPAUF_RESERVE_THROUGH_ALWAYS) && !IsTileType(tile, MP_TUNNELBRIDGE)) result |= 2;