amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-26 00:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make TrackStatus a struct instead of opaque uint32_t (#15653)

Browse Source
This commit is contained in:
Peter Nelson
2026-05-31 18:09:26 +01:00
committed by GitHub
parent a687f02e87
commit 28cd6a3d33
26 changed files with 70 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rail_cmd.cpp
+4 -4
View File
@@ -1200,7 +1200,7 @@ static bool AdvanceSignalAutoFill(TileIndex &tile, Trackdir &trackdir, bool remo
if (tile == INVALID_TILE) return false;
/* Check for track bits on the new tile */
TrackdirBits trackdirbits = TrackStatusToTrackdirBits(GetTileTrackStatus(tile, TRANSPORT_RAIL, RoadTramType::Invalid));
TrackdirBits trackdirbits = GetTileTrackStatus(tile, TRANSPORT_RAIL, RoadTramType::Invalid).trackdirs;
if (TracksOverlap(TrackdirBitsToTrackBits(trackdirbits))) return false;
trackdirbits &= TrackdirReachesTrackdirs(trackdir);
@@ -2760,10 +2760,10 @@ static TrackStatus GetTileTrackStatus_Rail(TileIndex tile, TransportType mode, [
case TRACK_BIT_LEFT: tb = TRACK_BIT_RIGHT; break;
case TRACK_BIT_RIGHT: tb = TRACK_BIT_LEFT; break;
}
return CombineTrackStatus(TrackBitsToTrackdirBits(tb), TRACKDIR_BIT_NONE);
return {TrackBitsToTrackdirBits(tb), TRACKDIR_BIT_NONE};
}
if (mode != TRANSPORT_RAIL) return 0;
if (mode != TRANSPORT_RAIL) return {};
TrackBits trackbits = TRACK_BIT_NONE;
TrackdirBits red_signals = TRACKDIR_BIT_NONE;
@@ -2807,7 +2807,7 @@ static TrackStatus GetTileTrackStatus_Rail(TileIndex tile, TransportType mode, [
}
}
return CombineTrackStatus(TrackBitsToTrackdirBits(trackbits), red_signals);
return {TrackBitsToTrackdirBits(trackbits), red_signals};
}
/** @copydoc ClickTileProc */