From 8df78e7a7b4fcc424e34e3fecbee85b72f1891d0 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 27 Jul 2010 21:46:55 +0000 Subject: (svn r20229) -Fix [FS#3986]: "Service at nearest depot" behaved the same as "Go to nearest depot" --- src/order_cmd.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/order_cmd.cpp') diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 800c4aca9..0c43bdd3f 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1712,6 +1712,12 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth) return true; case OT_GOTO_DEPOT: + if ((order->GetDepotOrderType() & ODTFB_SERVICE) && !v->NeedsServicing()) { + UpdateVehicleTimetable(v, true); + v->IncrementOrderIndex(); + break; + } + if (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) { /* We need to search for the nearest depot (hangar). */ TileIndex location; @@ -1736,9 +1742,6 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth) return true; } - UpdateVehicleTimetable(v, true); - v->IncrementOrderIndex(); - } else if ((order->GetDepotOrderType() & ODTFB_SERVICE) && !v->NeedsServicing()) { UpdateVehicleTimetable(v, true); v->IncrementOrderIndex(); } else { -- cgit v1.2.3-54-g00ecf