From d511ad4a07b0fd898fd296f0069faaf259b580a2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 10 May 2013 17:39:17 -0700 Subject: [PATCH] more type squishes in eve main --- eve/src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eve/src/main.cpp b/eve/src/main.cpp index 7414c8778a..3a686409d2 100644 --- a/eve/src/main.cpp +++ b/eve/src/main.cpp @@ -90,7 +90,7 @@ void *injectAudio(void *args) { return NULL; } -void createAvatarDataForAgent(Agent* gagent) { +void createAvatarDataForAgent(Agent* agent) { if (!agent->getLinkedData()) { agent->setLinkedData(new AvatarData()); } @@ -173,7 +173,7 @@ int main(int argc, const char* argv[]) { if (!::injectAudioThreadRunning) { // enumerate the other agents to decide if one is close enough that eve should talk for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { - AvatarData *avatarData = (AvatarData*) agent->getLinkedData(); + AvatarData* gavatarData = (AvatarData*) agent->getLinkedData(); if (avatarData) { glm::vec3 tempVector = eve.getPosition() - avatarData->getPosition();