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

Scheduled dispatch: Add hints about dispatch order to timetable window

Browse Source 
Adjust condition for dispatch order
This commit is contained in:
Jonathan G Rennison
2020-01-29 00:25:09 +00:00
parent 4c15e3dacc
commit 9917a1daef
6 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/timetable_cmd.cpp
View File

@@ -722,21 +722,9 @@ void UpdateSeparationOrder(Vehicle *v_start)
}
}
VehicleOrderID GetVehicleFirstWaitingLocation(const Vehicle *v)
{
for (int i = 0; i < v->orders.list->GetNumOrders(); ++i) {
Order* order = v->orders.list->GetOrderAt(i);
if (order->IsWaitTimetabled() && !order->IsType(OT_IMPLICIT) && !order->IsType(OT_CONDITIONAL)) {
return i;
}
}
return INVALID_VEH_ORDER_ID;
}
static bool IsVehicleAtFirstWaitingLocation(const Vehicle *v)
{
return (v->cur_implicit_order_index == GetVehicleFirstWaitingLocation(v));
return (v->cur_implicit_order_index == v->GetFirstWaitingLocation(true));
}
static DateTicksScaled GetScheduledDispatchTime(Vehicle *v, int wait_offset)