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

Departure boards: Fix terminus detection from via stops

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-04-06 18:02:15 +01:00
parent c9c0436e58
commit b776dcbd17
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/departures.cpp
View File

@@ -512,8 +512,12 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
(StationID)order->GetDestination() == station && (StationID)order->GetDestination() == station &&
(order->GetUnloadType() != OUFB_NO_UNLOAD || (order->GetUnloadType() != OUFB_NO_UNLOAD ||
_settings_client.gui.departure_show_all_stops) && _settings_client.gui.departure_show_all_stops) &&
order->GetNonStopType() != ONSF_NO_STOP_AT_ANY_STATION && (((order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) == 0) || ((least_order->order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) != 0))) {
order->GetNonStopType() != ONSF_NO_STOP_AT_DESTINATION_STATION) { /* If we're not calling anywhere, then skip this departure. */
found_terminus = (d->calling_at.size() > 0);
break;
} else if (order->GetType() == OT_GOTO_WAYPOINT &&
(StationID)order->GetDestination() == station) {
/* If we're not calling anywhere, then skip this departure. */ /* If we're not calling anywhere, then skip this departure. */
found_terminus = (d->calling_at.size() > 0); found_terminus = (d->calling_at.size() > 0);
break; break;