diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-06 17:00:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-06 17:00:00 +0300 |
| commit | 21e0c15d56438f2d7f3e15736c00dd8b8ac6bd1c (patch) | |
| tree | 2e366420e85c18fc4c687cc7ab5d1dd2f46df365 /src/actions | |
| parent | 5b0c6c5c95645813f96ea413b1c14f2ffc18a481 (diff) | |
| download | manaplus-21e0c15d56438f2d7f3e15736c00dd8b8ac6bd1c.tar.gz manaplus-21e0c15d56438f2d7f3e15736c00dd8b8ac6bd1c.tar.bz2 manaplus-21e0c15d56438f2d7f3e15736c00dd8b8ac6bd1c.tar.xz manaplus-21e0c15d56438f2d7f3e15736c00dd8b8ac6bd1c.zip | |
Add strong typed bool type AllowSort.
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/actions.cpp | 10 | ||||
| -rw-r--r-- | src/actions/target.cpp | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index d80949865..d2905a27e 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -196,7 +196,7 @@ static Being *findBeing(const std::string &name) if (!being) { being = actorManager->findNearestLivingBeing( - localPlayer, 1, ActorType::Npc, true); + localPlayer, 1, ActorType::Npc, AllowSort_true); if (being) { if (abs(being->getTileX() - localPlayer->getTileX()) > 1 @@ -209,7 +209,7 @@ static Being *findBeing(const std::string &name) if (!being) { being = actorManager->findNearestLivingBeing( - localPlayer, 1, ActorType::Player, true); + localPlayer, 1, ActorType::Player, AllowSort_true); if (being) { if (abs(being->getTileX() - localPlayer->getTileX()) > 1 @@ -499,7 +499,7 @@ impHandler(heal) if (!target || target->getType() != ActorType::Player) { target = actorManager->findNearestLivingBeing( - localPlayer, 10, ActorType::Player, true); + localPlayer, 10, ActorType::Player, AllowSort_true); } } else @@ -788,7 +788,7 @@ impHandler(targetAttack) { // Only auto target Monsters target = actorManager->findNearestLivingBeing( - localPlayer, 90, ActorType::Monster, true); + localPlayer, 90, ActorType::Monster, AllowSort_true); } localPlayer->attack2(target, newTarget); @@ -803,7 +803,7 @@ impHandler0(attackHuman) return false; Being *const target = actorManager->findNearestLivingBeing( - localPlayer, 10, ActorType::Player, true); + localPlayer, 10, ActorType::Player, AllowSort_true); if (target) { if (localPlayer->checAttackPermissions(target)) diff --git a/src/actions/target.cpp b/src/actions/target.cpp index b4a2c8058..2c18b80f2 100644 --- a/src/actions/target.cpp +++ b/src/actions/target.cpp @@ -33,7 +33,7 @@ namespace Actions { -static bool setTarget(const ActorType::Type type, const bool allowSort) +static bool setTarget(const ActorType::Type type, const AllowSort allowSort) { if (actorManager && localPlayer) { @@ -50,28 +50,28 @@ static bool setTarget(const ActorType::Type type, const bool allowSort) impHandler0(targetPlayer) { - return setTarget(ActorType::Player, true); + return setTarget(ActorType::Player, AllowSort_true); } impHandler0(targetMonster) { - return setTarget(ActorType::Monster, true); + return setTarget(ActorType::Monster, AllowSort_true); } impHandler0(targetClosestMonster) { - return setTarget(ActorType::Monster, false); + return setTarget(ActorType::Monster, AllowSort_false); } impHandler0(targetNPC) { - return setTarget(ActorType::Npc, true); + return setTarget(ActorType::Npc, AllowSort_true); } impHandler0(targetMercenary) { #ifdef EATHENA_SUPPORT - return setTarget(ActorType::Mercenary, true); + return setTarget(ActorType::Mercenary, AllowSort_true); #else return false; #endif @@ -80,7 +80,7 @@ impHandler0(targetMercenary) impHandler0(targetPet) { #ifdef EATHENA_SUPPORT - return setTarget(ActorType::Pet, true); + return setTarget(ActorType::Pet, AllowSort_true); #else return false; #endif |