diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 14:34:22 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 14:34:22 +0000 |
commit | d6ed0679ee7d39d2bf597cbe92e4aebbcf2d0793 (patch) | |
tree | a5050f5f70f8c37d1eaf57b1182759317da5a08e | |
parent | 5aaa8c17269280c214af54052f39ea65d8efa8b7 (diff) | |
download | crawl-ref-d6ed0679ee7d39d2bf597cbe92e4aebbcf2d0793.tar.gz crawl-ref-d6ed0679ee7d39d2bf597cbe92e4aebbcf2d0793.zip |
trunk->0.4 merge: r6602: [1936687] Show inscriptions for DESC_PLAIN (cbus).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6603 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/itemname.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/output.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 2d02dccdef..daff922b71 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -240,7 +240,7 @@ std::string item_def::name(description_level_type descrip, } } - if (descrip != DESC_PLAIN && descrip != DESC_BASENAME) + if (descrip != DESC_BASENAME) { const bool tried = !ident && !equipped && item_type_tried(*this); std::string tried_str = ""; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 2d5b9a6e97..94ec295c43 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -468,7 +468,7 @@ static void _print_stats_wp(int y) textcolor(prefcol); cprintf("%s", - wpn.name(DESC_INVENTORY, true) + wpn.name(DESC_INVENTORY, true, false, true) .substr(0, crawl_view.hudsz.x - 4).c_str()); textcolor(LIGHTGREY); } |