From 85dfb23fbd766cd86b663261dd03761c5f9cdefe Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 7 May 2013 12:39:35 -0700 Subject: [PATCH] add constant for UNKNOWN_AGENT_ID --- interface/src/main.cpp | 2 +- libraries/shared/src/AgentList.cpp | 2 +- libraries/shared/src/AgentList.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index d27dabecc2..74fccc50c4 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -431,7 +431,7 @@ void updateAvatar(float frametime) { AgentList *agentList = AgentList::getInstance(); - if (agentList->getOwnerID() >= 0) { + if (agentList->getOwnerID() != UNKNOWN_AGENT_ID) { // if I know my ID, send head/hand data to the avatar mixer and voxel server unsigned char broadcastString[200]; unsigned char* endOfBroadcastStringWrite = broadcastString; diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index 213a6a55ab..82a21ae479 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -64,7 +64,7 @@ AgentList::AgentList(char newOwnerType, unsigned int newSocketListenPort) : agentSocket(newSocketListenPort), _ownerType(newOwnerType), socketListenPort(newSocketListenPort), - _ownerID(-1), + _ownerID(UNKNOWN_AGENT_ID), lastAgentId(0) { pthread_mutex_init(&mutex, 0); } diff --git a/libraries/shared/src/AgentList.h b/libraries/shared/src/AgentList.h index f9c9b35341..1956916211 100644 --- a/libraries/shared/src/AgentList.h +++ b/libraries/shared/src/AgentList.h @@ -31,6 +31,8 @@ extern char DOMAIN_HOSTNAME[]; extern char DOMAIN_IP[100]; // IP Address will be re-set by lookup on startup extern const int DOMAINSERVER_PORT; +const int UNKNOWN_AGENT_ID = -1; + class AgentListIterator; class AgentList {