Account for sanctuaries in the "Really fire through..." prompt.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5217 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 2 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index d851158db9..28796c4792 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4197,7 +4197,7 @@ static bool _stop_unchivalric_attack(monsters *mon, bool target)
     {
         // "Really fire through the helpless neutral holy Daeva?"
         // was: "Really fire through this helpless neutral holy creature?"
-        snprintf(info, INFO_SIZE, "Really fire %s the %s%s%s%s?",
+        snprintf(info, INFO_SIZE, "Really fire %s the %s%s%s%s%s?",
                  (target ? "at" : "through"),
                  (isUnchivalric) ? "helpless "
                                  : "",
@@ -4207,7 +4207,10 @@ static bool _stop_unchivalric_attack(monsters *mon, bool target)
                                  : "",
                  (isHoly)        ? "holy "
                                  : "",
-                 mon->name(DESC_PLAIN).c_str());
+                 mon->name(DESC_PLAIN).c_str(),
+                 (is_sanctuary(you.x_pos, you.y_pos)
+                     || is_sanctuary(mon->x, mon->y)) ?
+                         ", despite your sanctuary" : "");
 
         if (!yesno(info, true, 'n'))
             return (true);