From 771615cb4b25c2094795a6b9e9cf1e85012d4fb9 Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Tue, 6 Feb 2024 17:21:12 -0500 Subject: [PATCH] Fix #12020: Unbunch and service if needed should be mutually exclusive depot order types --- src/order_cmd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 707fe82318..782250be5f 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1389,13 +1389,14 @@ CommandCost CmdModifyOrder(DoCommandFlag flags, VehicleID veh, VehicleOrderID se case DA_SERVICE: order->SetDepotOrderType((OrderDepotTypeFlags)(order->GetDepotOrderType() | ODTFB_SERVICE)); order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() & ~ODATFB_HALT)); + order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() & ~ODATFB_UNBUNCH)); order->SetRefit(CARGO_NO_REFIT); break; case DA_STOP: order->SetDepotOrderType((OrderDepotTypeFlags)(order->GetDepotOrderType() & ~ODTFB_SERVICE)); - order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() & ~ODATFB_UNBUNCH)); order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() | ODATFB_HALT)); + order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() & ~ODATFB_UNBUNCH)); order->SetRefit(CARGO_NO_REFIT); break;