diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-06 21:39:43 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-06 21:39:43 -0500 |
| commit | 7c9d4c11c419ace878ebff027be1bf7e9be02191 (patch) | |
| tree | b2ca929456fc6e084379fbef6b1ee707de8e1c4f /crawl-ref/source/directn.cc | |
| parent | ef846648c543c81f44db094ca3a2dba95a8a0070 (diff) | |
| parent | c2c25b5eaa191b0d26aee47359949093367154b9 (diff) | |
| download | crawl-ref-7c9d4c11c419ace878ebff027be1bf7e9be02191.tar.gz crawl-ref-7c9d4c11c419ace878ebff027be1bf7e9be02191.zip | |
Merge branch 'master' of ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
Diffstat (limited to 'crawl-ref/source/directn.cc')
| -rw-r--r-- | crawl-ref/source/directn.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 56258157f2..ed71bbebb1 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -419,7 +419,9 @@ static void _direction_again(dist& moves, targetting_type restricts, moves.target = you.pos(); // Discard 'Y' player gave to yesno() - if (mode == TARG_ENEMY) + // Changed this, was that necessary? -cao + //if (mode == TARG_ENEMY) + if (mode == TARG_ENEMY || mode == TARG_HOSTILE) getchm(); } else @@ -932,7 +934,8 @@ bool _dist_ok(const dist& moves, int range, targ_mode_type mode, return (false); } - if (!may_target_self && mode == TARG_ENEMY) + if (!may_target_self && (mode == TARG_ENEMY + || mode == TARG_HOSTILE)) { if (Options.allow_self_target == CONFIRM_CANCEL) { |