From adc96cc9f4247ceafc5fde66055456494861b139 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Dec 2017 21:45:33 +0300 Subject: Remove default parameters from actormanager.cpp --- src/progs/manaplus/actions/actions.cpp | 12 ++++++++---- src/progs/manaplus/actions/commands.cpp | 6 ++++-- src/progs/manaplus/actions/pets.cpp | 3 ++- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src/progs/manaplus/actions') 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); } } -- cgit v1.2.3-60-g2f50