Fixed minor networking issue

This commit is contained in:
2016-03-18 21:09:02 +11:00
parent 3eafb57403
commit 15cd3648a3
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -27,16 +27,16 @@ void serializeServer(void* buffer, ServerPacket* packet) {
serialCopy(&buffer, &packet->type, sizeof(SerialPacketType)); serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
//identify the server //identify the server
serialCopy(&buffer, &packet->version, sizeof(int));
serialCopy(&buffer, packet->name, PACKET_STRING_SIZE); serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
serialCopy(&buffer, &packet->playerCount, sizeof(int)); serialCopy(&buffer, &packet->playerCount, sizeof(int));
serialCopy(&buffer, &packet->version, sizeof(int));
} }
void deserializeServer(void* buffer, ServerPacket* packet) { void deserializeServer(void* buffer, ServerPacket* packet) {
deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType)); deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
//identify the server //identify the server
deserialCopy(&buffer, &packet->version, sizeof(int));
deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE); deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
deserialCopy(&buffer, &packet->playerCount, sizeof(int)); deserialCopy(&buffer, &packet->playerCount, sizeof(int));
deserialCopy(&buffer, &packet->version, sizeof(int));
} }
+1 -1
View File
@@ -33,7 +33,7 @@
typedef SerialPacketBase SerialPacket; typedef SerialPacketBase SerialPacket;
//DOCS: NETWORK_VERSION is used to discern compatible servers and clients //DOCS: NETWORK_VERSION is used to discern compatible servers and clients
constexpr int NETWORK_VERSION = 20150820; constexpr int NETWORK_VERSION = 20160316;
union MaxPacket { union MaxPacket {
CharacterPacket a; CharacterPacket a;