summaryrefslogtreecommitdiff
path: root/src/progs/manaplus
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-17 21:45:33 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-17 21:45:33 +0300
commitadc96cc9f4247ceafc5fde66055456494861b139 (patch)
treede2b3d96297bce39f7e487ba135116c5f2aaaf3e /src/progs/manaplus
parentdc6de526dbdf0145fa3ac0a65d485f40b1722199 (diff)
downloadmv-adc96cc9f4247ceafc5fde66055456494861b139.tar.gz
mv-adc96cc9f4247ceafc5fde66055456494861b139.tar.bz2
mv-adc96cc9f4247ceafc5fde66055456494861b139.tar.xz
mv-adc96cc9f4247ceafc5fde66055456494861b139.zip
Remove default parameters from actormanager.cpp
Diffstat (limited to 'src/progs/manaplus')
-rw-r--r--src/progs/manaplus/actions/actions.cpp12
-rw-r--r--src/progs/manaplus/actions/commands.cpp6
-rw-r--r--src/progs/manaplus/actions/pets.cpp3
3 files changed, 14 insertions, 7 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 67eefc568..1a3543aba 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -867,7 +867,8 @@ impHandler(attack)
{
if (args[0] != ':')
{
- target = actorManager->findNearestByName(args);
+ target = actorManager->findNearestByName(args,
+ ActorType::Unknown);
}
else
{
@@ -902,7 +903,8 @@ impHandler(targetAttack)
{
if (args[0] != ':')
{
- target = actorManager->findNearestByName(args);
+ target = actorManager->findNearestByName(args,
+ ActorType::Unknown);
}
else
{
@@ -1244,7 +1246,8 @@ impHandler(undress)
}
else
{
- target = actorManager->findNearestByName(args);
+ target = actorManager->findNearestByName(args,
+ ActorType::Unknown);
}
}
@@ -1824,7 +1827,8 @@ impHandler(kick)
{
if (args[0] != ':')
{
- target = actorManager->findNearestByName(args);
+ target = actorManager->findNearestByName(args,
+ ActorType::Unknown);
}
else
{
diff --git a/src/progs/manaplus/actions/commands.cpp b/src/progs/manaplus/actions/commands.cpp
index 985a17a5f..54b8c28bd 100644
--- a/src/progs/manaplus/actions/commands.cpp
+++ b/src/progs/manaplus/actions/commands.cpp
@@ -380,7 +380,8 @@ impHandler(setTarget)
if ((actorManager == nullptr) || (localPlayer == nullptr))
return false;
- Being *const target = actorManager->findNearestByName(event.args);
+ Being *const target = actorManager->findNearestByName(event.args,
+ ActorType::Unknown);
if (target != nullptr)
localPlayer->setTarget(target);
return true;
@@ -500,7 +501,8 @@ impHandler(navigateTo)
if (args.empty())
return true;
- Being *const being = actorManager->findBeingByName(args);
+ Being *const being = actorManager->findBeingByName(args,
+ ActorType::Unknown);
if (being != nullptr)
{
localPlayer->navigateTo(being->getTileX(), being->getTileY());
diff --git a/src/progs/manaplus/actions/pets.cpp b/src/progs/manaplus/actions/pets.cpp
index 25c5f1411..6d0992398 100644
--- a/src/progs/manaplus/actions/pets.cpp
+++ b/src/progs/manaplus/actions/pets.cpp
@@ -131,7 +131,8 @@ impHandler(catchPet)
}
else
{
- target = actorManager->findNearestByName(args);
+ target = actorManager->findNearestByName(args,
+ ActorType::Unknown);
}
}