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

Departure boards: Fix repeated departure sets with implicit orders

Browse Source 
See: #456
This commit is contained in:
Jonathan G Rennison
2022-12-02 19:09:01 +00:00
parent 1f544c69b5
commit 5fdb82abda
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/departures.cpp
View File

@@ -351,14 +351,8 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
break; break;
} }
/* Skip it if it's an automatic order. */
if (order->IsType(OT_IMPLICIT)) {
order = (order->next == nullptr) ? v->GetFirstOrder() : order->next;
continue;
}
/* If an order has a 0 travel time, and it's not explictly set, then stop. */ /* If an order has a 0 travel time, and it's not explictly set, then stop. */
if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) { if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled() && !order->IsType(OT_IMPLICIT)) {
break; break;
} }
@@ -758,14 +752,8 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
break; break;
} }
/* Skip it if it's an automatic order. */
if (order->IsType(OT_IMPLICIT)) {
order = (order->next == nullptr) ? least_order->v->GetFirstOrder() : order->next;
continue;
}
/* If an order has a 0 travel time, and it's not explictly set, then stop. */ /* If an order has a 0 travel time, and it's not explictly set, then stop. */
if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) { if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled() && !order->IsType(OT_IMPLICIT)) {
break; break;
} }