From 9be92cebdd4638dc267db30bb26cb5ee19ea001e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 7 May 2013 13:41:48 -0700 Subject: [PATCH] revert type squish, spacing, code review comment --- eve/src/main.cpp | 4 ++-- interface/src/main.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eve/src/main.cpp b/eve/src/main.cpp index b72d1194a4..08200c6606 100644 --- a/eve/src/main.cpp +++ b/eve/src/main.cpp @@ -143,10 +143,10 @@ int main(int argc, const char* argv[]) { gettimeofday(&thisSend, NULL); // find the current avatar mixer - Agent *avatarMixer = agentList->soloAgentOfType(AGENT_TYPE_AVATAR_MIXER); + Agent* avatarMixer = agentList->soloAgentOfType(AGENT_TYPE_AVATAR_MIXER); // make sure we actually have an avatar mixer with an active socket - if (agentList->getOwnerID() != UNKNOWN_AGENT_ID && avatarMixer != NULL && avatarMixer->getActiveSocket() != NULL) { + if (agentList->getOwnerID() != UNKNOWN_AGENT_ID && avatarMixer && avatarMixer->getActiveSocket() != NULL) { unsigned char* packetPosition = broadcastPacket + sizeof(PACKET_HEADER); packetPosition += packAgentId(packetPosition, agentList->getOwnerID()); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 756a1481c5..fad68d9c13 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -429,7 +429,7 @@ void updateAvatar(float frametime) { myAvatar.setCameraNearClip(::viewFrustum.getNearClip()); myAvatar.setCameraFarClip(::viewFrustum.getFarClip()); - AgentList *agentList = AgentList::getInstance(); + AgentList* agentList = AgentList::getInstance(); if (agentList->getOwnerID() != UNKNOWN_AGENT_ID) { // if I know my ID, send head/hand data to the avatar mixer and voxel server @@ -451,9 +451,9 @@ void updateAvatar(float frametime) { glm::vec3 avatarPos = myAvatar.getPosition(); // For some reason, we don't want to flip X and Z here. - ::paintingVoxel.x = avatarPos.x/10.0; - ::paintingVoxel.y = avatarPos.y/10.0; - ::paintingVoxel.z = avatarPos.z/10.0; + ::paintingVoxel.x = avatarPos.x / 10.0; + ::paintingVoxel.y = avatarPos.y / 10.0; + ::paintingVoxel.z = avatarPos.z / 10.0; unsigned char* bufferOut; int sizeOut;