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

Merge branch 'enet_wip_nothing_to_see_here' of https://github.com/DigitalPulseSoftware/NazaraEngine into enet_wip_nothing_to_see_here

This commit is contained in:
Lynix 2017-02-16 23:26:33 +01:00
parent e0dca1b043 7b49b3dd0e
commit 20dfd61ad7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Network/NetPacket.inl
View File

@ -155,6 +155,8 @@ namespace Nz
{ {
InitStream(HeaderSize + size, HeaderSize, OpenMode_ReadOnly); InitStream(HeaderSize + size, HeaderSize, OpenMode_ReadOnly);
m_buffer->Resize(HeaderSize + size); m_buffer->Resize(HeaderSize + size);
if (ptr)
std::memcpy(m_buffer->GetBuffer() + HeaderSize, ptr, size); std::memcpy(m_buffer->GetBuffer() + HeaderSize, ptr, size);
m_netCode = netCode; m_netCode = netCode;

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

@ -637,12 +637,13 @@ namespace Nz
} }
} }
if (startCommand) if (!startCommand)
{ {
ENetProtocol hostCommand = *command; ENetProtocol hostCommand = *command;
hostCommand.header.reliableSequenceNumber = startSequenceNumber; hostCommand.header.reliableSequenceNumber = startSequenceNumber;
if (!QueueIncomingCommand(hostCommand, nullptr, totalLength, ENetPacketFlag_Reliable, fragmentCount)) startCommand = QueueIncomingCommand(hostCommand, nullptr, totalLength, ENetPacketFlag_Reliable, fragmentCount);
if (!startCommand)
return false; return false;
} }