From 46dff9b97bb276947e60f9c238298c1d797d6cd0 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 4 Jun 2014 23:08:52 +1000 Subject: [PATCH] Implemented the minor changes into UDPNetworkPacket --- common/network/makefile | 4 +++- common/network/udp_network_utility.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/network/makefile b/common/network/makefile index 7053c0f..618d925 100644 --- a/common/network/makefile +++ b/common/network/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. ../gameplay ../map ../utilities +INCLUDES+=. packet serial ../gameplay ../map ../utilities LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) @@ -17,6 +17,8 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a) #targets all: $(OBJ) $(OUT) ar -crs $(OUT) $(OBJ) + $(MAKE) -C packet + $(MAKE) -C serial $(OBJ): | $(OBJDIR) diff --git a/common/network/udp_network_utility.cpp b/common/network/udp_network_utility.cpp index 5fb669e..275c1c8 100644 --- a/common/network/udp_network_utility.cpp +++ b/common/network/udp_network_utility.cpp @@ -166,7 +166,7 @@ int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacket* serialPack int UDPNetworkUtility::SendTo(IPaddress* add, SerialPacket* serialPacket) { memset(packet->data, 0, packet->maxlen); - serialize(serialPacket, packet->data); + serializePacket(serialPacket, packet->data); packet->len = PACKET_BUFFER_SIZE; packet->address = *add; @@ -181,7 +181,7 @@ int UDPNetworkUtility::SendTo(IPaddress* add, SerialPacket* serialPacket) { int UDPNetworkUtility::SendTo(int channel, SerialPacket* serialPacket) { memset(packet->data, 0, packet->maxlen); - serialize(serialPacket, packet->data); + serializePacket(serialPacket, packet->data); packet->len = PACKET_BUFFER_SIZE; int ret = SDLNet_UDP_Send(socket, channel, packet); @@ -195,7 +195,7 @@ int UDPNetworkUtility::SendTo(int channel, SerialPacket* serialPacket) { int UDPNetworkUtility::SendToAllChannels(SerialPacket* serialPacket) { memset(packet->data, 0, packet->maxlen); - serialize(serialPacket, packet->data); + serializePacket(serialPacket, packet->data); packet->len = PACKET_BUFFER_SIZE; int sent = 0; @@ -213,8 +213,8 @@ int UDPNetworkUtility::SendToAllChannels(SerialPacket* serialPacket) { int UDPNetworkUtility::Receive(SerialPacket* serialPacket) { memset(packet->data, 0, packet->maxlen); int ret = SDLNet_UDP_Recv(socket, packet); - deserialize(serialPacket, packet->data); - serialPacket->meta.srcAddress = packet->address; + deserializePacket(serialPacket, packet->data); + serialPacket->srcAddress = packet->address; if (ret < 0) { throw(std::runtime_error("Unknown network error occured"));