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

Allow removing reservation boundary signal in realistic braking

Browse Source 
All other operations were permitted so only disallowing removal
was not useful and could be trivially bypassed
This commit is contained in:
Jonathan G Rennison
2024-05-26 12:13:49 +01:00
parent 431a6a1262
commit effaf6acc4
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rail_cmd.cpp
View File

@@ -2276,18 +2276,6 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32_t
Train *v = nullptr; Train *v = nullptr;
if (HasReservedTracks(tile, TrackToTrackBits(track))) { if (HasReservedTracks(tile, TrackToTrackBits(track))) {
v = GetTrainForReservation(tile, track); v = GetTrainForReservation(tile, track);
} else if (IsPbsSignal(GetSignalType(tile, track))) {
/* PBS signal, might be the end of a path reservation. */
Trackdir td = TrackToTrackdir(track);
for (int i = 0; v == nullptr && i < 2; i++, td = ReverseTrackdir(td)) {
/* Only test the active signal side. */
if (!HasSignalOnTrackdir(tile, ReverseTrackdir(td))) continue;
TileIndex next = TileAddByDiagDir(tile, TrackdirToExitdir(td));
TrackBits tracks = TrackdirBitsToTrackBits(TrackdirReachesTrackdirs(td));
if (HasReservedTracks(next, tracks)) {
v = GetTrainForReservation(next, TrackBitsToTrack(GetReservedTrackbits(next) & tracks));
}
}
} }
if (v != nullptr) { if (v != nullptr) {
CommandCost ret = CheckTrainReservationPreventsTrackModification(v); CommandCost ret = CheckTrainReservationPreventsTrackModification(v);