diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-07 19:17:24 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-07 19:17:24 +0000 |
| commit | 0f3c362fcd1a692a15b212b4ed81ea3023b0903f (patch) | |
| tree | bcb511d1bd861ff76e4f38f22664b80fc6d9c4f8 | |
| parent | 5273934a7b13dc0a77776f090ba024b244a3c9be (diff) | |
| download | crawl-ref-0f3c362fcd1a692a15b212b4ed81ea3023b0903f.tar.gz crawl-ref-0f3c362fcd1a692a15b212b4ed81ea3023b0903f.zip | |
Merged 2791 (runes don't need ID)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2792 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/itemname.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 69db7d23e9..efb6c64895 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1372,12 +1372,7 @@ std::string item_def::name_aux( description_level_type desc, case OBJ_MISCELLANY: if ( item_typ == MISC_RUNE_OF_ZOT ) - { - buff << rune_type_name(it_plus) << " rune"; - - if (know_type) - buff << " of Zot"; - } + buff << rune_type_name(it_plus) << " rune of Zot"; else { if ( is_deck(*this) ) diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index ba5d23828c..154136651f 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -534,8 +534,13 @@ unsigned long full_ident_mask( const item_def& item ) case OBJ_FOOD: flagset = 0; break; - case OBJ_BOOKS: case OBJ_MISCELLANY: + if ( item.sub_type == MISC_RUNE_OF_ZOT ) + flagset = 0; + else + flagset = ISFLAG_KNOW_TYPE; + break; + case OBJ_BOOKS: case OBJ_ORBS: case OBJ_SCROLLS: case OBJ_POTIONS: |