From 1dee477edbd887705ee489f960b92aa7de9e7afd Mon Sep 17 00:00:00 2001 From: dshaligram Date: Tue, 25 Sep 2007 18:12:02 +0000 Subject: * Fixed Vault:8 level being generated with no rune (cbus). * Dropped odds of statue vault. * Take note of messages received in dgamelaunch chat. * crawl -vscores, etc. should not attempt to create save/morgue directories (Marc). * Changed wording of "Foo wielding bar comes into view" to "Foo comes into view. It is wielding bar.". * Suppress curse status display of monster items. * TSO worshippers are no longer warned when stabbing monsters if TSO doesn't object to stabbing those monsters. * Wand zap status is now {zapped: N} instead of {zapped N times} to reduce verbosity. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2204 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/itemname.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/itemname.cc') diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 79f8a34fe4..1cc95497dd 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -76,6 +76,9 @@ std::string item_def::name(description_level_type descrip, bool quantity_words, unsigned long ignore_flags) const { + if (descrip == DESC_NONE) + return (""); + std::ostringstream buff; const std::string auxname = this->name_aux(descrip, terse, ident, @@ -1205,8 +1208,7 @@ std::string item_def::name_aux( description_level_type desc, else if (item_plus2 == ZAPCOUNT_EMPTY) buff << " {empty}"; else if (item_plus2 > 0) - buff << " {zapped " << item_plus2 - << ((item_plus2 > 1) ? " times" : " time") + buff << " {zapped: " << item_plus2 << '}'; break; -- cgit v1.2.3-54-g00ecf