Merge branch 'master' into physics3d-material

This commit is contained in:
Lynix
2017-12-14 18:15:35 +01:00
11 changed files with 161 additions and 31 deletions

View File

@@ -64,7 +64,7 @@ namespace Nz
NAZARA_CORE_API friend std::ostream& operator<<(std::ostream& o, const Id& id);
private:
Id(ThreadImpl* thread);
explicit Id(ThreadImpl* thread);
ThreadImpl* m_id = nullptr;
};

View File

@@ -1,4 +1,4 @@
// Copyright (C) 2017 Jérôme Leclercq
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Network module"
// For conditions of distribution and use, see copyright notice in Config.hpp
@@ -8,6 +8,7 @@ namespace Nz
{
inline ENetPeer::ENetPeer(ENetHost* host, UInt16 peerId) :
m_host(host),
m_state(ENetPeerState::Disconnected),
m_incomingSessionID(0xFF),
m_outgoingSessionID(0xFF),
m_incomingPeerID(peerId),