Merge remote-tracking branch 'origin/Networking' into Networking

# Conflicts:
#	src/Engine/Network/Client.cpp
This commit is contained in:
stiffly
2015-12-10 17:16:22 +01:00
5 changed files with 212 additions and 161 deletions
+2 -1
View File
@@ -27,7 +27,7 @@ public:
void Close();
private:
void ReadFromServer();
void SendToServer();
void SendSnapshotToServer();
int Receive(char* data, size_t length);
void Send(Package& message);
@@ -66,6 +66,7 @@ private:
// Use to check if we should send disconnect message
// if game is turned of by closing window.
bool m_WasStarted = false;
IsWASDKeyDown m_IsWASDKeyDown;
// Events
EventBroker* m_EventBroker;
@@ -10,9 +10,12 @@
#define MAXCONNECTIONS 8
#define INPUTSIZE 128
#define PACKETMODULUS 1000 // How many packets to send before the number resets
#define PLAYERSPEED 0.2f;
typedef boost::shared_ptr<boost::asio::ip::udp::socket> socket_ptr;
typedef boost::shared_ptr<std::string> string_ptr;
typedef boost::shared_ptr<std::queue<string_ptr>> messageQueue_ptr;
#endif
+10 -2
View File
@@ -4,9 +4,17 @@
struct SnapshotDefinitions
{
// "+Forward" is 8 characters * sizeof(char) = 8
char* inputForward = new char[8];
char* InputForward = new char[8];
// "+Right" is 6 characters * sizeof(char) = 6
char* inputRight = new char[6];
char* InputRight = new char[6];
};
struct IsWASDKeyDown
{
bool W = false;
bool A = false;
bool S = false;
bool D = false;
};
#endif