Don't use scheduled dispatch for predicted times in GUI when disabled

See: #559
This commit is contained in:
Jonathan G Rennison
2023-07-01 10:04:44 +01:00
parent 28a764f319
commit 5d746f8971

View File

@@ -188,7 +188,7 @@ static void FillTimetableArrivalDepartureTable(const Vehicle *v, VehicleOrderID
if (no_offset) SetBit(table[i].flags, TADF_ARRIVAL_NO_OFFSET); if (no_offset) SetBit(table[i].flags, TADF_ARRIVAL_NO_OFFSET);
} }
if (order->IsScheduledDispatchOrder(true) && !(i == start && !travelling)) { if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH) && order->IsScheduledDispatchOrder(true) && !(i == start && !travelling)) {
if (!no_offset) sum -= v->lateness_counter; if (!no_offset) sum -= v->lateness_counter;
extern DateTicksScaled GetScheduledDispatchTime(const DispatchSchedule &ds, DateTicksScaled leave_time); extern DateTicksScaled GetScheduledDispatchTime(const DispatchSchedule &ds, DateTicksScaled leave_time);
DispatchSchedule &ds = v->orders->GetDispatchScheduleByIndex(order->GetDispatchScheduleIndex()); DispatchSchedule &ds = v->orders->GetDispatchScheduleByIndex(order->GetDispatchScheduleIndex());