summaryrefslogtreecommitdiff
path: root/src/actormanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-18 19:47:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-18 19:47:28 +0300
commit7da95c7f4da447876458a0b1a17736b9a2865844 (patch)
tree4b6ac0ab5bc32a11234a5363de95d0cfec8cb7d5 /src/actormanager.cpp
parent515ce6c1413b5e3da131f3e4997abdc39c003a2c (diff)
downloadmv-7da95c7f4da447876458a0b1a17736b9a2865844.tar.gz
mv-7da95c7f4da447876458a0b1a17736b9a2865844.tar.bz2
mv-7da95c7f4da447876458a0b1a17736b9a2865844.tar.xz
mv-7da95c7f4da447876458a0b1a17736b9a2865844.zip
Move inputaction into separate file.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r--src/actormanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 0ffed88be..518a65553 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -317,7 +317,7 @@ Being *ActorManager::findBeingByPixel(const int x, const int y,
return nullptr;
const bool targetDead = mTargetDeadPlayers;
- const bool modActive = inputManager.isActionActive(Input::KEY_STOP_ATTACK);
+ const bool modActive = inputManager.isActionActive(InputAction::STOP_ATTACK);
if (mExtMouseTargeting)
{
@@ -427,7 +427,7 @@ void ActorManager::findBeingsByPixel(std::vector<ActorSprite*> &beings,
const int xtol = mapTileSize / 2;
const int uptol = mapTileSize;
- const bool modActive = inputManager.isActionActive(Input::KEY_STOP_ATTACK);
+ const bool modActive = inputManager.isActionActive(InputAction::STOP_ATTACK);
for_actors
{
@@ -875,7 +875,7 @@ Being *ActorManager::findNearestLivingBeing(const Being *const aroundBeing,
const bool filtered = config.getBoolValue("enableAttackFilter")
&& type == ActorType::MONSTER;
- const bool modActive = inputManager.isActionActive(Input::KEY_STOP_ATTACK);
+ const bool modActive = inputManager.isActionActive(InputAction::STOP_ATTACK);
bool ignoreDefault = false;
if (filtered)