From 8dd2f413bd896983df15f7fe1d5cf019cfb0184e Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 16 Apr 2011 17:06:59 +0000 Subject: (svn r22331) -Change: When inserting an (automatic) order A in front of an order B, disable modifications of automatic orders for all vehicles currently heading for B as we do not know whether they will reach A or B first. (except for the vehicle causing the insertion of the automatic order itself) --- src/order_cmd.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/order_cmd.cpp') diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 0cbb10b78..3adaab218 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -830,6 +830,13 @@ void InsertOrder(Vehicle *v, Order *new_o, VehicleOrderID sel_ord) u->cur_real_order_index = cur; } } + if (sel_ord == u->cur_auto_order_index && u->IsGroundVehicle()) { + /* We are inserting an order just before the current automatic order. + * We do not know whether we will reach current automatic or the newly inserted order first. + * So, disable creation of automatic orders until we are on track again. */ + uint16 &gv_flags = u->GetGroundVehicleFlags(); + SetBit(gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS); + } if (sel_ord <= u->cur_auto_order_index) { uint cur = u->cur_auto_order_index + 1; /* Check if we don't go out of bound */ -- cgit v1.2.3-54-g00ecf