diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-17 22:08:45 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-17 22:08:45 +0000 |
commit | 90070fb4dde5f9865f61631e8f632b256d718f99 (patch) | |
tree | 63332b4f0cc42cd6de499e308029111e9afb032e /crawl-ref/source/items.cc | |
parent | 720441b258f72f676ff59aca61ec2392cb629d07 (diff) | |
download | crawl-ref-90070fb4dde5f9865f61631e8f632b256d718f99.tar.gz crawl-ref-90070fb4dde5f9865f61631e8f632b256d718f99.zip |
Clear special and inscription in fulsome-distillation created objects.
Made ident_mask return unsigned long as it should, rather than int.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1480 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
-rw-r--r-- | crawl-ref/source/items.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 0e1df7ed03..be498dfb6d 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1289,16 +1289,13 @@ bool is_stackable_item( const item_def &item ) return (false); } -int ident_flags(const item_def &item) +unsigned long ident_flags(const item_def &item) { - const int identmask = full_ident_mask(item); - int flags = item.flags & identmask; + const unsigned long identmask = full_ident_mask(item); + unsigned long flags = item.flags & identmask; - if (identmask && (identmask & ISFLAG_KNOW_TYPE) - && !(flags & ISFLAG_KNOW_TYPE) && item_type_known(item)) - { + if ((identmask & ISFLAG_KNOW_TYPE) && item_type_known(item)) flags |= ISFLAG_KNOW_TYPE; - } return (flags); } |