From c8b0e4bfe72725b55c684d1c66063e32c3fbc410 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 8 Jul 2013 15:04:49 -0700 Subject: [PATCH] use packet version helpers for PACKET_TYPE_ENVIRONMENT_DATA --- voxel-server/src/main.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index 78f6eb2233..c25d352228 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -201,10 +201,12 @@ void resInVoxelDistributor(NodeList* nodeList, // send the environment packets if (shouldSendEnvironments) { int envPacketLength = 1; - *tempOutputBuffer = PACKET_TYPE_ENVIRONMENT_DATA; - for (int i = 0; i < sizeof(environmentData) / sizeof(environmentData[0]); i++) { + int numBytesPacketHeader = populateTypeAndVersion(tempOutputBuffer, PACKET_TYPE_ENVIRONMENT_DATA); + + for (int i = 0; i < sizeof(environmentData) / numBytesPacketHeader; i++) { envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength); } + nodeList->getNodeSocket()->send(node->getActiveSocket(), tempOutputBuffer, envPacketLength); trueBytesSent += envPacketLength; truePacketsSent++; @@ -387,10 +389,13 @@ void deepestLevelVoxelDistributor(NodeList* nodeList, // send the environment packet if (shouldSendEnvironments) { int envPacketLength = 1; - *tempOutputBuffer = PACKET_TYPE_ENVIRONMENT_DATA; - for (int i = 0; i < sizeof(environmentData) / sizeof(environmentData[0]); i++) { + + int numBytesPacketHeader = populateTypeAndVersion(tempOutputBuffer, PACKET_TYPE_ENVIRONMENT_DATA); + + for (int i = 0; i < sizeof(environmentData) / numBytesPacketHeader; i++) { envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength); } + nodeList->getNodeSocket()->send(node->getActiveSocket(), tempOutputBuffer, envPacketLength); trueBytesSent += envPacketLength; truePacketsSent++;