diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-11 13:56:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-11 13:56:26 +0300 |
| commit | c5eb5667a14c59eba9590e8f0eff0f58da421046 (patch) | |
| tree | b48f417bc120231e676ad3eaeb8d56ce41c89e2f /src/actions | |
| parent | 8f6f916bb53d15dd2b6a466501e50b32f03d7a9d (diff) | |
| download | manaplus-c5eb5667a14c59eba9590e8f0eff0f58da421046.tar.gz manaplus-c5eb5667a14c59eba9590e8f0eff0f58da421046.tar.bz2 manaplus-c5eb5667a14c59eba9590e8f0eff0f58da421046.tar.xz manaplus-c5eb5667a14c59eba9590e8f0eff0f58da421046.zip | |
Remove "attack" popup menu handler.
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/actions.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 3ee65a396..03944500d 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -561,8 +561,20 @@ impHandler(attack) return false; Being *target = nullptr; - if (!event.args.empty()) - target = actorManager->findNearestByName(event.args); + std::string args = event.args; + if (!args.empty()) + { + if (args[0] != ':') + { + target = actorManager->findNearestByName(args); + } + else + { + target = actorManager->findBeing(atoi(args.substr(1).c_str())); + if (target && target->getType() != ActorType::Monster) + target = nullptr; + } + } if (!target) target = localPlayer->getTarget(); else |