|
@@ -396,11 +396,11 @@ enet_protocol_handle_send_fragment (ENetHost * host, ENetPeer * peer, const ENet
|
|
fragmentCount != startCommand -> fragmentCount)
|
|
fragmentCount != startCommand -> fragmentCount)
|
|
return;
|
|
return;
|
|
|
|
|
|
- if ((startCommand -> fragments [fragmentNumber / 32] & (1 << (fragmentNumber & 32))) == 0)
|
|
|
|
|
|
+ if ((startCommand -> fragments [fragmentNumber / 32] & (1 << (fragmentNumber % 32))) == 0)
|
|
{
|
|
{
|
|
-- startCommand -> fragmentsRemaining;
|
|
-- startCommand -> fragmentsRemaining;
|
|
|
|
|
|
- startCommand -> fragments [fragmentNumber / 32] |= (1 << (fragmentNumber & 32));
|
|
|
|
|
|
+ startCommand -> fragments [fragmentNumber / 32] |= (1 << (fragmentNumber % 32));
|
|
|
|
|
|
if (fragmentOffset + fragmentLength > startCommand -> packet -> dataLength)
|
|
if (fragmentOffset + fragmentLength > startCommand -> packet -> dataLength)
|
|
fragmentLength = startCommand -> packet -> dataLength - fragmentOffset;
|
|
fragmentLength = startCommand -> packet -> dataLength - fragmentOffset;
|
|
@@ -1118,10 +1118,11 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch
|
|
|
|
|
|
#ifdef ENET_DEBUG
|
|
#ifdef ENET_DEBUG
|
|
#ifdef WIN32
|
|
#ifdef WIN32
|
|
- printf ("peer %u: %f%%+-%f%% packet loss, %u+-%u ms round trip time, %f%% throttle, %u/%u outgoing, %u/%u incoming\n", currentPeer -> incomingPeerID, currentPeer -> packetLoss / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> packetLossVariance / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> roundTripTime, currentPeer -> roundTripTimeVariance, currentPeer -> packetThrottle / (float) ENET_PEER_PACKET_THROTTLE_SCALE, enet_list_size (& currentPeer -> outgoingReliableCommands), enet_list_size (& currentPeer -> outgoingUnreliableCommands), currentPeer -> channels != NULL ? enet_list_size (& currentPeer -> channels -> incomingReliableCommands) : 0, enet_list_size (& currentPeer -> channels -> incomingUnreliableCommands));
|
|
|
|
|
|
+ printf (
|
|
#else
|
|
#else
|
|
- fprintf (stderr, "peer %u: %f%%+-%f%% packet loss, %u+-%u ms round trip time, %f%% throttle, %u/%u outgoing, %u/%u incoming\n", currentPeer -> incomingPeerID, currentPeer -> packetLoss / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> packetLossVariance / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> roundTripTime, currentPeer -> roundTripTimeVariance, currentPeer -> packetThrottle / (float) ENET_PEER_PACKET_THROTTLE_SCALE, enet_list_size (& currentPeer -> outgoingReliableCommands), enet_list_size (& currentPeer -> outgoingUnreliableCommands), currentPeer -> channels != NULL ? enet_list_size (& currentPeer -> channels -> incomingReliableCommands) : 0, enet_list_size (& currentPeer -> channels -> incomingUnreliableCommands));
|
|
|
|
|
|
+ fprintf (stderr,
|
|
#endif
|
|
#endif
|
|
|
|
+ "peer %u: %f%%+-%f%% packet loss, %u+-%u ms round trip time, %f%% throttle, %u/%u outgoing, %u/%u incoming\n", currentPeer -> incomingPeerID, currentPeer -> packetLoss / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> packetLossVariance / (float) ENET_PEER_PACKET_LOSS_SCALE, currentPeer -> roundTripTime, currentPeer -> roundTripTimeVariance, currentPeer -> packetThrottle / (float) ENET_PEER_PACKET_THROTTLE_SCALE, enet_list_size (& currentPeer -> outgoingReliableCommands), enet_list_size (& currentPeer -> outgoingUnreliableCommands), currentPeer -> channels != NULL ? enet_list_size (& currentPeer -> channels -> incomingReliableCommands) : 0, enet_list_size (& currentPeer -> channels -> incomingUnreliableCommands));
|
|
#endif
|
|
#endif
|
|
|
|
|
|
currentPeer -> packetLossVariance -= currentPeer -> packetLossVariance / 4;
|
|
currentPeer -> packetLossVariance -= currentPeer -> packetLossVariance / 4;
|