GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix all merge suggestions/issues

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Networking/Drivers/ENetDriver.cpp
View File

@@ -57,7 +57,7 @@ void ENetDriver::Initialize(NetworkPeer* host, const NetworkConfig& config)
{
_networkHost = host;
_config = config;
_peerMap = Dictionary<uint32_t, void*>();
_peerMap = Dictionary<uint32, void*>();
if (enet_initialize () != 0) {
LOG(Error, "Failed to initialize ENet driver!");
@@ -173,7 +173,7 @@ bool ENetDriver::PopEvent(NetworkEvent* eventPtr)
if(result > 0)
{
// Copy sender data
const uint32_t connectionId = enet_peer_get_id(event.peer);
const uint32 connectionId = enet_peer_get_id(event.peer);
eventPtr->Sender = NetworkConnection();
eventPtr->Sender.ConnectionId = connectionId;
@@ -189,14 +189,14 @@ bool ENetDriver::PopEvent(NetworkEvent* eventPtr)
case ENET_EVENT_TYPE_DISCONNECT:
eventPtr->EventType = NetworkEventType::Disconnected;
if(IsServer() && _peerMap.ContainsKey(connectionId))
if(IsServer())
_peerMap.Remove(connectionId);
break;
case ENET_EVENT_TYPE_DISCONNECT_TIMEOUT:
eventPtr->EventType = NetworkEventType::Timeout;
if(IsServer() && _peerMap.ContainsKey(connectionId))
if(IsServer())
_peerMap.Remove(connectionId);
break;
@@ -235,7 +235,7 @@ void ENetDriver::SendMessage(NetworkChannelType channelType, const NetworkMessag
SendPacketToPeer(peer, channelType, message);
}
void ENetDriver::SendMessage(const NetworkChannelType channelType, const NetworkMessage& message, Array<NetworkConnection, HeapAllocation> targets)
void ENetDriver::SendMessage(const NetworkChannelType channelType, const NetworkMessage& message, Array<NetworkConnection, HeapAllocation>& targets)
{
ASSERT(IsServer());