diff options
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/itemprop.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 0a6279347f..11229f3b20 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -1648,15 +1648,15 @@ bool is_blessed( const item_def &item ) return (false); } // end is_blessed() -bool is_blessable( const item_def &item ) +bool is_convertible( const item_def &item ) { return (!is_artefact(item) && (item.base_type == OBJ_WEAPONS && (is_demonic(item) || weapon_skill(item) == SK_LONG_BLADES))); -} // end is_blessable() +} // end is_convertible() -bool normal2good( item_def &item, bool allow_blessed ) +bool convert2good( item_def &item, bool allow_blessed ) { if (item.base_type != OBJ_WEAPONS) return (false); @@ -1728,7 +1728,7 @@ bool normal2good( item_def &item, bool allow_blessed ) item.flags &= ~ISFLAG_RACIAL_MASK; return (true); -} // end normal2good() +} // end convert2good() int weapon_str_weight( const item_def &wpn ) { diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 5be120ab6f..83c4e4ce55 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -669,8 +669,8 @@ int double_wpn_awkward_speed( const item_def &item ); bool is_demonic( const item_def &item ); bool is_blessed( const item_def &item ); -bool is_blessable( const item_def &item ); -bool normal2good( item_def &item, bool allow_blessed = true ); +bool is_convertible( const item_def &item ); +bool convert2good( item_def &item, bool allow_blessed = true ); int get_vorpal_type( const item_def &item ); int get_damage_type( const item_def &item ); diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 0b5d04d61b..e4a0723dee 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -911,7 +911,7 @@ static bool _tso_blessing_holy_wpn(monsters *mon) // Convert demonic weapons into non-demonic weapons. if (is_demonic(wpn)) - normal2good(wpn, false); + convert2good(wpn, false); return true; } @@ -4068,9 +4068,9 @@ static bool _bless_weapon( god_type god, int brand, int colour ) if ( god == GOD_SHINING_ONE ) { - normal2good(you.inv[wpn]); + convert2good(you.inv[wpn]); - if (is_blessable(you.inv[wpn])) + if (is_convertible(you.inv[wpn])) { origin_acquired(you.inv[wpn], GOD_SHINING_ONE); make_item_randart(you.inv[wpn]); @@ -4172,7 +4172,7 @@ static void _altar_prayer() if (wpn != -1 && (get_weapon_brand(you.inv[wpn]) != SPWPN_HOLY_WRATH - || is_blessable(you.inv[wpn]))) + || is_convertible(you.inv[wpn]))) { _bless_weapon(GOD_SHINING_ONE, SPWPN_HOLY_WRATH, YELLOW); } |