petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r6052) -Codechange: change OrderType (order->type) in a typedef

Browse Source 
-Codechange: renamed DeleteDestinationFromVehicleOrder to RemoveOrderFromAllVehicles to reflect his function better
-Codechange: changed the params of RemoveOrderFromAllVehicles, to avoid unneeded variable-creation
This commit is contained in:
truelight
2006-08-22 17:13:49 +00:00
parent 88d196dff1
commit 1331b4aa9a
10 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
order_cmd.c
View File

@@ -953,13 +953,11 @@ void CheckOrders(const Vehicle* v)
}
/**
*
* Delete a destination (like station, waypoint, ..) from the orders of vehicles
*
* @param dest type and station has to be set. This order will be removed from all orders of vehicles
*
* Removes an order from all vehicles. Triggers when, say, a station is removed.
* @param type The type of the order (OT_GOTO_[STATION|DEPOT|WAYPOINT]).
* @param destination The destination. Can be a StationID, DepotID or WaypointID.
*/
void DeleteDestinationFromVehicleOrder(Order dest)
void RemoveOrderFromAllVehicles(OrderType type, StationID destination)
{
Vehicle *v;
Order *order;
@@ -970,12 +968,11 @@ void DeleteDestinationFromVehicleOrder(Order dest)
if (v->orders == NULL) continue;
/* Forget about this station if this station is removed */
if (v->last_station_visited == dest.station && dest.type == OT_GOTO_STATION)
if (v->last_station_visited == destination && type == OT_GOTO_STATION)
v->last_station_visited = INVALID_STATION;
/* Check the current order */
if (v->current_order.type == dest.type &&
v->current_order.station == dest.station) {
if (v->current_order.type == type && v->current_order.station == destination) {
/* Mark the order as DUMMY */
v->current_order.type = OT_DUMMY;
v->current_order.flags = 0;
@@ -985,7 +982,7 @@ void DeleteDestinationFromVehicleOrder(Order dest)
/* Clear the order from the order-list */
need_invalidate = false;
FOR_VEHICLE_ORDERS(v, order) {
if (order->type == dest.type && order->station == dest.station) {
if (order->type == type && order->station == destination) {
/* Mark the order as DUMMY */
order->type = OT_DUMMY;
order->flags = 0;