diff options
| author | glx <glx@openttd.org> | 2019-12-17 03:37:43 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-21 20:13:03 +0100 |
| commit | d8a1be48cd60c690235de175e9a044b95f92ea28 (patch) | |
| tree | 2e1481aa11661c28df49f0d62f56fbf730577152 /src/economy.cpp | |
| parent | 9892d90b26db4dfe97ec7baeb89e43acb53a178e (diff) | |
| download | openttd-d8a1be48cd60c690235de175e9a044b95f92ea28.tar.xz | |
Codechange: Replace vehicle related FOR_ALL with range-based for loops
Diffstat (limited to 'src/economy.cpp')
| -rw-r--r-- | src/economy.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 9250cd930..a4e476537 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -120,8 +120,7 @@ Money CalculateCompanyValue(const Company *c, bool including_loan) Money value = num * _price[PR_STATION_VALUE] * 25; - Vehicle *v; - FOR_ALL_VEHICLES(v) { + for (const Vehicle *v : Vehicle::Iterate()) { if (v->owner != owner) continue; if (v->type == VEH_TRAIN || @@ -156,12 +155,11 @@ int UpdateCompanyRatingAndValue(Company *c, bool update) /* Count vehicles */ { - Vehicle *v; Money min_profit = 0; bool min_profit_first = true; uint num = 0; - FOR_ALL_VEHICLES(v) { + for (const Vehicle *v : Vehicle::Iterate()) { if (v->owner != owner) continue; if (IsCompanyBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) { if (v->profit_last_year > 0) num++; // For the vehicle score only count profitable vehicles @@ -390,8 +388,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner) } { - Vehicle *v; - FOR_ALL_VEHICLES(v) { + for (Vehicle *v : Vehicle::Iterate()) { if (v->owner == old_owner && IsCompanyBuildableVehicleType(v->type)) { if (new_owner == INVALID_OWNER) { if (v->Previous() == nullptr) delete v; @@ -435,8 +432,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner) old_company->settings.vehicle.servint_ispercent = new_company->settings.vehicle.servint_ispercent; } - Vehicle *v; - FOR_ALL_VEHICLES(v) { + for (Vehicle *v : Vehicle::Iterate()) { if (v->owner == old_owner && IsCompanyBuildableVehicleType(v->type)) { assert(new_owner != INVALID_OWNER); |