From 89da132bf254718367bdacbabbf1f36fe8b908bd Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 25 Apr 2013 15:26:21 -0700
Subject: [PATCH] update voxel-server to use new AgentList iterator

---
 voxel-server/src/main.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index 572963b94e..91e91d81a7 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -122,12 +122,12 @@ void eraseVoxelTreeAndCleanupAgentVisitData() {
 	::randomTree.eraseAllVoxels();
 
 	// enumerate the agents clean up their marker nodes
-	for (int i = 0; i < AgentList::getInstance()->getAgents().size(); i++) {
+    
+	for (AgentList::iterator agent = AgentList::getInstance()->begin(); agent != AgentList::getInstance()->end(); agent++) {
 
 		//printf("eraseVoxelTreeAndCleanupAgentVisitData() agent[%d]\n",i);
         
-		Agent *thisAgent = (Agent *)&AgentList::getInstance()->getAgents()[i];
-		VoxelAgentData *agentData = (VoxelAgentData *)(thisAgent->getLinkedData());
+		VoxelAgentData *agentData = (VoxelAgentData *)(*agent).getLinkedData();
 
 		// clean up the agent visit data
 		delete agentData->rootMarkerNode;
@@ -154,10 +154,8 @@ void *distributeVoxelsToListeners(void *args) {
         gettimeofday(&lastSendTime, NULL);
         
         // enumerate the agents to send 3 packets to each
-        for (int i = 0; i < agentList->getAgents().size(); i++) {
-
-            Agent *thisAgent = (Agent *)&agentList->getAgents()[i];
-            VoxelAgentData *agentData = (VoxelAgentData *)(thisAgent->getLinkedData());
+        for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
+            VoxelAgentData *agentData = (VoxelAgentData *)(*agent).getLinkedData();
             
             ViewFrustum viewFrustum;
             // get position and orientation details from the camera
@@ -193,7 +191,7 @@ void *distributeVoxelsToListeners(void *args) {
                                                            ::viewFrustumCulling,
                                                            stopOctal);
                 
-                agentList->getAgentSocket().send(thisAgent->getActiveSocket(), voxelPacket, voxelPacketEnd - voxelPacket);
+                agentList->getAgentSocket().send((*agent).getActiveSocket(), voxelPacket, voxelPacketEnd - voxelPacket);
                 
                 packetCount++;
                 totalBytesSent += voxelPacketEnd - voxelPacket;