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

2017-05-19 16:31:31 +02:00
parent 3ca179b954 ba24181fd6
commit 53f865c42c
79 changed files with 1367 additions and 714 deletions
--- a/src/Nazara/Network/ENetHost.cpp
+++ b/src/Nazara/Network/ENetHost.cpp
@@ -280,7 +280,7 @@ namespace Nz

 			m_serviceTime = GetElapsedMilliseconds();
 		}
-		while (m_poller.IsReady(m_socket));
+		while (m_poller.IsReadyToRead(m_socket));

 		return 0;
 	}
@@ -327,7 +327,7 @@ namespace Nz
 			}
 		}

-		m_poller.RegisterSocket(m_socket);
+		m_poller.RegisterSocket(m_socket, SocketPollEvent_Read);

 		return true;
 	}