diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-26 11:27:16 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-26 11:27:16 +0000 |
| commit | 12fa7099be089e42c8e1640eb9ac2c3c6afa97a2 (patch) | |
| tree | b472b93a2035f3911289478d7577716d7492990a /crawl-ref/source/itemname.cc | |
| parent | 32e72edca686ce0f32d70c6418055fe14d5bd248 (diff) | |
| download | crawl-ref-12fa7099be089e42c8e1640eb9ac2c3c6afa97a2.tar.gz crawl-ref-12fa7099be089e42c8e1640eb9ac2c3c6afa97a2.zip | |
Removed hard tabs.
Corrected sling bullet description.
Targeting forward wrap-around was broken, fixed.
Dropped damage bonus for kenku clawed-kick.
Don't show {tried} for equipped items.
Removed Elyvilon's protection from high-damage hits even when not praying.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2207 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 1cc95497dd..accf5cf071 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -181,6 +181,7 @@ std::string item_def::name(description_level_type descrip, buff << auxname; + bool equipped = false; if (descrip == DESC_INVENTORY_EQUIP && this->x == -1 && this->y == -1) { ASSERT( this->link != -1 ); @@ -196,6 +197,7 @@ std::string item_def::name(description_level_type descrip, { buff << " (in hand)"; } + equipped = true; } else if (this->link == you.equip[EQ_CLOAK] || this->link == you.equip[EQ_HELMET] @@ -205,22 +207,26 @@ std::string item_def::name(description_level_type descrip, || this->link == you.equip[EQ_BODY_ARMOUR]) { buff << " (worn)"; + equipped = true; } else if (this->link == you.equip[EQ_LEFT_RING]) { buff << " (left hand)"; + equipped = true; } else if (this->link == you.equip[EQ_RIGHT_RING]) { buff << " (right hand)"; + equipped = true; } else if (this->link == you.equip[EQ_AMULET]) { buff << " (around neck)"; + equipped = true; } } - const bool tried = (!ident && item_type_tried(*this)); + const bool tried = (!ident && !equipped && item_type_tried(*this)); std::string tried_str = ""; if (tried) |