Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map.

1 files changed, 27 insertions, 0 deletions

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index f35a305d..daceca5e 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -188,3 +188,30 @@ Being* BeingManager::findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
 
     return (maxdist >= dist) ? closestBeing : NULL;
 }
+
+Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
+                                            Being::Type type)
+{
+    Being *closestBeing = NULL;
+    int dist = 0;
+    int x = aroundBeing->mX;
+    int y = aroundBeing->mY;
+
+    for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++)
+    {
+        Being *being = (*i);
+        int d = abs(being->mX - x) + abs(being->mY - y);
+
+        if ((being->getType() == type || type == Being::UNKNOWN)
+                && (d < dist || closestBeing == NULL)   // it is closer
+                && being->mAction != Being::DEAD        // no dead beings
+                && being != aroundBeing
+           )
+        {
+            dist = d;
+            closestBeing = being;
+        }
+    }
+
+    return (maxdist >= dist) ? closestBeing : NULL;
+}