diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 21:20:59 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 21:20:59 +0000 |
commit | 72d421a98654a1d73704397dfd9a4be3177289d0 (patch) | |
tree | 5a0428dd04f392344d89aa99ee4247413d384de3 /crawl-ref/source/spells3.cc | |
parent | 280d409759be7af8b54366f07ccba17348ea24f9 (diff) | |
download | crawl-ref-72d421a98654a1d73704397dfd9a4be3177289d0.tar.gz crawl-ref-72d421a98654a1d73704397dfd9a4be3177289d0.zip |
A bug fix commit! (I didn't do one of these in a while...)
* 2856912: being turned into a pig while berserk complaining about being
"too berserk" when unequipping the weapon
* 2849963: shields working even when melded
* 2845355: melded equipment not being affected by remove curse
* 2836148: disallow toggle_with_I if you've got a spell on 'I'
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10671 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r-- | crawl-ref/source/spells3.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index e9ad01d96a..b35a98ec37 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -134,8 +134,8 @@ bool remove_curse(bool suppress_msg) // What of artefact rings and amulets? {dlb}: for (int i = EQ_WEAPON + 1; i < NUM_EQUIP; i++) { - if (you.equip[i] != -1 && item_cursed(you.inv[you.equip[i]]) - && you_tran_can_wear(you.equip[i])) + // Melded equipment can also get uncursed this way. + if (you.equip[i] != -1 && item_cursed(you.inv[you.equip[i]])) { do_uncurse_item(you.inv[you.equip[i]]); success = true; |