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

Merge branch 'scheduled-dispatch-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-07-26 00:31:33 +01:00
parent b76d594654 c2a8d0fc81
commit 103cabb178
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/order_cmd.cpp
View File

@@ -1899,20 +1899,22 @@ CommandCost CmdCloneOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
} }
/* Copy over scheduled dispatch data */ /* Copy over scheduled dispatch data */
assert(dst->orders.list != NULL);
if (src->orders.list != NULL) {
dst->orders.list->SetScheduledDispatchDuration(src->orders.list->GetScheduledDispatchDuration()); dst->orders.list->SetScheduledDispatchDuration(src->orders.list->GetScheduledDispatchDuration());
dst->orders.list->SetScheduledDispatchDelay(src->orders.list->GetScheduledDispatchDelay()); dst->orders.list->SetScheduledDispatchDelay(src->orders.list->GetScheduledDispatchDelay());
for (const auto& slot : src->orders.list->GetScheduledDispatch()) { for (const auto& slot : src->orders.list->GetScheduledDispatch()) {
dst->orders.list->AddScheduledDispatch(slot); dst->orders.list->AddScheduledDispatch(slot);
} }
{
Date start_date; Date start_date;
uint16 start_full_date_fract; uint16 start_full_date_fract;
SchdispatchConvertToFullDateFract( SchdispatchConvertToFullDateFract(
src->orders.list->GetScheduledDispatchStartTick(), src->orders.list->GetScheduledDispatchStartTick(),
&start_date, &start_full_date_fract); &start_date, &start_full_date_fract);
dst->orders.list->SetScheduledDispatchStartDate(start_date, start_full_date_fract); dst->orders.list->SetScheduledDispatchStartDate(start_date, start_full_date_fract);
}
/* Don't copy last dispatch, leave it at 0 (default) */ /* Don't copy last dispatch, leave it at 0 (default) */
}
/* Set automation bit if target has it. */ /* Set automation bit if target has it. */
if (HasBit(src->vehicle_flags, VF_AUTOMATE_TIMETABLE)) { if (HasBit(src->vehicle_flags, VF_AUTOMATE_TIMETABLE)) {