diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-06 22:05:42 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-06 22:05:42 +0000 |
commit | 52fa41b7a9881c60f8d0c27b206b17da299d2b52 (patch) | |
tree | ff269536e9c6bdc7a7a5e2789d852193ee54fca6 /crawl-ref/source/item_use.cc | |
parent | b4d50875d584b6b65964e57a45f3a9e0a59a465c (diff) | |
download | crawl-ref-52fa41b7a9881c60f8d0c27b206b17da299d2b52.tar.gz crawl-ref-52fa41b7a9881c60f8d0c27b206b17da299d2b52.zip |
Note identification of randarts *after* autoinscribing them and, in the
case of weapons, it suffices if the properties are known - knowing a
weapon's enchantment is not necessary for the ID note.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6787 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d19029aea2..3affd408d9 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -59,6 +59,7 @@ #include "monstuff.h" #include "mstuff2.h" #include "mon-util.h" +#include "notes.h" #include "ouch.h" #include "player.h" #include "quiver.h" @@ -546,14 +547,26 @@ void wield_effects(int item_wield_2, bool showMsgs) // (could be extended to other talking weapons...) const char *old_desc = item.name(DESC_CAP_THE).c_str(); - set_ident_flags( item, ISFLAG_EQ_WEAPON_MASK ); + if (!was_known) + { + if (is_random_artefact(item)) + item.flags |= ISFLAG_NOTED_ID; + set_ident_flags( item, ISFLAG_EQ_WEAPON_MASK ); + } if (is_random_artefact( item )) { i_dam = randart_wpn_property(item, RAP_BRAND); use_randart(item_wield_2); - if (Options.autoinscribe_randarts && !was_known) - add_autoinscription( item, randart_auto_inscription(item)); + if (!was_known) + { + if (Options.autoinscribe_randarts) + add_autoinscription( item, randart_auto_inscription(item)); + + // Make a note of it. + take_note(Note(NOTE_ID_ITEM, 0, 0, item.name(DESC_NOCAP_A).c_str(), + origin_desc(item).c_str())); + } } else { |