diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 22:50:05 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-25 22:50:05 +0000 |
| commit | b791456793c967f1c484f0e3b726aadde102fc8a (patch) | |
| tree | 8ebbf1eff3334decd91a238c11cf6a268ea3249b /crawl-ref/source/itemprop.cc | |
| parent | 048093d6df17f7a9d57c3de999f8d2b71289bc19 (diff) | |
| download | crawl-ref-b791456793c967f1c484f0e3b726aadde102fc8a.tar.gz crawl-ref-b791456793c967f1c484f0e3b726aadde102fc8a.zip | |
Replace "is_random_artefact()" with "is_artefact()" in a few places where
this was missed, and add checks for unrandart and special unrandarts where
applicable.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10044 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 6694a063f5..265d4053e8 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -906,7 +906,7 @@ int get_weapon_brand( const item_def &item ) int get_ammo_brand( const item_def &item ) { // No artefact arrows yet. -- bwr - if (item.base_type != OBJ_MISSILES || is_random_artefact( item )) + if (item.base_type != OBJ_MISSILES || is_artefact( item )) return (SPMSL_NORMAL); return (item.special); @@ -915,11 +915,8 @@ int get_ammo_brand( const item_def &item ) special_armour_type get_armour_ego_type( const item_def &item ) { // Artefact armours have no ego type, must look up powers separately. - if (item.base_type != OBJ_ARMOUR - || (is_random_artefact( item ) && !is_unrandom_artefact( item ))) - { + if (item.base_type != OBJ_ARMOUR || is_artefact( item )) return (SPARM_NORMAL); - } return (static_cast<special_armour_type>(item.special)); } @@ -2447,7 +2444,7 @@ bool gives_ability(const item_def &item) return (false); } - if (!is_random_artefact(item)) + if (!is_artefact(item)) return (false); // Check for evokable randart properties. @@ -2511,7 +2508,7 @@ bool gives_resistance(const item_def &item) return (false); } - if (!is_random_artefact(item)) + if (!is_artefact(item)) return (false); // Check for randart resistances. |