summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/directn.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-02 14:39:19 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-02 14:39:19 +0000
commite37ab8471fcc8761a0d4a4954918ec4c679ed1bb (patch)
tree014e77a542007c8a29084bcaa4252a0e9c0fad3e /crawl-ref/source/directn.cc
parent6a8469f3af9fff8fd6670be7bab4b7652ef3f957 (diff)
downloadcrawl-ref-e37ab8471fcc8761a0d4a4954918ec4c679ed1bb.tar.gz
crawl-ref-e37ab8471fcc8761a0d4a4954918ec4c679ed1bb.zip
Only apply targeting via monster list to spells and such where
targeting monsters is actually needed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6338 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/directn.cc')
-rw-r--r--crawl-ref/source/directn.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index e85c5a4163..02fd4582fc 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -471,7 +471,8 @@ static void _fill_monster_list(bool full_info)
void direction(dist& moves, targeting_type restricts,
targ_mode_type mode, int range, bool just_looking,
- bool needs_path, const char *prompt, targeting_behaviour *beh)
+ bool needs_path, bool may_target_monster, const char *prompt,
+ targeting_behaviour *beh)
{
static targeting_behaviour stock_behaviour;
if (!beh)
@@ -480,7 +481,8 @@ void direction(dist& moves, targeting_type restricts,
beh->just_looking = just_looking;
#ifndef USE_TILE
- if (!just_looking && Options.mlist_targetting == MLIST_TARGET_HIDDEN)
+ if (!just_looking && may_target_monster && restricts != DIR_DIR
+ && Options.mlist_targetting == MLIST_TARGET_HIDDEN)
{
Options.mlist_targetting = MLIST_TARGET_ON;
bool full_info = update_monster_pane();