From 4ebc381e407cf32a00d00a1673c97f2e57b709d6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 11 Jul 2013 14:43:41 -0700 Subject: [PATCH] update dummy operative code for change to packet type --- libraries/shared/src/NodeList.cpp | 2 +- libraries/shared/src/Operative.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 52ca7594b1..df7822d6aa 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -335,7 +335,7 @@ void NodeList::sendAssignmentRequest() { static sockaddr_in assignmentServerSocket = socketForHostname(ASSIGNMENT_SERVER_HOSTNAME); assignmentServerSocket.sin_port = htons(ASSIGNMENT_SERVER_PORT); - _nodeSocket.send((sockaddr*) &assignmentServerSocket, &PACKET_HEADER_REQUEST_ASSIGNMENT, 1); + _nodeSocket.send((sockaddr*) &assignmentServerSocket, &PACKET_TYPE_REQUEST_ASSIGNMENT, 1); } Node* NodeList::addOrUpdateNode(sockaddr* publicSocket, sockaddr* localSocket, char nodeType, uint16_t nodeId) { diff --git a/libraries/shared/src/Operative.cpp b/libraries/shared/src/Operative.cpp index 5ca18a15b6..19cf78c102 100644 --- a/libraries/shared/src/Operative.cpp +++ b/libraries/shared/src/Operative.cpp @@ -113,7 +113,7 @@ void Operative::removeOldBug() { } // send the "erase message" first... - PACKET_HEADER message = PACKET_HEADER_ERASE_VOXEL; + PACKET_TYPE message = PACKET_TYPE_ERASE_VOXEL; if (createVoxelEditMessage(message, 0, VOXELS_PER_BUG, (VoxelDetail*)&details, bufferOut, sizeOut)){ _packetsSent++; @@ -182,7 +182,7 @@ void Operative::renderMovingBug() { } // send the "create message" ... - PACKET_HEADER message = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; + PACKET_TYPE message = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; if (createVoxelEditMessage(message, 0, VOXELS_PER_BUG, (VoxelDetail*)&details, bufferOut, sizeOut)){ _packetsSent++; @@ -235,7 +235,7 @@ void Operative::run() { if (usecToSleep > 0) { usleep(usecToSleep); } else { - std::cout << "Last send took too much time, not sleeping!\n"; + printf("Last send took too much time, not sleeping!\n"); } }