From c6167f689348e2812da4e3388699cb4db043ff25 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 16 Mar 2015 14:35:17 +0100 Subject: [PATCH] CR --- libraries/entities/src/EntityScriptingInterface.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index f87ea2cd29..2585b5d33e 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -204,8 +204,7 @@ EntityItemID EntityScriptingInterface::findClosestEntity(const glm::vec3& center const EntityItem* closestEntity = _entityTree->findClosestEntity(center, radius); _entityTree->unlock(); if (closestEntity) { - result.id = closestEntity->getID(); - result.isKnownID = true; + result = closestEntity->getEntityItemID(); } } return result; @@ -229,8 +228,7 @@ QVector EntityScriptingInterface::findEntities(const glm::vec3& ce _entityTree->unlock(); foreach (const EntityItem* entity, entities) { - EntityItemID thisEntityItemID(entity->getID(), UNKNOWN_ENTITY_TOKEN, true); - result << thisEntityItemID; + result << entity->getEntityItemID(); } } return result; @@ -246,8 +244,7 @@ QVector EntityScriptingInterface::findEntitiesInBox(const glm::vec _entityTree->unlock(); foreach (const EntityItem* entity, entities) { - EntityItemID thisEntityItemID(entity->getID(), UNKNOWN_ENTITY_TOKEN, true); - result << thisEntityItemID; + result << entity->getEntityItemID(); } } return result;