From ccb7adbd101031b251635d83cac0e41dc45696c4 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 11 Apr 2016 01:01:22 +1000 Subject: [PATCH] Fixed copying pointer to/from packet --- common/network/packet_types/barrier_packet.cpp | 8 ++------ server/server_utilities.cpp | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common/network/packet_types/barrier_packet.cpp b/common/network/packet_types/barrier_packet.cpp index c410b1e..ac596aa 100644 --- a/common/network/packet_types/barrier_packet.cpp +++ b/common/network/packet_types/barrier_packet.cpp @@ -44,9 +44,7 @@ void serializeBarrier(void* buffer, BarrierPacket* packet) { serialCopy(&buffer, &packet->motion.y, sizeof(double)); //graphical data - for (int i = 0; i < 8; i++) { - serialCopy(&buffer, &packet->status[i], sizeof(int)); - } + serialCopy(&buffer, packet->status, sizeof(int) * 8); } void deserializeBarrier(void* buffer, BarrierPacket* packet) { @@ -70,7 +68,5 @@ void deserializeBarrier(void* buffer, BarrierPacket* packet) { deserialCopy(&buffer, &packet->motion.y, sizeof(double)); //graphical data - for (int i = 0; i < 8; i++) { - deserialCopy(&buffer, &packet->status[i], sizeof(int)); - } + deserialCopy(&buffer, packet->status, sizeof(int) * 8); } diff --git a/server/server_utilities.cpp b/server/server_utilities.cpp index e21fe05..a1d353d 100644 --- a/server/server_utilities.cpp +++ b/server/server_utilities.cpp @@ -184,7 +184,7 @@ void copyBarrierToPacket(BarrierPacket* const packet, BarrierData* const barrier packet->motion = barrierData->GetMotion(); packet->bounds = barrierData->GetBounds(); - memcpy(barrierData->GetStatusArray(), &packet->status, sizeof(int) * 8); + memcpy(packet->status, barrierData->GetStatusArray(), sizeof(int) * 8); } void pumpAndChangeRooms(int characterIndex, int newRoomIndex) {