|
|
|
@ -61,7 +61,8 @@ static bool IsDeparture(const Order *order, StationID station) {
|
|
|
|
|
(StationID)order->GetDestination() == station &&
|
|
|
|
|
(order->GetLoadType() != OLFB_NO_LOAD ||
|
|
|
|
|
_settings_client.gui.departure_show_all_stops) &&
|
|
|
|
|
order->GetWaitTime() != 0);
|
|
|
|
|
(order->GetWaitTime() != 0 || order->IsWaitTimetabled()) &&
|
|
|
|
|
!(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool IsVia(const Order *order, StationID station) {
|
|
|
|
@ -77,7 +78,8 @@ static bool IsArrival(const Order *order, StationID station) {
|
|
|
|
|
(StationID)order->GetDestination() == station &&
|
|
|
|
|
(order->GetUnloadType() != OUFB_NO_UNLOAD ||
|
|
|
|
|
_settings_client.gui.departure_show_all_stops) &&
|
|
|
|
|
order->GetWaitTime() != 0);
|
|
|
|
|
(order->GetWaitTime() != 0 || order->IsWaitTimetabled()) &&
|
|
|
|
|
!(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool VehicleSetNextDepartureTime(DateTicks *previous_departure, uint *waiting_time, const DateTicksScaled date_only_scaled, const Vehicle *v, const Order *order, bool arrived_at_timing_point, schdispatch_cache_t &dept_schedule_last)
|
|
|
|
|