[crawl-ref-commits] master branch updated: 0.12-a0-1992-g537d1ec

[<gi...@cr...>]

       via  537d1ec97e5a62b119127ff51c985817a0dd39af (commit)
      from  09a8698a5382f93bc4bf85a547b4a3731a2194dc (commit)

-----------------------------------------------------------------------
commit 537d1ec97e5a62b119127ff51c985817a0dd39af
Author: Steve Melenchuk <sme...@gm...>
Date:   Wed Jan 30 13:47:16 2013 -0700

    Don't print out-of-LOS messages for shielded monsters triggering traps.
    
    "A <projectile> shoots out and hits someone's shield" would previously
    print if a monster somewhere on the level triggered a trap and blocked
    the projectile with their shield, regardless of if the monster was in
    LOS or not.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/traps.cc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 13e6647..f232384 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -1526,7 +1526,9 @@ void trap_def::shoot_ammo(actor& act, bool was_known)
                  act.name(DESC_THE).c_str());
         }
     }
-    else if (!force_hit && pro_block >= con_block)
+    else if (!force_hit
+             && pro_block >= con_block
+             && you.see_cell(act.pos()))
     {
         string owner;
         if (act.is_player())


-- 
Dungeon Crawl Stone Soup