summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-05-13 17:37:46 -0400
committerNeil Moore <neil@s-z.org>2014-05-13 17:37:46 -0400
commit9f3982ee91dd7a12f0e20ce477a39a9259ed11b7 (patch)
tree555dfbb9d5a7fcb7867079d055a1b486bb9d0806 /crawl-ref/source/itemprop.cc
parentc7a9a94001011f1fa806e52e84a566c7554d57e9 (diff)
downloadcrawl-ref-9f3982ee91dd7a12f0e20ce477a39a9259ed11b7.tar.gz
crawl-ref-9f3982ee91dd7a12f0e20ce477a39a9259ed11b7.zip
Allow enchanting/recharging/(un)cursing melded equipment (#6841)
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 148444689d..2493f02bd7 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -498,10 +498,6 @@ bool curse_an_item(bool ignore_holy_wrath)
if (you.inv[i].cursed())
continue;
- // Melded items cannot be cursed.
- if (item_is_melded(you.inv[i]))
- continue;
-
if (ignore_holy_wrath && you.inv[i].base_type == OBJ_WEAPONS
&& get_weapon_brand(you.inv[i]) == SPWPN_HOLY_WRATH)
{
@@ -1074,9 +1070,6 @@ bool item_is_rechargeable(const item_def &it, bool hide_charged)
}
else if (it.base_type == OBJ_RODS)
{
- if (item_is_melded(it))
- return false;
-
if (!hide_charged)
return true;
@@ -1162,10 +1155,6 @@ bool is_enchantable_armour(const item_def &arm, bool uncurse, bool unknown)
if (arm.base_type != OBJ_ARMOUR)
return false;
- // Melded armour cannot be enchanted.
- if (item_is_melded(arm))
- return false;
-
// If we don't know the plusses, assume enchanting is possible.
if (unknown && !is_known_artefact(arm)
&& !item_ident(arm, ISFLAG_KNOW_PLUSES))