diff options
-rw-r--r-- | src/actormanager.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 674239da0..62d438c67 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -1370,22 +1370,11 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, } else { - if (closestBeing != nullptr) + if ((priority < closestPriority && distSq <= maxDistSq) || + (priority == closestPriority && distSq < closestDistSq)) { - if ((priority < closestPriority && distSq <= maxDistSq) || - (priority == closestPriority && distSq < closestDistSq)) - { - closestBeing = being; - closestDistSq = distSq; - closestPriority = priority; - continue; - } - } - - if (closestBeing == nullptr && distSq <= maxDistSq) - { - closestBeing = being; closestDistSq = distSq; + closestBeing = being; closestPriority = priority; } } |