remove added debugging in avatar-mixer, light refactoring

This commit is contained in:
Stephen Birarda 2013-04-29 12:38:46 -07:00
parent b7189ef263
commit 1ceda66ab8

View file

@ -79,21 +79,15 @@ int main(int argc, const char* argv[])
case PACKET_HEADER_HEAD_DATA: case PACKET_HEADER_HEAD_DATA:
// this is positional data from an agent // this is positional data from an agent
agentList->updateAgentWithData(agentAddress, packetData, receivedBytes); agentList->updateAgentWithData(agentAddress, packetData, receivedBytes);
agentAddressIn = (sockaddr_in*) agentAddress;
printf("Received agent data from agent at %s:%d\n", inet_ntoa(agentAddressIn->sin_addr), ntohs(agentAddressIn->sin_port));
currentBufferPosition = broadcastPacket + 1; currentBufferPosition = broadcastPacket + 1;
agentIndex = 0; agentIndex = 0;
// send back a packet with other active agent data to this agent // send back a packet with other active agent data to this agent
for (AgentList::iterator avatarAgent = agentList->begin(); for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
avatarAgent != agentList->end(); if (agent->getLinkedData() != NULL
avatarAgent++) { && !socketMatch(agentAddress, agent->getActiveSocket())) {
if (avatarAgent->getLinkedData() != NULL currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*agent);
&& !socketMatch(agentAddress, avatarAgent->getActiveSocket())) {
currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*avatarAgent);
} else {
printf("Not adding agent with ID %d to packet\n", avatarAgent->getAgentId());
} }
agentIndex++; agentIndex++;