From fac344b62ebbf48e7b1d2a7b5f0bcdd3608bd4a7 Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 21 Apr 2007 16:18:19 +0000 Subject: Eliminated it_name(), in_name(), item_name(). The function to use is now item_def::name(). Cleaned up a lot of code in the process. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1341 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/stash.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/stash.cc') diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index dcac179e8b..fd0ead410b 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -355,11 +355,12 @@ std::string Stash::stash_item_name(const item_def &item) { char buf[ITEMNAME_SIZE]; + // XXX XXX FIXME why the special-casing? if (item.base_type == OBJ_GOLD) snprintf(buf, sizeof buf, "%d gold piece%s", item.quantity, (item.quantity > 1? "s" : "")); else - item_name(item, DESC_NOCAP_A, buf, false); + return item.name(DESC_NOCAP_A); return buf; } @@ -658,7 +659,7 @@ std::string ShopInfo::shop_item_name(const shop_item &si) const char shopitem[ITEMNAME_SIZE * 2]; std::string itemname = Stash::stash_item_name(si.item); snprintf(shopitem, sizeof shopitem, "%s (%u gold)", - itemname.c_str(), si.price); + itemname.c_str(), si.price); return shopitem; } -- cgit v1.2.3-54-g00ecf