From c2c25b5eaa191b0d26aee47359949093367154b9 Mon Sep 17 00:00:00 2001 From: Charles Otto Date: Tue, 6 Oct 2009 22:27:07 -0400 Subject: Implement FR 2872334 'don't auto-target neutrals' by replacing most uses of TARG_ENEMY with TARG_HOSTILE. --- crawl-ref/source/directn.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/directn.cc') 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) { -- cgit v1.2.3-54-g00ecf