From 8ce06a09b9ce561cd823793dfb8c18aee894fd76 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 23 Aug 2010 21:21:41 +0000 Subject: (svn r20600) -Fix [FS#4075]: "downscale" a full load order to a load if possible order when removing the order while the vehicle is loading. This to prevent the vehicle from (possibly) staying forever in the station --- src/order_cmd.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/order_cmd.cpp') diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 38096e877..b792c9beb 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -773,6 +773,9 @@ CommandCost CmdDeleteOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 * on his order list or not */ if (sel_ord == u->cur_order_index && u->current_order.IsType(OT_LOADING)) { u->current_order.SetNonStopType(ONSF_STOP_EVERYWHERE); + /* When full loading, "cancel" that order so the vehicle doesn't + * stay indefinitely at this station anymore. */ + if (u->current_order.GetLoadType() & OLFB_FULL_LOAD) u->current_order.SetLoadType(OLF_LOAD_IF_POSSIBLE); } /* Update any possible open window of the vehicle */ -- cgit v1.2.3-54-g00ecf