Mercurial > hg > openttd
changeset 17001:cda70a6d42ea draft
(svn r21737) -Fix (r1)[FS#4384-ish]: A loading order was also marked as 'not part of orders' when the order before the current order was deleted.
author | frosch <frosch@openttd.org> |
---|---|
date | Thu, 06 Jan 2011 22:24:02 +0000 |
parents | fb8d40069084 |
children | 9f83d76a6f12 |
files | src/order_cmd.cpp |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -796,8 +796,6 @@ Vehicle *u = v->FirstShared(); DeleteOrderWarnings(u); for (; u != NULL; u = u->NextShared()) { - if (sel_ord < u->cur_order_index) u->cur_order_index--; - assert(v->orders.list == u->orders.list); /* NON-stop flag is misused to see if a train is in a station that is @@ -809,6 +807,8 @@ if (u->current_order.GetLoadType() & OLFB_FULL_LOAD) u->current_order.SetLoadType(OLF_LOAD_IF_POSSIBLE); } + if (sel_ord < u->cur_order_index) u->cur_order_index--; + /* Update any possible open window of the vehicle */ InvalidateVehicleOrder(u, sel_ord | (INVALID_VEH_ORDER_ID << 8)); }