sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
Lynix
2017-01-26 09:28:41 +01:00
parent 9e3341a32a
commit 12b4073033
4 changed files with 433 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Nazara/Network/ENetPeer.cpp
View File

@@ -16,7 +16,7 @@ namespace Nz
return value;
#endif
}
/// Temporary
template<typename T>
T NetToHost(T value)
@@ -28,31 +28,6 @@ namespace Nz
#endif
}
namespace
{
static std::size_t commandSizes[ENetProtocolCommand_Count] =
{
0,
sizeof(ENetProtocolAcknowledge),
sizeof(ENetProtocolConnect),
sizeof(ENetProtocolVerifyConnect),
sizeof(ENetProtocolDisconnect),
sizeof(ENetProtocolPing),
sizeof(ENetProtocolSendReliable),
sizeof(ENetProtocolSendUnreliable),
sizeof(ENetProtocolSendFragment),
sizeof(ENetProtocolSendUnsequenced),
sizeof(ENetProtocolBandwidthLimit),
sizeof(ENetProtocolThrottleConfigure),
sizeof(ENetProtocolSendFragment)
};
std::size_t enet_protocol_command_size(UInt8 commandNumber)
{
return commandSizes[commandNumber & ENetProtocolCommand_Mask];
}
}
ENetPeer::ENetPeer(ENetHost* host, UInt16 peerId) :
m_packetPool(sizeof(ENetPacket)),
m_host(host),
@@ -505,8 +480,8 @@ namespace Nz
}
}
ENetProtocolCommand ENetPeer::RemoveSentReliableCommands(UInt16 reliableSequenceNumber, UInt8 channelId)
{
ENetProtocolCommand ENetPeer::RemoveSentReliableCommand(UInt16 reliableSequenceNumber, UInt8 channelId)
{
std::list<OutgoingCommand>* commandList = nullptr;
bool found = true;
@@ -595,16 +570,16 @@ namespace Nz
m_channels.clear();
}
bool ENetPeer::QueueAcknowledgement(ENetProtocol& command, UInt16 sentTime)
bool ENetPeer::QueueAcknowledgement(ENetProtocol*command, UInt16 sentTime)
{
if (command.header.channelID < m_channels.size())
if (command->header.channelID < m_channels.size())
{
Channel& channel = m_channels[command.header.channelID];
Channel& channel = m_channels[command->header.channelID];
UInt16 reliableWindow = command.header.reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
UInt16 reliableWindow = command->header.reliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
UInt16 currentWindow = channel.incomingReliableSequenceNumber / ENetConstants::ENetPeer_ReliableWindowSize;
if (command.header.reliableSequenceNumber < channel.incomingReliableSequenceNumber)
if (command->header.reliableSequenceNumber < channel.incomingReliableSequenceNumber)
reliableWindow += ENetConstants::ENetPeer_ReliableWindows;
if (reliableWindow >= currentWindow + ENetConstants::ENetPeer_FreeReliableWindows - 1 && reliableWindow <= currentWindow + ENetConstants::ENetPeer_FreeReliableWindows)
@@ -882,4 +857,4 @@ namespace Nz
return 0;
}
}
}