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

Scheduled dispatch: Fix timetable window times after scheduled dispatch

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-01-28 19:22:57 +00:00
parent 98d76832fc
commit 4c15e3dacc
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/timetable_gui.cpp
View File

@@ -33,6 +33,8 @@
#include "safeguards.h"
VehicleOrderID GetVehicleFirstWaitingLocation(const Vehicle *v);
/** Container for the arrival/departure dates of a vehicle */
struct TimetableArrivalDeparture {
Ticks arrival; ///< The arrival time
@@ -111,6 +113,9 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
table[i].arrival = table[i].departure = INVALID_TICKS;
}
VehicleOrderID scheduled_dispatch_order = INVALID_VEH_ORDER_ID;
if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH)) scheduled_dispatch_order = GetVehicleFirstWaitingLocation(v);
/* Cyclically loop over all orders until we reach the current one again.
* As we may start at the current order, do a post-checking loop */
do {
@@ -124,6 +129,7 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
table[i].arrival = sum;
}
if (i == scheduled_dispatch_order && !(i == start && !travelling)) return;
if (!CanDetermineTimeTaken(order, false)) return;
sum += order->GetTimetabledWait();
table[i].departure = sum;