Handle service at depot orders in cond order loops

2022-01-19 00:44:54 +00:00
parent e7abf9efb1
commit e5110bd7f6
1 changed files with 7 additions and 0 deletions
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -2940,6 +2940,13 @@ VehicleOrderID AdvanceOrderIndexDeferred(const Vehicle *v, VehicleOrderID index)
 		assert(order != nullptr);

 		switch (order->GetType()) {
+			case OT_GOTO_DEPOT:
+				if ((order->GetDepotOrderType() & ODTFB_SERVICE) && !v->NeedsServicing()) {
+					break;
+				} else {
+					return index;
+				}
+
 			case OT_RELEASE_SLOT:
 				if (TraceRestrictSlot::IsValidID(order->GetDestination())) {
 					include(_pco_deferred_slot_releases, order->GetDestination());