diff options
author | Fedja Beader <fedja@protonmail.ch> | 2025-03-22 01:51:48 +0100 |
---|---|---|
committer | Fedja Beader <fedja@protonmail.ch> | 2025-03-22 01:57:37 +0100 |
commit | 7cad2fb4bbde1b82e1f31c01c0bebb205a35689f (patch) | |
tree | 8d84efa5c3c10e5b8bbc939e82d6ab8da0b8d609 | |
parent | b1bfba89e00f68632536c9e71f93976c889e689b (diff) | |
download | manaplus-7cad2fb4bbde1b82e1f31c01c0bebb205a35689f.tar.gz manaplus-7cad2fb4bbde1b82e1f31c01c0bebb205a35689f.tar.bz2 manaplus-7cad2fb4bbde1b82e1f31c01c0bebb205a35689f.tar.xz manaplus-7cad2fb4bbde1b82e1f31c01c0bebb205a35689f.zip |
findNearestLivingBeing: remove redundant branch
as without filtering, priority and closestPriority are always the same
-rw-r--r-- | src/actormanager.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 62d438c67..737a864a7 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -1360,23 +1360,13 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing, //logger->log("being prio:%3d, dist^2:%3d, name: '%s'", // priority, distSq, being->getName().c_str()); - if (!filtered) + // without filtering, priority and closestPriority are always the same + if ((priority == closestPriority && distSq < closestDistSq) || + (priority < closestPriority && distSq <= maxDistSq)) { - if (distSq < closestDistSq) - { - closestDistSq = distSq; - closestBeing = being; - } - } - else - { - if ((priority < closestPriority && distSq <= maxDistSq) || - (priority == closestPriority && distSq < closestDistSq)) - { - closestDistSq = distSq; - closestBeing = being; - closestPriority = priority; - } + closestDistSq = distSq; + closestBeing = being; + closestPriority = priority; } } return closestBeing; |