Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts: # include/Engine/Network/Client.h # src/Engine/Network/Client.cpp
This commit is contained in:
@@ -42,6 +42,7 @@ private:
|
||||
void ParseSnapshot(Package& package);
|
||||
void CreateNewPlayer(int i);
|
||||
void IdentifyPacketLoss();
|
||||
bool IsConnected();
|
||||
|
||||
// UDP logic
|
||||
boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <string>
|
||||
|
||||
struct PlayerDefinition {
|
||||
unsigned int EntityID = -1;
|
||||
int EntityID = -1;
|
||||
std::string Name = "";
|
||||
boost::asio::ip::udp::endpoint Endpoint;
|
||||
};
|
||||
|
||||
@@ -50,7 +50,7 @@ private:
|
||||
void ReadFromClients();
|
||||
void InputLoop();
|
||||
|
||||
|
||||
// Network functions
|
||||
int Receive(char* data, size_t length);
|
||||
void Send(Package& package, int playerID);
|
||||
void Send(Package& package);
|
||||
|
||||
Reference in New Issue
Block a user