diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-22 19:58:17 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-22 19:58:17 +0000 |
| commit | 016ca20bd263814990ae867cdbc2ca9282e1df10 (patch) | |
| tree | b30772579ed949767b6cb73865b308009ce6a790 /crawl-ref/source/itemprop.cc | |
| parent | 8b989e877550fcc89c79e06905a2128537a852f0 (diff) | |
| download | crawl-ref-016ca20bd263814990ae867cdbc2ca9282e1df10.tar.gz crawl-ref-016ca20bd263814990ae867cdbc2ca9282e1df10.zip | |
Clean up blessed blade handling a bit.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4484 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 8ef02ed116..adf95714fe 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -676,7 +676,7 @@ void set_equip_race( item_def &item, unsigned long flags ) || item.sub_type == WPN_DEMON_BLADE || item.sub_type == WPN_DEMON_WHIP || item.sub_type == WPN_DEMON_TRIDENT - || is_blessed(item)) + || is_blessed_blade(item)) { return; } @@ -1634,7 +1634,7 @@ bool is_demonic( const item_def &item ) return (false); } // end is_demonic() -bool is_blessed( const item_def &item ) +bool is_blessed_blade( const item_def &item ) { if (item.base_type == OBJ_WEAPONS) { @@ -1656,7 +1656,7 @@ bool is_blessed( const item_def &item ) } return (false); -} // end is_blessed() +} // end is_blessed_blade() bool is_convertible( const item_def &item ) { @@ -1734,7 +1734,7 @@ bool convert2good( item_def &item, bool allow_blessed ) break; } - if (is_blessed(item)) + if (is_blessed_blade(item)) item.flags &= ~ISFLAG_RACIAL_MASK; return (true); @@ -1940,7 +1940,7 @@ bool check_weapon_shape( const item_def &item, bool quiet, bool check_id ) if ((!check_id || item_type_known( item )) && ((item.base_type == OBJ_WEAPONS - && is_blessed(item)) + && is_blessed_blade(item)) || brand == SPWPN_HOLY_WRATH) && (you.is_undead || you.species == SP_DEMONSPAWN)) { |