From 15cd3648a3ce9c63c4c9e901978eb7c4fe94896c Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 18 Mar 2016 21:09:02 +1100 Subject: [PATCH] Fixed minor networking issue --- network/packet_types/server_packet.cpp | 4 ++-- network/serial_packet.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network/packet_types/server_packet.cpp b/network/packet_types/server_packet.cpp index 562d353..eefefbe 100644 --- a/network/packet_types/server_packet.cpp +++ b/network/packet_types/server_packet.cpp @@ -27,16 +27,16 @@ void serializeServer(void* buffer, ServerPacket* packet) { serialCopy(&buffer, &packet->type, sizeof(SerialPacketType)); //identify the server + serialCopy(&buffer, &packet->version, sizeof(int)); serialCopy(&buffer, packet->name, PACKET_STRING_SIZE); serialCopy(&buffer, &packet->playerCount, sizeof(int)); - serialCopy(&buffer, &packet->version, sizeof(int)); } void deserializeServer(void* buffer, ServerPacket* packet) { deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType)); //identify the server + deserialCopy(&buffer, &packet->version, sizeof(int)); deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE); deserialCopy(&buffer, &packet->playerCount, sizeof(int)); - deserialCopy(&buffer, &packet->version, sizeof(int)); } diff --git a/network/serial_packet.hpp b/network/serial_packet.hpp index fbfb851..4bf1d8a 100644 --- a/network/serial_packet.hpp +++ b/network/serial_packet.hpp @@ -33,7 +33,7 @@ typedef SerialPacketBase SerialPacket; //DOCS: NETWORK_VERSION is used to discern compatible servers and clients -constexpr int NETWORK_VERSION = 20150820; +constexpr int NETWORK_VERSION = 20160316; union MaxPacket { CharacterPacket a;