From cc0e0e6a1f37a9e762f9e52a1ab11541086c87b4 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Jul 2015 11:35:36 -0700
Subject: [PATCH] Compile fixes in assignment client

---
 .../octree/OctreeInboundPacketProcessor.cpp   | 23 ++++++++++---------
 .../src/octree/OctreeQueryNode.h              |  3 ++-
 .../src/octree/OctreeSendThread.cpp           |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
index 678a448fce..174a592c2a 100644
--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
@@ -240,8 +240,9 @@ int OctreeInboundPacketProcessor::sendNackPackets() {
         return 0;
     }
 
-    NLPacketList nackPacketList(_myServer->getMyEditNackType();
+    NLPacketList nackPacketList(_myServer->getMyEditNackType());
     auto nodeList = DependencyManager::get<NodeList>();
+    int packetsSent = 0;
 
     NodeToSenderStatsMapIterator i = _singleSenderStats.begin();
     while (i != _singleSenderStats.end()) {
@@ -275,20 +276,20 @@ int OctreeInboundPacketProcessor::sendNackPackets() {
 
         while (it != missingSequenceNumbers.constEnd()) {
             unsigned short int sequenceNumber = *it;
-            nackPacketList->write(&sequenceNumber, sizeof(sequenceNumber));
+            nackPacketList.writePrimitive(sequenceNumber);
             ++it;
         }
+        
+        packetsSent = nackPacketList.getNumPackets();
+        
+        if (packetsSent) {
+            qDebug() << "NACK Sent back to editor/client... destinationNode=" << nodeUUID;
+        }
+        
+        // send the list of nack packets
+        nodeList->sendPacketList(nackPacketList, destinationNode);
     }
 
-    int packetsSent = nackPacketList.getNumPackets();
-
-    if (packetsSent) {
-        qDebug() << "NACK Sent back to editor/client... destinationNode=" << nodeUUID;
-    }
-
-    // send the list of nack packets
-    nodeList->sendPacketList(nackPacketList, destinationNode);
-
     return packetsSent;
 }
 
diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h
index 4597378401..9de0efc84b 100644
--- a/assignment-client/src/octree/OctreeQueryNode.h
+++ b/assignment-client/src/octree/OctreeQueryNode.h
@@ -46,7 +46,8 @@ public:
 
     bool packetIsDuplicate() const;
     bool shouldSuppressDuplicatePacket();
-
+    
+    unsigned int getAvailable() const { return _octreePacket->bytesAvailable(); }
     int getMaxSearchLevel() const { return _maxSearchLevel; }
     void resetMaxSearchLevel() { _maxSearchLevel = 1; }
     void incrementMaxSearchLevel() { _maxSearchLevel++; }
diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index d2c395dec9..ca32d1a528 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -580,9 +580,9 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus
         // Here's where we can/should allow the server to send other data...
         // send the environment packet
         // TODO: should we turn this into a while loop to better handle sending multiple special packets
-        if (_myServer->hasSpecialPacketToSend(_node) && !nodeData->isShuttingDown()) {
+        if (_myServer->hasSpecialPacketsToSend(_node) && !nodeData->isShuttingDown()) {
             int specialPacketsSent;
-            trueBytesSent += _myServer->sendSpecialPacket(_node, nodeData, specialPacketsSent);
+            trueBytesSent += _myServer->sendSpecialPackets(_node, nodeData, specialPacketsSent);
             nodeData->resetOctreePacket();   // because nodeData's _sequenceNumber has changed
             truePacketsSent += specialPacketsSent;
             packetsSentThisInterval += specialPacketsSent;