use packet version helpers for PACKET_TYPE_ENVIRONMENT_DATA

This commit is contained in:
Stephen Birarda 2013-07-08 15:04:49 -07:00
parent 185d5bb0a2
commit c8b0e4bfe7

View file

@ -201,10 +201,12 @@ void resInVoxelDistributor(NodeList* nodeList,
// send the environment packets // send the environment packets
if (shouldSendEnvironments) { if (shouldSendEnvironments) {
int envPacketLength = 1; int envPacketLength = 1;
*tempOutputBuffer = PACKET_TYPE_ENVIRONMENT_DATA; int numBytesPacketHeader = populateTypeAndVersion(tempOutputBuffer, PACKET_TYPE_ENVIRONMENT_DATA);
for (int i = 0; i < sizeof(environmentData) / sizeof(environmentData[0]); i++) {
for (int i = 0; i < sizeof(environmentData) / numBytesPacketHeader; i++) {
envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength); envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength);
} }
nodeList->getNodeSocket()->send(node->getActiveSocket(), tempOutputBuffer, envPacketLength); nodeList->getNodeSocket()->send(node->getActiveSocket(), tempOutputBuffer, envPacketLength);
trueBytesSent += envPacketLength; trueBytesSent += envPacketLength;
truePacketsSent++; truePacketsSent++;
@ -387,10 +389,13 @@ void deepestLevelVoxelDistributor(NodeList* nodeList,
// send the environment packet // send the environment packet
if (shouldSendEnvironments) { if (shouldSendEnvironments) {
int envPacketLength = 1; 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); envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength);
} }
nodeList->getNodeSocket()->send(node->getActiveSocket(), tempOutputBuffer, envPacketLength); nodeList->getNodeSocket()->send(node->getActiveSocket(), tempOutputBuffer, envPacketLength);
trueBytesSent += envPacketLength; trueBytesSent += envPacketLength;
truePacketsSent++; truePacketsSent++;