summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2025-03-22 00:08:48 +0100
committerFedja Beader <fedja@protonmail.ch>2025-04-06 01:44:21 +0200
commitb90596f89d5c3566f748f577d5bb97b5d6a5a519 (patch)
treee8c8b9f910278a8db82f7bfe7ef7e0ab7059ceac
parent2125df248d60f0ce3f0f3d43239131beb3a2f3d6 (diff)
downloadmanaplus-b90596f89d5c3566f748f577d5bb97b5d6a5a519.tar.gz
manaplus-b90596f89d5c3566f748f577d5bb97b5d6a5a519.tar.bz2
manaplus-b90596f89d5c3566f748f577d5bb97b5d6a5a519.tar.xz
manaplus-b90596f89d5c3566f748f577d5bb97b5d6a5a519.zip
findNearestLivingBeing: rename index -> closestPriority
**** mana/plus!145
-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;
}
}
}