summaryrefslogtreecommitdiff
path: root/src/progs/manaplus/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-17 19:51:59 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-17 19:51:59 +0300
commit58c319a56a70588b59868099c659f70209a60be1 (patch)
tree8f964df390f54834bf3a6b4b9d2eeeec66d1b3f8 /src/progs/manaplus/gui/viewport.cpp
parent2bd61993e4b8cb190fbbbcf620f4901636404d48 (diff)
downloadmv-58c319a56a70588b59868099c659f70209a60be1.tar.gz
mv-58c319a56a70588b59868099c659f70209a60be1.tar.bz2
mv-58c319a56a70588b59868099c659f70209a60be1.tar.xz
mv-58c319a56a70588b59868099c659f70209a60be1.zip
Remove default parameters from localplayer.
Diffstat (limited to 'src/progs/manaplus/gui/viewport.cpp')
-rw-r--r--src/progs/manaplus/gui/viewport.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/progs/manaplus/gui/viewport.cpp b/src/progs/manaplus/gui/viewport.cpp
index de7571c7c..2ae57f170 100644
--- a/src/progs/manaplus/gui/viewport.cpp
+++ b/src/progs/manaplus/gui/viewport.cpp
@@ -467,7 +467,8 @@ bool Viewport::leftMouseAction()
case ActorType::SkillUnit:
if (!stopAttack)
{
- if (localPlayer->withinAttackRange(mHoverBeing) ||
+ if (localPlayer->withinAttackRange(mHoverBeing,
+ false, 0) ||
inputManager.isActionActive(InputAction::ATTACK))
{
validateSpeed();
@@ -475,7 +476,8 @@ bool Viewport::leftMouseAction()
{
localPlayer->attack(mHoverBeing,
!inputManager.isActionActive(
- InputAction::STOP_ATTACK));
+ InputAction::STOP_ATTACK),
+ false);
return true;
}
}
@@ -531,7 +533,7 @@ bool Viewport::leftMouseAction()
localPlayer->canMove())
{
validateSpeed();
- localPlayer->stopAttack();
+ localPlayer->stopAttack(false);
localPlayer->cancelFollow();
mPlayerFollowMouse = mAllowMoveByMouse;
if (mPlayerFollowMouse)