mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r6360) -Codechange: Polish RemoveOrderFromAllVehicles()

This commit is contained in:
tron 2006-09-03 19:29:31 +00:00
parent cd5c6df5f7
commit 7ecc7d0ba4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
order_cmd.c
View File

@ -965,8 +965,6 @@ void CheckOrders(const Vehicle* v)
void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination) void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination)
{ {
Vehicle *v; Vehicle *v;
Order *order;
bool need_invalidate;
/* Aircraft have StationIDs for depot orders and never use DepotIDs /* Aircraft have StationIDs for depot orders and never use DepotIDs
* This fact is handled specially below * This fact is handled specially below
@ -974,37 +972,37 @@ void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination)
/* Go through all vehicles */ /* Go through all vehicles */
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
Order *order;
bool invalidate;
if (v->orders == NULL) continue; if (v->orders == NULL) continue;
/* Forget about this station if this station is removed */ /* Forget about this station if this station is removed */
if (v->last_station_visited == destination && type == OT_GOTO_STATION) if (v->last_station_visited == destination && type == OT_GOTO_STATION) {
v->last_station_visited = INVALID_STATION; v->last_station_visited = INVALID_STATION;
}
/* Check the current order */ order = &v->current_order;
if ((v->type == VEH_Aircraft && v->current_order.type == OT_GOTO_DEPOT ? OT_GOTO_STATION : v->current_order.type) == type && if ((v->type == VEH_Aircraft && order->type == OT_GOTO_DEPOT ? OT_GOTO_STATION : order->type) == type &&
v->current_order.dest == destination) { v->current_order.dest == destination) {
/* Mark the order as DUMMY */ order->type = OT_DUMMY;
v->current_order.type = OT_DUMMY; order->flags = 0;
v->current_order.flags = 0;
InvalidateWindow(WC_VEHICLE_VIEW, v->index); InvalidateWindow(WC_VEHICLE_VIEW, v->index);
} }
/* Clear the order from the order-list */ /* Clear the order from the order-list */
need_invalidate = false; invalidate = false;
FOR_VEHICLE_ORDERS(v, order) { FOR_VEHICLE_ORDERS(v, order) {
if ((v->type == VEH_Aircraft && order->type == OT_GOTO_DEPOT ? OT_GOTO_STATION : order->type) == type && if ((v->type == VEH_Aircraft && order->type == OT_GOTO_DEPOT ? OT_GOTO_STATION : order->type) == type &&
order->dest == destination) { order->dest == destination) {
/* Mark the order as DUMMY */
order->type = OT_DUMMY; order->type = OT_DUMMY;
order->flags = 0; order->flags = 0;
invalidate = true;
need_invalidate = true;
} }
} }
/* Only invalidate once, and if needed */ /* Only invalidate once, and if needed */
if (need_invalidate) if (invalidate) InvalidateWindow(WC_VEHICLE_ORDERS, v->index);
InvalidateWindow(WC_VEHICLE_ORDERS, v->index);
} }
} }