diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 14:51:33 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 14:51:33 +0000 |
| commit | 3680ca92908368402ea6caf2f9066213e3a816fc (patch) | |
| tree | c6f283cd92e79b5f5188add50c60dc0b9859cca6 /crawl-ref/source/itemname.cc | |
| parent | 827db876a847287ed21a72fe190baf32b588c196 (diff) | |
| download | crawl-ref-3680ca92908368402ea6caf2f9066213e3a816fc.tar.gz crawl-ref-3680ca92908368402ea6caf2f9066213e3a816fc.zip | |
Apply trunk r6474 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6475 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 830fa06757..71f15c9565 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -2555,8 +2555,11 @@ const std::string menu_colour_item_prefix(const item_def &item, bool temp) prefixes.push_back("unidentified"); } - if (god_dislikes_item_handling(item)) + if (good_god_dislikes_item_handling(item) + || god_dislikes_item_handling(item)) + { prefixes.push_back("evil_item"); + } if (is_emergency_item(item)) prefixes.push_back("emergency_item"); |