From bf946a85fe99dda39802fd242474264101ddd14f Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 21 Feb 2009 23:16:42 +0000 Subject: For 2089989, reallow friendlies to walk into your damaging clouds in some cases, regardless of god. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9145 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/directn.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/directn.cc') diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 6eaa8913ac..f3eed0efec 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -943,7 +943,7 @@ void direction(dist& moves, targeting_type restricts, if (you.prev_targ != MHITNOT && you.prev_targ != MHITYOU) { const monsters *montarget = &menv[you.prev_targ]; - if (mons_near(montarget) && player_monster_visible(montarget) + if (you.can_see(montarget) && !mons_friendly(montarget) // not made friendly since then && _is_target_in_range(montarget->pos(), range)) { @@ -1235,8 +1235,7 @@ void direction(dist& moves, targeting_type restricts, { const monsters *montarget = &menv[you.prev_targ]; - if (!mons_near(montarget) - || !player_monster_visible( montarget )) + if (!you.can_see(montarget)) { mpr("You can't see that creature any more.", MSGCH_EXAMINE_FILTER); -- cgit v1.2.3-54-g00ecf