diff options
| author | glx22 <glx@openttd.org> | 2020-12-27 00:13:56 +0100 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2020-12-27 10:28:46 +0000 |
| commit | d8605ad18da2a00fceb72b38325374b341ac6f16 (patch) | |
| tree | 8a6d33a6e57c2bc6a51cfe18443510c3b6a7bdbe /src/vehiclelist.cpp | |
| parent | 1478fa93b344fc25000725dd143109e4def24f0b (diff) | |
| download | openttd-d8605ad18da2a00fceb72b38325374b341ac6f16.tar.xz | |
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
Diffstat (limited to 'src/vehiclelist.cpp')
| -rw-r--r-- | src/vehiclelist.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp index de37e3aba..79df540cf 100644 --- a/src/vehiclelist.cpp +++ b/src/vehiclelist.cpp @@ -118,9 +118,7 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli case VL_STATION_LIST: for (const Vehicle *v : Vehicle::Iterate()) { if (v->type == vli.vtype && v->IsPrimaryVehicle()) { - const Order *order; - - FOR_VEHICLE_ORDERS(v, order) { + for (const Order *order : v->Orders()) { if ((order->IsType(OT_GOTO_STATION) || order->IsType(OT_GOTO_WAYPOINT) || order->IsType(OT_IMPLICIT)) && order->GetDestination() == vli.index) { list->push_back(v); @@ -165,9 +163,7 @@ bool GenerateVehicleSortList(VehicleList *list, const VehicleListIdentifier &vli case VL_DEPOT_LIST: for (const Vehicle *v : Vehicle::Iterate()) { if (v->type == vli.vtype && v->IsPrimaryVehicle()) { - const Order *order; - - FOR_VEHICLE_ORDERS(v, order) { + for (const Order *order : v->Orders()) { if (order->IsType(OT_GOTO_DEPOT) && !(order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) && order->GetDestination() == vli.index) { list->push_back(v); break; |