summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 01030b45f8..df2d9250bf 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -499,6 +499,11 @@ void do_curse_item( item_def &item, bool quiet )
{
amusement *= 2;
}
+ else if (you.equip[EQ_WEAPON] == item.link)
+ {
+ // Redraw the weapon.
+ you.wield_change = true;
+ }
}
xom_is_stimulated(amusement);
}
@@ -514,6 +519,11 @@ void do_curse_item( item_def &item, bool quiet )
void do_uncurse_item( item_def &item )
{
+ if (item.x == -1 && item.y == -1 && you.equip[EQ_WEAPON] == item.link)
+ {
+ // Redraw the weapon.
+ you.wield_change = true;
+ }
item.flags &= (~ISFLAG_CURSED);
}
@@ -1334,10 +1344,6 @@ bool is_enchantable_weapon(const item_def &wpn, bool uncurse)
if (wpn.base_type != OBJ_WEAPONS && wpn.base_type != OBJ_MISSILES)
return (false);
- // only equipped items should be affected
-// if (!item_is_equipped(wpn))
-// return (false);
-
// Artefacts cannot be enchanted (missiles can't be artefacts).
if (wpn.base_type == OBJ_WEAPONS
&& (is_fixed_artefact(wpn)