From 3433c5c4145cd6786244532d9e089a6573e17fdd Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 8 Sep 2017 15:01:36 -0700 Subject: [PATCH] remove redundant boolean logic --- .../src/entities/EntityTreeSendThread.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp index 817df55625..59a47f44aa 100644 --- a/assignment-client/src/entities/EntityTreeSendThread.cpp +++ b/assignment-client/src/entities/EntityTreeSendThread.cpp @@ -308,8 +308,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree return; } auto knownTimestamp = _knownState.find(entity.get()); - if (knownTimestamp == _knownState.end() || - (knownTimestamp != _knownState.end() && entity->getLastEdited() > knownTimestamp->second)) { + if (knownTimestamp == _knownState.end() || entity->getLastEdited() > knownTimestamp->second) { bool success = false; AACube cube = entity->getQueryAACube(success); if (success) { @@ -345,8 +344,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree return; } auto knownTimestamp = _knownState.find(entity.get()); - if (knownTimestamp == _knownState.end() || - (knownTimestamp != _knownState.end() && entity->getLastEdited() > knownTimestamp->second)) { + if (knownTimestamp == _knownState.end() || entity->getLastEdited() > knownTimestamp->second) { _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY)); _entitiesInQueue.insert(entity.get()); } @@ -368,8 +366,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree return; } auto knownTimestamp = _knownState.find(entity.get()); - if (knownTimestamp == _knownState.end() || - (knownTimestamp != _knownState.end() && entity->getLastEdited() > knownTimestamp->second)) { + if (knownTimestamp == _knownState.end() || entity->getLastEdited() > knownTimestamp->second) { bool success = false; AACube cube = entity->getQueryAACube(success); if (success) { @@ -519,4 +516,4 @@ void EntityTreeSendThread::editingEntityPointer(const EntityItemPointer entity) void EntityTreeSendThread::deletingEntityPointer(EntityItem* entity) { _knownState.erase(entity); -} \ No newline at end of file +}