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

# Conflicts:
#	src/Engine/Network/Client.cpp
This commit is contained in:
Jocke
2015-12-17 09:47:15 +01:00
4 changed files with 40 additions and 13 deletions
+5
View File
@@ -14,6 +14,7 @@ public:
Package(MessageType type, unsigned int& packageID);
// Used to create package from already existing data buffer.
Package(char* data, const int sizeOfPackage);
~Package();
// Add primitive types like int, float, char...
template<typename T>
@@ -35,9 +36,13 @@ public:
m_ReturnDataOffset += sizeof(T);
return returnValue;
}
// Add a string to the message
void AddString(std::string str);
// Add data to the message
void AddData(char* data, int sizeOfData);
// Pops the first element as if it was a string.
std::string PopFrontString();
char* PopData(int SizeOfData);
int Size() { return m_Offset; };
char* Data() { return m_Data; };