summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-19 22:00:39 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-19 22:00:39 +0000
commitb4c0033f33bfcd8e997ad150fef6b814bdae6088 (patch)
tree3fefa3bff63f2b103c213daa375136a488a106e1 /crawl-ref/source/fight.cc
parent667af8ad078d21df13d6d8ad69530704576c56d2 (diff)
downloadcrawl-ref-b4c0033f33bfcd8e997ad150fef6b814bdae6088.tar.gz
crawl-ref-b4c0033f33bfcd8e997ad150fef6b814bdae6088.zip
Improve the "Really attack..." prompts a bit.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5141 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 3d4f466d64..a63a8af7a1 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -617,11 +617,12 @@ bool melee_attack::attack()
|| (is_good_god(you.religion) && (isNeutral || isHoly))
|| (you.religion == GOD_SHINING_ONE && isUnchivalric))
{
- snprintf(info, INFO_SIZE, "Really attack this %s%s creature?",
+ snprintf(info, INFO_SIZE, "Really attack this %s%s%s creature?",
+ (isUnchivalric) ? "helpless "
+ : "",
(isFriendly) ? "friendly " :
(wontAttack) ? "non-hostile " :
- (isNeutral) ? "neutral " :
- (isUnchivalric) ? "helpless "
+ (isNeutral) ? "neutral "
: "",
(isHoly) ? "holy"
: "");