diff options
| author | glx <glx@openttd.org> | 2019-12-14 17:22:38 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-21 20:13:03 +0100 |
| commit | 3a14cea068d130e11b5d9dde11d4451dd7dec453 (patch) | |
| tree | 7afd5a1160872aeba8a630c2915a8168cbc483dd /src/network/network_server.cpp | |
| parent | 68f22134cb35267d6fa01134a385d3854fda1787 (diff) | |
| download | openttd-3a14cea068d130e11b5d9dde11d4451dd7dec453.tar.xz | |
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
Diffstat (limited to 'src/network/network_server.cpp')
| -rw-r--r-- | src/network/network_server.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 7505bff87..a8322ff90 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -380,10 +380,9 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendCompanyInfo() /* Now send the data */ - Company *company; Packet *p; - FOR_ALL_COMPANIES(company) { + for (const Company *company : Company::Iterate()) { p = new Packet(PACKET_SERVER_COMPANY_INFO); p->Send_uint8 (NETWORK_COMPANY_INFO_VERSION); @@ -1619,7 +1618,6 @@ static void NetworkCheckRestartMap() static void NetworkAutoCleanCompanies() { const NetworkClientInfo *ci; - const Company *c; bool clients_in_company[MAX_COMPANIES]; int vehicles_in_company[MAX_COMPANIES]; @@ -1648,7 +1646,7 @@ static void NetworkAutoCleanCompanies() } /* Go through all the companies */ - FOR_ALL_COMPANIES(c) { + for (const Company *c : Company::Iterate()) { /* Skip the non-active once */ if (c->is_ai) continue; |