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

Scheduled dispatch: Improvements to handling first order wait times

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-01-27 20:31:12 +00:00
parent bffd52b74a
commit e53e960c50
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/timetable_cmd.cpp
View File

@@ -729,7 +729,7 @@ static bool IsVehicleAtFirstWaitingLocation(Vehicle *v)
for (int i = 0; i < v->orders.list->GetNumOrders(); ++i) { for (int i = 0; i < v->orders.list->GetNumOrders(); ++i) {
Order* order = v->orders.list->GetOrderAt(i); Order* order = v->orders.list->GetOrderAt(i);
if (order->IsWaitTimetabled() && !order->IsType(OT_IMPLICIT)) { if (order->IsWaitTimetabled() && !order->IsType(OT_IMPLICIT) && !order->IsType(OT_CONDITIONAL)) {
first_wait_index = i; first_wait_index = i;
break; break;
} }
@@ -738,7 +738,7 @@ static bool IsVehicleAtFirstWaitingLocation(Vehicle *v)
return v->orders.list->IsCompleteTimetable() && (v->cur_implicit_order_index == first_wait_index); return v->orders.list->IsCompleteTimetable() && (v->cur_implicit_order_index == first_wait_index);
} }
static DateTicksScaled GetScheduledDispatchTime(Vehicle *v) static DateTicksScaled GetScheduledDispatchTime(Vehicle *v, int wait_offset)
{ {
DateTicksScaled first_slot = -1; DateTicksScaled first_slot = -1;
const DateTicksScaled begin_time = v->orders.list->GetScheduledDispatchStartTick(); const DateTicksScaled begin_time = v->orders.list->GetScheduledDispatchStartTick();
@@ -748,13 +748,14 @@ static DateTicksScaled GetScheduledDispatchTime(Vehicle *v)
/* Find next available slots */ /* Find next available slots */
for (auto current_offset : v->orders.list->GetScheduledDispatch()) { for (auto current_offset : v->orders.list->GetScheduledDispatch()) {
while (int32(current_offset) <= last_dispatched_offset) { if (int32(current_offset) <= last_dispatched_offset) {
current_offset += dispatch_duration; current_offset += dispatch_duration * ((last_dispatched_offset + dispatch_duration - current_offset) / dispatch_duration);
} }
DateTicksScaled current_departure = begin_time + current_offset; DateTicksScaled current_departure = begin_time + current_offset;
while (current_departure + max_delay < _scaled_date_ticks) { int32 minimum = _scaled_date_ticks + wait_offset - max_delay;
current_departure += dispatch_duration; if (current_departure < minimum) {
current_departure += dispatch_duration * ((minimum + dispatch_duration - current_departure - 1) / dispatch_duration);
} }
if (first_slot == -1 || first_slot > current_departure) { if (first_slot == -1 || first_slot > current_departure) {
@@ -803,9 +804,11 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
/* Update scheduled information */ /* Update scheduled information */
v->orders.list->UpdateScheduledDispatch(); v->orders.list->UpdateScheduledDispatch();
DateTicksScaled slot = GetScheduledDispatchTime(v); const int wait_offset = (real_timetable_order == nullptr) ? 0 : real_timetable_order->GetTimetabledWait();
DateTicksScaled slot = GetScheduledDispatchTime(v, wait_offset);
if (slot > -1) { if (slot > -1) {
v->lateness_counter = _scaled_date_ticks - slot; SetBit(v->vehicle_flags, VF_TIMETABLE_STARTED);
v->lateness_counter = _scaled_date_ticks - slot + wait_offset;
v->orders.list->SetScheduledDispatchLastDispatch(slot - v->orders.list->GetScheduledDispatchStartTick()); v->orders.list->SetScheduledDispatchLastDispatch(slot - v->orders.list->GetScheduledDispatchStartTick());
} }
} }
@@ -970,14 +973,13 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
v->current_loading_time = 0; v->current_loading_time = 0;
} else if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH) && HasBit(v->vehicle_flags, VF_TIMETABLE_STARTED)) { } else if (HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH) && HasBit(v->vehicle_flags, VF_TIMETABLE_STARTED)) {
const bool is_first_waiting = IsVehicleAtFirstWaitingLocation(v); const bool is_first_waiting = IsVehicleAtFirstWaitingLocation(v);
if (is_first_waiting) { if (is_first_waiting && travelling) {
/* Update scheduled information */ /* Update scheduled information */
v->orders.list->UpdateScheduledDispatch(); v->orders.list->UpdateScheduledDispatch();
} const int wait_offset = real_timetable_order->GetTimetabledWait();
if (is_first_waiting && travelling) { DateTicksScaled slot = GetScheduledDispatchTime(v, wait_offset);
DateTicksScaled slot = GetScheduledDispatchTime(v);
if (slot > -1) { if (slot > -1) {
v->lateness_counter = _scaled_date_ticks - slot; v->lateness_counter = _scaled_date_ticks - slot + wait_offset;
v->orders.list->SetScheduledDispatchLastDispatch(slot - v->orders.list->GetScheduledDispatchStartTick()); v->orders.list->SetScheduledDispatchLastDispatch(slot - v->orders.list->GetScheduledDispatchStartTick());
} else { } else {
v->lateness_counter -= (timetabled - time_taken); v->lateness_counter -= (timetabled - time_taken);