diff options
author | glx <glx@openttd.org> | 2019-12-16 20:56:10 +0100 |
---|---|---|
committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-12-21 20:13:03 +0100 |
commit | 41232f18c18c9ca444282a9e959b7dfd6c93eff5 (patch) | |
tree | dce6e69fc4e0c7d441cf4916700aa3156be88e62 /src/network/network_client.cpp | |
parent | 09fa39c5b59d88a076a244cf1623a53b0ffa1434 (diff) | |
download | openttd-41232f18c18c9ca444282a9e959b7dfd6c93eff5.tar.xz |
Codechange: Replace network related FOR_ALL with range-based for loops
Diffstat (limited to 'src/network/network_client.cpp')
-rw-r--r-- | src/network/network_client.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 5cbcb4c3b..08ec7823e 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -1234,8 +1234,7 @@ void NetworkClientsToSpectators(CompanyID cid) /* If our company is changing owner, go to spectators */ if (cid == _local_company) SetLocalCompany(COMPANY_SPECTATOR); - NetworkClientInfo *ci; - FOR_ALL_CLIENT_INFOS(ci) { + for (NetworkClientInfo *ci : NetworkClientInfo::Iterate()) { if (ci->client_playas != cid) continue; NetworkTextMessage(NETWORK_ACTION_COMPANY_SPECTATOR, CC_DEFAULT, false, ci->client_name); ci->client_playas = COMPANY_SPECTATOR; @@ -1299,8 +1298,7 @@ bool NetworkClientPreferTeamChat(const NetworkClientInfo *cio) /* Only companies actually playing can speak to team. Eg spectators cannot */ if (!_settings_client.gui.prefer_teamchat || !Company::IsValidID(cio->client_playas)) return false; - const NetworkClientInfo *ci; - FOR_ALL_CLIENT_INFOS(ci) { + for (const NetworkClientInfo *ci : NetworkClientInfo::Iterate()) { if (ci->client_playas == cio->client_playas && ci != cio) return true; } |