Mercurial > hg > openttd
changeset 5374:0d23d987ed01 draft
(svn r7559) -Fix (FS#456): clicking the 'Full Load' button when the 'current' order is selected in the Order GUI and one has instructed the train to go to the depot, via the button in the Train View GUI, changed the depot order by switching from 'service at depot' to 'stop at depot' and vice versa.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Tue, 26 Dec 2006 00:33:07 +0000 |
| parents | c1617dd54bab |
| children | b179b65baf4e |
| files | order_cmd.c |
| diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/order_cmd.c +++ b/order_cmd.c @@ -611,8 +611,17 @@ u = GetFirstVehicleFromSharedList(v); DeleteOrderWarnings(u); for (; u != NULL; u = u->next_shared) { - /* toggle u->current_order "Full load" flag if it changed */ + /* Toggle u->current_order "Full load" flag if it changed. + * However, as the same flag is used for depot orders, check + * whether we are not going to a depot as there are three + * cases where the full load flag can be active and only + * one case where the flag is used for depot orders. In the + * other cases for the OrderType the flags are not used, + * so do not care and those orders should not be active + * when this function is called. + */ if (sel_ord == u->cur_order_index && + u->current_order.type != OT_GOTO_DEPOT && HASBIT(u->current_order.flags, OFB_FULL_LOAD) != HASBIT(order->flags, OFB_FULL_LOAD)) { TOGGLEBIT(u->current_order.flags, OFB_FULL_LOAD); }