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/network/network_server.cpp | |
| parent | 9892d90b26db4dfe97ec7baeb89e43acb53a178e (diff) | |
| download | openttd-d8a1be48cd60c690235de175e9a044b95f92ea28.tar.xz | |
Codechange: Replace vehicle related FOR_ALL with range-based for loops
Diffstat (limited to 'src/network/network_server.cpp')
| -rw-r--r-- | src/network/network_server.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 42a5ab0fc..f9c9e91f2 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1534,12 +1534,10 @@ void NetworkSocketHandler::SendCompanyInformation(Packet *p, const Company *c, c */ void NetworkPopulateCompanyStats(NetworkCompanyStats *stats) { - const Vehicle *v; - memset(stats, 0, sizeof(*stats) * MAX_COMPANIES); /* Go through all vehicles and count the type of vehicles */ - FOR_ALL_VEHICLES(v) { + for (const Vehicle *v : Vehicle::Iterate()) { if (!Company::IsValidID(v->owner) || !v->IsPrimaryVehicle()) continue; byte type = 0; switch (v->type) { @@ -1623,8 +1621,7 @@ static void NetworkAutoCleanCompanies() if (_settings_client.network.autoclean_novehicles != 0) { memset(vehicles_in_company, 0, sizeof(vehicles_in_company)); - const Vehicle *v; - FOR_ALL_VEHICLES(v) { + for (const Vehicle *v : Vehicle::Iterate()) { if (!Company::IsValidID(v->owner) || !v->IsPrimaryVehicle()) continue; vehicles_in_company[v->owner]++; } |