|
|
@ -159,7 +159,7 @@ void RoomMember::RoomMemberImpl::MemberLoop() {
|
|
|
|
while (IsConnected()) {
|
|
|
|
while (IsConnected()) {
|
|
|
|
std::lock_guard lock(network_mutex);
|
|
|
|
std::lock_guard lock(network_mutex);
|
|
|
|
ENetEvent event;
|
|
|
|
ENetEvent event;
|
|
|
|
if (enet_host_service(client, &event, 100) > 0) {
|
|
|
|
if (enet_host_service(client, &event, 16) > 0) {
|
|
|
|
switch (event.type) {
|
|
|
|
switch (event.type) {
|
|
|
|
case ENET_EVENT_TYPE_RECEIVE:
|
|
|
|
case ENET_EVENT_TYPE_RECEIVE:
|
|
|
|
switch (event.packet->data[0]) {
|
|
|
|
switch (event.packet->data[0]) {
|
|
|
@ -251,16 +251,18 @@ void RoomMember::RoomMemberImpl::MemberLoop() {
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::list<Packet> packets;
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::lock_guard lock(send_list_mutex);
|
|
|
|
std::lock_guard lock(send_list_mutex);
|
|
|
|
for (const auto& packet : send_list) {
|
|
|
|
packets.swap(send_list);
|
|
|
|
ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(),
|
|
|
|
|
|
|
|
ENET_PACKET_FLAG_RELIABLE);
|
|
|
|
|
|
|
|
enet_peer_send(server, 0, enetPacket);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
enet_host_flush(client);
|
|
|
|
|
|
|
|
send_list.clear();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const auto& packet : packets) {
|
|
|
|
|
|
|
|
ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(),
|
|
|
|
|
|
|
|
ENET_PACKET_FLAG_RELIABLE);
|
|
|
|
|
|
|
|
enet_peer_send(server, 0, enetPacket);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
enet_host_flush(client);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Disconnect();
|
|
|
|
Disconnect();
|
|
|
|
};
|
|
|
|
};
|
|
|
|