mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12639) -Fix: order window was not marked dirty on changed orders.

release/0.7
rubidium 2008-04-09 17:48:22 +00:00
parent 55f0d01235
commit d178345947
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/order_cmd.cpp
View File

@ -810,24 +810,22 @@ CommandCost CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
/* Update the windows and full load flags, also for vehicles that share the same order list */ /* Update the windows and full load flags, also for vehicles that share the same order list */
Vehicle *u = GetFirstVehicleFromSharedList(v); Vehicle *u = GetFirstVehicleFromSharedList(v);
DeleteOrderWarnings(u); DeleteOrderWarnings(u);
if (mof == MOF_LOAD || mof == MOF_UNLOAD) { for (; u != NULL; u = u->next_shared) {
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
* However, as the same flag is used for depot orders, check * whether we are not going to a depot as there are three
* whether we are not going to a depot as there are three * cases where the full load flag can be active and only
* cases where the full load flag can be active and only * one case where the flag is used for depot orders. In the
* one case where the flag is used for depot orders. In the * other cases for the OrderTypeByte the flags are not used,
* other cases for the OrderTypeByte the flags are not used, * so do not care and those orders should not be active
* so do not care and those orders should not be active * when this function is called.
* when this function is called. */
*/ if (sel_ord == u->cur_order_index &&
if (sel_ord == u->cur_order_index && (u->current_order.IsType(OT_GOTO_STATION) || u->current_order.IsType(OT_LOADING)) &&
(u->current_order.IsType(OT_GOTO_STATION) || u->current_order.IsType(OT_LOADING)) && u->current_order.GetLoadType() != order->GetLoadType()) {
u->current_order.GetLoadType() != order->GetLoadType()) { u->current_order.SetLoadType(order->GetLoadType());
u->current_order.SetLoadType(order->GetLoadType());
}
InvalidateVehicleOrder(u);
} }
InvalidateVehicleOrder(u);
} }
} }