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

Add unity build support

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-03-15 08:26:57 +01:00
parent 0a4fd8f56d
commit 6bd9f1a9e4
109 changed files with 964 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Network/ENetHost.cpp
View File

@@ -23,7 +23,7 @@ namespace Nz
{
namespace
{
static std::size_t s_commandSizes[ENetProtocolCommand_Count] =
static std::size_t s_enetCommandSizes[ENetProtocolCommand_Count] =
{
0,
sizeof(ENetProtocolAcknowledge),
@@ -567,7 +567,7 @@ namespace Nz
if (commandNumber >= ENetProtocolCommand_Count)
break;
std::size_t commandSize = s_commandSizes[commandNumber];
std::size_t commandSize = s_enetCommandSizes[commandNumber];
if (commandSize == 0 || currentData + commandSize > &m_receivedData[m_receivedDataLength])
break;
@@ -893,7 +893,7 @@ namespace Nz
canPing = false;
assert((outgoingCommand->command.header.command & ENetProtocolCommand_Mask) < ENetProtocolCommand_Count);
std::size_t commandSize = s_commandSizes[outgoingCommand->command.header.command & ENetProtocolCommand_Mask];
std::size_t commandSize = s_enetCommandSizes[outgoingCommand->command.header.command & ENetProtocolCommand_Mask];
if (m_commandCount >= m_commands.size() || m_bufferCount + 1 >= m_buffers.size() || peer->GetMtu() - m_packetSize < commandSize ||
(outgoingCommand->packet && UInt16(peer->GetMtu() - m_packetSize) < UInt16(commandSize + outgoingCommand->fragmentLength)))
{
@@ -1146,7 +1146,7 @@ namespace Nz
auto outgoingCommand = currentCommand;
assert((outgoingCommand->command.header.command & ENetProtocolCommand_Mask) < ENetProtocolCommand_Count);
std::size_t commandSize = s_commandSizes[outgoingCommand->command.header.command & ENetProtocolCommand_Mask];
std::size_t commandSize = s_enetCommandSizes[outgoingCommand->command.header.command & ENetProtocolCommand_Mask];
if (m_commandCount >= m_commands.size() || m_bufferCount + 1 >= m_buffers.size() || peer->m_mtu - m_packetSize < commandSize ||
(outgoingCommand->packet && peer->m_mtu - m_packetSize < commandSize + outgoingCommand->fragmentLength))
@@ -1360,7 +1360,7 @@ namespace Nz
std::size_t ENetHost::GetCommandSize(UInt8 commandNumber)
{
assert((commandNumber & ENetProtocolCommand_Mask) < ENetProtocolCommand_Count);
return s_commandSizes[commandNumber & ENetProtocolCommand_Mask];
return s_enetCommandSizes[commandNumber & ENetProtocolCommand_Mask];
}
bool ENetHost::Initialize()