Fix all merge suggestions/issues

This commit is contained in:
Damian Korczowski
2021-07-01 19:47:04 +02:00
parent bfd50851f8
commit 2f9147c36c
6 changed files with 21 additions and 12 deletions

View File

@@ -12,7 +12,7 @@
namespace
{
Array<NetworkPeer*, HeapAllocation> Peers;
uint32_t LastHostId = 0;
uint32 LastHostId = 0;
}
void NetworkPeer::Initialize(const NetworkConfig& config)
@@ -153,7 +153,7 @@ bool NetworkPeer::EndSendMessage(const NetworkChannelType channelType, const Net
return false;
}
bool NetworkPeer::EndSendMessage(const NetworkChannelType channelType, const NetworkMessage& message, Array<NetworkConnection> targets)
bool NetworkPeer::EndSendMessage(const NetworkChannelType channelType, const NetworkMessage& message, Array<NetworkConnection>& targets)
{
ASSERT(message.IsValid());