diff options
Diffstat (limited to 'src/network/room.cpp')
| -rw-r--r-- | src/network/room.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/network/room.cpp b/src/network/room.cpp index 528867146..b82a75749 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp | |||
| @@ -877,8 +877,8 @@ void Room::RoomImpl::HandleWifiPacket(const ENetEvent* event) { | |||
| 877 | } else { // Send the data only to the destination client | 877 | } else { // Send the data only to the destination client |
| 878 | std::lock_guard lock(member_mutex); | 878 | std::lock_guard lock(member_mutex); |
| 879 | auto member = std::find_if(members.begin(), members.end(), | 879 | auto member = std::find_if(members.begin(), members.end(), |
| 880 | [destination_address](const Member& member) -> bool { | 880 | [destination_address](const Member& member_entry) -> bool { |
| 881 | return member.mac_address == destination_address; | 881 | return member_entry.mac_address == destination_address; |
| 882 | }); | 882 | }); |
| 883 | if (member != members.end()) { | 883 | if (member != members.end()) { |
| 884 | enet_peer_send(member->peer, 0, enet_packet); | 884 | enet_peer_send(member->peer, 0, enet_packet); |
| @@ -955,10 +955,10 @@ void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) { | |||
| 955 | 955 | ||
| 956 | { | 956 | { |
| 957 | std::lock_guard lock(member_mutex); | 957 | std::lock_guard lock(member_mutex); |
| 958 | auto member = | 958 | auto member = std::find_if(members.begin(), members.end(), |
| 959 | std::find_if(members.begin(), members.end(), [event](const Member& member) -> bool { | 959 | [event](const Member& member_entry) -> bool { |
| 960 | return member.peer == event->peer; | 960 | return member_entry.peer == event->peer; |
| 961 | }); | 961 | }); |
| 962 | if (member != members.end()) { | 962 | if (member != members.end()) { |
| 963 | member->game_info = game_info; | 963 | member->game_info = game_info; |
| 964 | 964 | ||
| @@ -982,9 +982,10 @@ void Room::RoomImpl::HandleClientDisconnection(ENetPeer* client) { | |||
| 982 | std::string nickname, username, ip; | 982 | std::string nickname, username, ip; |
| 983 | { | 983 | { |
| 984 | std::lock_guard lock(member_mutex); | 984 | std::lock_guard lock(member_mutex); |
| 985 | auto member = std::find_if(members.begin(), members.end(), [client](const Member& member) { | 985 | auto member = |
| 986 | return member.peer == client; | 986 | std::find_if(members.begin(), members.end(), [client](const Member& member_entry) { |
| 987 | }); | 987 | return member_entry.peer == client; |
| 988 | }); | ||
| 988 | if (member != members.end()) { | 989 | if (member != members.end()) { |
| 989 | nickname = member->nickname; | 990 | nickname = member->nickname; |
| 990 | username = member->user_data.username; | 991 | username = member->user_data.username; |