diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-29 11:47:50 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-29 11:47:50 +0000 |
| commit | 2931994db5281c12610cf08647175863622f5f78 (patch) | |
| tree | ee9e9c54850943e88aa90604b78a26a62d77bb7f /crawl-ref/source/stash.cc | |
| parent | 141b28bcbc8ffbf643010ff2071d96ea824d90e1 (diff) | |
| download | crawl-ref-2931994db5281c12610cf08647175863622f5f78.tar.gz crawl-ref-2931994db5281c12610cf08647175863622f5f78.zip | |
Removed dud verbose_dump and detailed_stat_dump options, and dead code in
shopping.cc (Haran).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1395 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/stash.cc')
| -rw-r--r-- | crawl-ref/source/stash.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 4a90487dff..f38d646473 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -481,11 +481,11 @@ bool Stash::matches_search(const std::string &prefix, continue; } - if (is_dumpable_artifact(item, Options.verbose_dump)) + if (is_dumpable_artifact(item, false)) { - std::string desc = munge_description(get_item_description(item, - Options.verbose_dump, - true )); + std::string desc = + munge_description(get_item_description(item, false, true)); + if (search.matches(desc)) { if (!res.count++) @@ -542,11 +542,11 @@ void Stash::write(std::ostream &os, << (!verified && (items.size() > 1 || i)? " (still there?)" : "") << std::endl; - if (is_dumpable_artifact(item, Options.verbose_dump)) + if (is_dumpable_artifact(item, false)) { - std::string desc = munge_description(get_item_description(item, - Options.verbose_dump, - true )); + std::string desc = + munge_description(get_item_description(item, false, true)); + // Kill leading and trailing whitespace desc.erase(desc.find_last_not_of(" \n\t") + 1); desc.erase(0, desc.find_first_not_of(" \n\t")); @@ -664,11 +664,9 @@ std::string ShopInfo::shop_item_desc(const shop_item &si) const if (shoptype_identifies_stock(this->shoptype)) const_cast<shop_item&>(si).item.flags |= ISFLAG_IDENT_MASK; - if (is_dumpable_artifact(si.item, Options.verbose_dump)) + if (is_dumpable_artifact(si.item, false)) { - desc = munge_description(get_item_description(si.item, - Options.verbose_dump, - true)); + desc = munge_description(get_item_description(si.item, false, true)); trim_string(desc); // Walk backwards and prepend indenting spaces to \n characters |