summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2025-03-22 00:08:48 +0100
committerFedja Beader <fedja@protonmail.ch>2025-03-22 00:09:48 +0100
commit6722d5773bb9cb71bec870b214b4f34bbe6d0b08 (patch)
treec65c671d39b1e87709d6a8c4ee480290ca34cb9b
parent93b70efd79bb92735c7e97c9389000ced374c3d3 (diff)
downloadmanaplus-6722d5773bb9cb71bec870b214b4f34bbe6d0b08.tar.gz
manaplus-6722d5773bb9cb71bec870b214b4f34bbe6d0b08.tar.bz2
manaplus-6722d5773bb9cb71bec870b214b4f34bbe6d0b08.tar.xz
manaplus-6722d5773bb9cb71bec870b214b4f34bbe6d0b08.zip
Cleanup findNearestLivingBeing: rename index -> closestPriority
-rw-r--r--src/actormanager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 4324bf5d7..d30ddbc3a 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -1288,9 +1288,9 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing,
return *i;
}
- int index = defaultPriorityIndex;
Being *closestBeing = nullptr;
int closestDistSq = maxDistSq + 1;
+ int closestPriority = defaultPriorityIndex;
FOR_EACH (ActorSprites::iterator, i, mActors)
{
@@ -1371,12 +1371,12 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing,
if (it2 != priorityMobsMap.end())
w2 = (*it2).second;
- if ((w2 < index && distSq <= maxDistSq) ||
- (w2 == index && distSq < closestDistSq))
+ if ((w2 < closestPriority && distSq <= maxDistSq) ||
+ (w2 == closestPriority && distSq < closestDistSq))
{
closestBeing = being;
closestDistSq = distSq;
- index = w2;
+ closestPriority = w2;
continue;
}
}
@@ -1388,9 +1388,9 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing,
const StringIntMapCIter it1 = priorityMobsMap.find(
being->getName());
if (it1 != priorityMobsMap.end())
- index = (*it1).second;
+ closestPriority = it1->second;
else
- index = defaultPriorityIndex;
+ closestPriority = defaultPriorityIndex;
}
}
}