diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-12 00:49:59 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-12 00:49:59 +0000 |
commit | b522b828e63baba3e1136df6030ec22239764b07 (patch) | |
tree | 59d189134175df908f60a36303c9d02da350c14d /crawl-ref/source/items.cc | |
parent | 5ae26dde5e4e334ae902e23eb6791a9ef537f11e (diff) | |
download | crawl-ref-b522b828e63baba3e1136df6030ec22239764b07.tar.gz crawl-ref-b522b828e63baba3e1136df6030ec22239764b07.zip |
Use _autopickup_item_name() when determing whether to auto-inscribe an
item.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5740 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
-rw-r--r-- | crawl-ref/source/items.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index ff35d4dab1..d9c9f5a89a 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -86,6 +86,8 @@ static void _autoinscribe_item( item_def& item ); static void _autoinscribe_floor_items(); static void _autoinscribe_inventory(); +static inline std::string _autopickup_item_name(const item_def &item); + static bool will_autopickup = false; static bool will_autoinscribe = false; @@ -2120,12 +2122,12 @@ void drop(void) static void _autoinscribe_item( item_def& item ) { - std::string iname = item.name(DESC_INVENTORY); - /* if there's an inscription already, do nothing */ if ( item.inscription.size() > 0 ) return; + std::string iname = _autopickup_item_name(item); + for ( unsigned i = 0; i < Options.autoinscriptions.size(); ++i ) { if ( Options.autoinscriptions[i].first.matches(iname) ) |