summaryrefslogtreecommitdiff
path: root/src/network/network_command.cpp
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2019-12-16 20:56:10 +0100
committerNiels Martin Hansen <nielsm@indvikleren.dk>2019-12-21 20:13:03 +0100
commit41232f18c18c9ca444282a9e959b7dfd6c93eff5 (patch)
treedce6e69fc4e0c7d441cf4916700aa3156be88e62 /src/network/network_command.cpp
parent09fa39c5b59d88a076a244cf1623a53b0ffa1434 (diff)
downloadopenttd-41232f18c18c9ca444282a9e959b7dfd6c93eff5.tar.xz
Codechange: Replace network related FOR_ALL with range-based for loops
Diffstat (limited to 'src/network/network_command.cpp')
-rw-r--r--src/network/network_command.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 0994c50a8..5d36a39b9 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -238,8 +238,7 @@ static void DistributeCommandPacket(CommandPacket &cp, const NetworkClientSocket
CommandCallback *callback = cp.callback;
cp.frame = _frame_counter_max + 1;
- NetworkClientSocket *cs;
- FOR_ALL_CLIENT_SOCKETS(cs) {
+ for (NetworkClientSocket *cs : NetworkClientSocket::Iterate()) {
if (cs->status >= NetworkClientSocket::STATUS_MAP) {
/* Callbacks are only send back to the client who sent them in the
* first place. This filters that out. */
@@ -249,8 +248,8 @@ static void DistributeCommandPacket(CommandPacket &cp, const NetworkClientSocket
}
}
- cp.callback = (cs != owner) ? nullptr : callback;
- cp.my_cmd = (cs == owner);
+ cp.callback = (nullptr != owner) ? nullptr : callback;
+ cp.my_cmd = (nullptr == owner);
_local_execution_queue.Append(&cp);
}
@@ -283,8 +282,7 @@ void NetworkDistributeCommands()
DistributeQueue(&_local_wait_queue, nullptr);
/* Then send the queues of the others. */
- NetworkClientSocket *cs;
- FOR_ALL_CLIENT_SOCKETS(cs) {
+ for (NetworkClientSocket *cs : NetworkClientSocket::Iterate()) {
DistributeQueue(&cs->incoming_queue, cs);
}
}