summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-11 00:08:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-11 00:08:59 +0300
commit12433d426970de3d7785a5b77908f74ed5fd7093 (patch)
treea15c2b692f1b95c8e2f01bfe1e3e18d796c78bd4 /src/actions
parenta640418f26f4fd38fe55671120dd643f30d52273 (diff)
downloadmv-12433d426970de3d7785a5b77908f74ed5fd7093.tar.gz
mv-12433d426970de3d7785a5b77908f74ed5fd7093.tar.bz2
mv-12433d426970de3d7785a5b77908f74ed5fd7093.tar.xz
mv-12433d426970de3d7785a5b77908f74ed5fd7093.zip
Fix "remove monster from attack" list.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/commands.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 95be13364..bb43e2a9d 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -581,8 +581,8 @@ impHandler(wait)
impHandler(addPriorityAttack)
{
- if (!actorManager
- || actorManager->isInPriorityAttackList(event.args))
+ if (!actorManager ||
+ actorManager->isInPriorityAttackList(event.args))
{
return false;
}
@@ -610,9 +610,9 @@ impHandler(addAttack)
impHandler(removeAttack)
{
- if (!actorManager || event.args.empty() || (
- !actorManager->isInIgnoreAttackList(event.args) &&
- !actorManager->isInPriorityAttackList(event.args)))
+ if (!actorManager ||
+ event.args.empty() ||
+ !actorManager->isInAttackList(event.args))
{
return false;
}