diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 20:43:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 20:43:17 +0000 |
| commit | dc0f066ad0fa14a48e652914b9a27e626f5eded1 (patch) | |
| tree | 83173474fa7ecc57c9c6bb974445cb47d5d341e0 /crawl-ref/source/itemname.cc | |
| parent | d976570ee5fbcc53481d76b2d55d389908968bd5 (diff) | |
| download | crawl-ref-dc0f066ad0fa14a48e652914b9a27e626f5eded1.tar.gz crawl-ref-dc0f066ad0fa14a48e652914b9a27e626f5eded1.zip | |
Apply commits r6564 and r6567 to 0.4 trunk.
Also start on changes.stone_soup for 0.4.1. The mapmark.lua fixes are
not actually in 0.4 trunk, are they?
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6568 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 71f15c9565..a8f79190b3 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -2178,7 +2178,7 @@ bool is_interesting_item( const item_def& item ) } const std::string iname = menu_colour_item_prefix(item, false) - + item.name(DESC_PLAIN); + + item.name(DESC_PLAIN); for (unsigned i = 0; i < Options.note_items.size(); ++i) if (Options.note_items[i].matches(iname)) return (true); @@ -2437,6 +2437,10 @@ bool is_useless_item(const item_def &item, bool temp) if (!item_type_known(item)) return (false); + // A bad item is always useless. + if (is_bad_item(item, temp)) + return (true); + switch (item.sub_type) { case POT_BERSERK_RAGE: |