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

1 files changed, 3 insertions, 4 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 5d07fb3786..b14caada0a 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -678,7 +678,7 @@ bool lose_stat(unsigned char which_stat, unsigned char stat_loss,
     if (cause == NULL || invalid_monster(cause))
         return lose_stat(which_stat, stat_loss, force, NULL, true);
 
-    bool        vis  = mons_near(cause) && player_monster_visible(cause);
+    bool        vis  = you.can_see(cause);
     std::string name = cause->name(DESC_NOCAP_A, true);
 
     if (cause->has_ench(ENCH_SHAPESHIFTER))
@@ -2078,9 +2078,8 @@ void yell(bool force)
         std::string previous;
         if (!(you.prev_targ == MHITNOT || you.prev_targ == MHITYOU))
         {
-            monsters *target = &menv[you.prev_targ];
-            if (target->alive() && mons_near(target)
-                && player_monster_visible(target))
+            const monsters *target = &menv[you.prev_targ];
+            if (target->alive() && you.can_see(target))
             {
                 previous = "   p - Attack previous target.";
                 targ_prev = true;