summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-24 19:44:19 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-24 19:44:19 +0000
commit74e2141a845bc9aaa3caa08b9e0de1562173b557 (patch)
treec4d52d2d6b825b25a806c5412cce8f3728e49e2d /crawl-ref/source/beam.cc
parent211669d0be534d180b4ea90983e06e569ca5578e (diff)
downloadcrawl-ref-74e2141a845bc9aaa3caa08b9e0de1562173b557.tar.gz
crawl-ref-74e2141a845bc9aaa3caa08b9e0de1562173b557.zip
Revert previous change, as it's in the wrong place.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5219 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 28796c4792..d851158db9 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%s?",
+ snprintf(info, INFO_SIZE, "Really fire %s the %s%s%s%s?",
(target ? "at" : "through"),
(isUnchivalric) ? "helpless "
: "",
@@ -4207,10 +4207,7 @@ static bool _stop_unchivalric_attack(monsters *mon, bool target)
: "",
(isHoly) ? "holy "
: "",
- mon->name(DESC_PLAIN).c_str(),
- (is_sanctuary(you.x_pos, you.y_pos)
- || is_sanctuary(mon->x, mon->y)) ?
- ", despite your sanctuary" : "");
+ mon->name(DESC_PLAIN).c_str());
if (!yesno(info, true, 'n'))
return (true);