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

Departure boards: Fix handling of waiting orders

Browse Source 
See: #144
This commit is contained in:
Jonathan G Rennison
2020-04-19 19:46:09 +01:00
parent 59d84975e0
commit be3f03358f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/departures.cpp
View File

@@ -276,7 +276,7 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
status = D_CANCELLED;
}
if (v->current_order.IsAnyLoadingType()) {
if (v->current_order.IsAnyLoadingType() || v->current_order.IsType(OT_WAITING)) {
/* Account for the vehicle having reached the current order and being in the loading phase. */
status = D_ARRIVED;
start_date -= order->GetTravelTime() + ((v->lateness_counter < 0) ? v->lateness_counter : 0);
@@ -362,7 +362,7 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
}
/* If we are early, use the scheduled date as the expected date. We also take lateness to be zero. */
if (!should_reset_lateness && v->lateness_counter < 0 && !v->current_order.IsAnyLoadingType()) {
if (!should_reset_lateness && v->lateness_counter < 0 && !(v->current_order.IsAnyLoadingType() || v->current_order.IsType(OT_WAITING))) {
od->expected_date -= v->lateness_counter;
}