From 507f39a052fa6eaf4b47513431057b9057e62465 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 25 Apr 2013 16:14:38 -0700
Subject: [PATCH] fix readability of agent dereference

---
 domain-server/src/main.cpp         | 4 ++--
 libraries/shared/src/AgentList.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 15f11aa0ae..523a97c25f 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -134,7 +134,7 @@ int main(int argc, const char * argv[])
                         // this is an agent of which there can be multiple, just add them to the packet
                         // don't send avatar agents to other avatars, that will come from avatar mixer
                         if (agentType != AGENT_TYPE_AVATAR || agent->getType() != AGENT_TYPE_AVATAR) {
-                            currentBufferPos = addAgentToBroadcastPacket(currentBufferPos, &*agent);
+                            currentBufferPos = addAgentToBroadcastPacket(currentBufferPos, &(*agent));
                         }
                         
                     } else {
@@ -142,7 +142,7 @@ int main(int argc, const char * argv[])
                         if (newestSoloAgents[agent->getType()] == NULL ||
                             newestSoloAgents[agent->getType()]->getFirstRecvTimeUsecs() < agent->getFirstRecvTimeUsecs()) {
                             // we have to set the newer solo agent to add it to the broadcast later
-                            newestSoloAgents[agent->getType()] = &*agent;
+                            newestSoloAgents[agent->getType()] = &(*agent);
                         }
                     }
                 } else {
diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp
index 908547e9ba..823aaa9e60 100644
--- a/libraries/shared/src/AgentList.cpp
+++ b/libraries/shared/src/AgentList.cpp
@@ -173,7 +173,7 @@ int AgentList::updateAgentWithData(Agent *agent, unsigned char *packetData, int
 Agent* AgentList::agentWithAddress(sockaddr *senderAddress) {
     for(AgentList::iterator agent = begin(); agent != end(); agent++) {
         if (agent->getActiveSocket() != NULL && socketMatch(agent->getActiveSocket(), senderAddress)) {
-            return &*agent;
+            return &(*agent);
         }
     }
     
@@ -183,7 +183,7 @@ Agent* AgentList::agentWithAddress(sockaddr *senderAddress) {
 Agent* AgentList::agentWithID(uint16_t agentID) {
     for(AgentList::iterator agent = begin(); agent != end(); agent++) {
         if (agent->getAgentId() == agentID) {
-            return &*agent;
+            return &(*agent);
         }
     }
 
@@ -317,7 +317,7 @@ Agent* AgentList::soloAgentOfType(char agentType) {
     if (memchr(SOLO_AGENT_TYPES, agentType, sizeof(SOLO_AGENT_TYPES)) != NULL) {
         for(AgentList::iterator agent = begin(); agent != end(); agent++) {
             if (agent->getType() == agentType) {
-                return &*agent;
+                return &(*agent);
             }
         }
     }