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

Handle service at depot orders in cond order loops

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-01-19 00:44:54 +00:00
parent e7abf9efb1
commit e5110bd7f6
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/order_cmd.cpp
View File

@@ -2940,6 +2940,13 @@ VehicleOrderID AdvanceOrderIndexDeferred(const Vehicle *v, VehicleOrderID index)
assert(order != nullptr); assert(order != nullptr);
switch (order->GetType()) { switch (order->GetType()) {
case OT_GOTO_DEPOT:
if ((order->GetDepotOrderType() & ODTFB_SERVICE) && !v->NeedsServicing()) {
break;
} else {
return index;
}
case OT_RELEASE_SLOT: case OT_RELEASE_SLOT:
if (TraceRestrictSlot::IsValidID(order->GetDestination())) { if (TraceRestrictSlot::IsValidID(order->GetDestination())) {
include(_pco_deferred_slot_releases, order->GetDestination()); include(_pco_deferred_slot_releases, order->GetDestination());