summaryrefslogtreecommitdiff
path: root/src/progs/manaplus/actions/actions.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/actions/actions.cpp
parent2bd61993e4b8cb190fbbbcf620f4901636404d48 (diff)
downloadplus-58c319a56a70588b59868099c659f70209a60be1.tar.gz
plus-58c319a56a70588b59868099c659f70209a60be1.tar.bz2
plus-58c319a56a70588b59868099c659f70209a60be1.tar.xz
plus-58c319a56a70588b59868099c659f70209a60be1.zip
Remove default parameters from localplayer.
Diffstat (limited to 'src/progs/manaplus/actions/actions.cpp')
-rw-r--r--src/progs/manaplus/actions/actions.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index d71ba50a5..67eefc568 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -672,7 +672,7 @@ impHandler(pickup)
const std::string args = event.args;
if (args.empty())
{
- localPlayer->pickUpItems();
+ localPlayer->pickUpItems(0);
}
else
{
@@ -837,7 +837,7 @@ impHandler0(stopAttack)
{
if (localPlayer != nullptr)
{
- localPlayer->stopAttack();
+ localPlayer->stopAttack(false);
// not consume if target attack key pressed
if (inputManager.isActionActive(InputAction::TARGET_ATTACK))
return false;
@@ -885,7 +885,7 @@ impHandler(attack)
else
localPlayer->setTarget(target);
if (target != nullptr)
- localPlayer->attack(target, true);
+ localPlayer->attack(target, true, false);
return true;
}
@@ -925,7 +925,7 @@ impHandler(targetAttack)
localPlayer, 90, ActorType::Monster, AllowSort_true);
}
- localPlayer->attack2(target, newTarget);
+ localPlayer->attack2(target, newTarget, false);
return true;
}
return false;
@@ -940,7 +940,7 @@ impHandler0(attackHuman)
if (target != nullptr)
{
localPlayer->setTarget(target);
- localPlayer->attack2(target, true);
+ localPlayer->attack2(target, true, false);
}
return true;
}
@@ -956,7 +956,7 @@ impHandler0(stopSit)
{
if (localPlayer != nullptr)
{
- localPlayer->stopAttack();
+ localPlayer->stopAttack(false);
// not consume if target attack key pressed
if (inputManager.isActionActive(InputAction::TARGET_ATTACK))
return false;