summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/describe.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-11 08:23:06 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-11 08:23:06 -0600
commit6b84e07db1d30804c767f125f4da4e760e9ef7d1 (patch)
tree2f1716c30589124bd503da190b16a2a2ed5596f4 /crawl-ref/source/describe.cc
parent5148e63355ac8fbc5ea8732f2e4a56a347d59c96 (diff)
downloadcrawl-ref-6b84e07db1d30804c767f125f4da4e760e9ef7d1.tar.gz
crawl-ref-6b84e07db1d30804c767f125f4da4e760e9ef7d1.zip
Fix good_god_hates_item_handling() to handle the unholy/evil split.
Diffstat (limited to 'crawl-ref/source/describe.cc')
-rw-r--r--crawl-ref/source/describe.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 933bd6886d..4a536275f7 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1992,10 +1992,17 @@ std::string get_item_description( const item_def &item, bool verbose,
}
}
- if (good_god_hates_item_handling(item))
+ if (conduct_type ct = good_god_hates_item_handling(item))
{
description << "$$" << god_name(you.religion) << " opposes the use of "
- << "such an evil item.";
+ << "such an ";
+
+ if (ct == DID_NECROMANCY)
+ description << "evil";
+ else
+ description << "unholy";
+
+ description << " item.";
}
else if (god_hates_item_handling(item))
{