From a7d74c33016eccbeba9b258ac352fbca3f642ae6 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 15 Dec 2007 04:09:03 +0000 Subject: Add a few item database fixes. Rename "gloves" and "boots" to "pair of gloves" and "pair of boots", respectively, so that they can be found in the database (the latter fixes [1850497]). Also, in item_def::name_aux(), disable the racial prefix for ammunition when looking it up, so that racial ammunition can be found in the database. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3064 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/dat/descript/items.txt | 4 ++-- crawl-ref/source/itemname.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index ed346f9a10..bbf17ad8a0 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -314,7 +314,7 @@ book of wizardry A book of magic spells. Beware, for some of the more powerful grimoires are not to be toyed with. %%%% -boots +pair of boots A pair of boots. %%%% @@ -540,7 +540,7 @@ glaive A pole with a large, heavy blade on one end. %%%% -gloves +pair of gloves A pair of gloves. %%%% diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 71b217f2c3..c03793dd2b 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1099,7 +1099,7 @@ std::string item_def::name_aux( description_level_type desc, buff << ' '; } - if (!basename) + if (!basename && !dbname) buff << racial_description_string(*this, terse); buff << ammo_name(static_cast(item_typ)); -- cgit v1.2.3-54-g00ecf