summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-20 22:26:00 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-20 22:26:00 +0300
commitc4a9748e841fd8620e7e9d230aad8964f424bb08 (patch)
treedeeeac5217f0d73e5c5176399685ee74bea36460
parent2ac58b6b39b155a9033677f225fe5c56b63cb6b1 (diff)
downloadmv-c4a9748e841fd8620e7e9d230aad8964f424bb08.tar.gz
mv-c4a9748e841fd8620e7e9d230aad8964f424bb08.tar.bz2
mv-c4a9748e841fd8620e7e9d230aad8964f424bb08.tar.xz
mv-c4a9748e841fd8620e7e9d230aad8964f424bb08.zip
Add function for selecting new target.
-rw-r--r--src/actions/target.cpp12
-rw-r--r--src/being/localplayer.cpp16
-rw-r--r--src/being/localplayer.h4
3 files changed, 22 insertions, 10 deletions
diff --git a/src/actions/target.cpp b/src/actions/target.cpp
index f5bf636d4..a0615143c 100644
--- a/src/actions/target.cpp
+++ b/src/actions/target.cpp
@@ -35,16 +35,8 @@ namespace Actions
static bool setTarget(const ActorTypeT type, const AllowSort allowSort)
{
- if (actorManager && localPlayer)
- {
- Being *const target = actorManager->findNearestLivingBeing(
- localPlayer, 20, type, allowSort);
-
- if (target && target != localPlayer->getTarget())
- localPlayer->setTarget(target);
-
- return true;
- }
+ if (localPlayer)
+ return localPlayer->setNewTarget(type, allowSort) != nullptr;
return false;
}
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 6722d5a4b..cde59bd7a 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -554,6 +554,22 @@ void LocalPlayer::setTarget(Being *const target)
target->setShowName(true);
}
+Being *LocalPlayer::setNewTarget(const ActorTypeT type,
+ const AllowSort allowSort)
+{
+ if (actorManager)
+ {
+ Being *const target = actorManager->findNearestLivingBeing(
+ localPlayer, 20, type, allowSort);
+
+ if (target && target != mTarget)
+ localPlayer->setTarget(target);
+
+ return target;
+ }
+ return nullptr;
+}
+
void LocalPlayer::setDestination(const int x, const int y)
{
mActivityTime = cur_time;
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index c258a14f1..e47ad4d20 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -27,6 +27,7 @@
#include "enums/being/pickup.h"
+#include "enums/simpletypes/allowsort.h"
#include "enums/simpletypes/keep.h"
#include "listeners/actorspritelistener.h"
@@ -132,6 +133,9 @@ class LocalPlayer final : public Being,
*/
void setTarget(Being *const target);
+ Being *setNewTarget(const ActorTypeT type,
+ const AllowSort allowSort);
+
/**
* Sets a new destination for this being to walk to.
*/