diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-12-02 05:00:04 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-12-02 05:01:40 +0100 |
| commit | 4e2fb71eca533c6fb14328d467d25ad63b19c429 (patch) | |
| tree | 308483e93918c03bdbf5f0cf10c0571069722cbd /crawl-ref/source/actor.cc | |
| parent | 5ef7575d178b5b033d648ad9bffadef02c357111 (diff) | |
| download | crawl-ref-4e2fb71eca533c6fb14328d467d25ad63b19c429.tar.gz crawl-ref-4e2fb71eca533c6fb14328d467d25ad63b19c429.zip | |
Revert "The Slimy Ring of Jiyva"
It broke save compat, and has some other issues, like using a fake ring type
that causes problems with tiles and creating the item in wizmode.
This reverts commit 5ab011e9deb7a9e8b6d522446911319bdea28658.
This reverts commit 2b49d2d24af5cf060a8476369b60fc6d3bbd6fe7.
Diffstat (limited to 'crawl-ref/source/actor.cc')
| -rw-r--r-- | crawl-ref/source/actor.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc index 0f51185028..5803afeb22 100644 --- a/crawl-ref/source/actor.cc +++ b/crawl-ref/source/actor.cc @@ -330,8 +330,7 @@ bool actor::no_cast(bool calc_unid, bool items) const bool actor::rmut_from_item(bool calc_unid) const { - return wearing(EQ_AMULET, AMU_RESIST_MUTATION, calc_unid) - || (!jiyva_is_dead() && wearing(EQ_RINGS, RING_JIYVA)); + return wearing(EQ_AMULET, AMU_RESIST_MUTATION, calc_unid); } bool actor::evokable_berserk(bool calc_unid) const |