diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 22:06:28 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 22:06:28 +0000 |
| commit | d6118194ace99a16d1a55cb7a93416892c45e713 (patch) | |
| tree | bc40b3e6be183b7d4a398f69392ca7a1709cb5bd /crawl-ref/source/transfor.cc | |
| parent | b89715ca53db848f394801e8f6a95dff45a56fc9 (diff) | |
| download | crawl-ref-d6118194ace99a16d1a55cb7a93416892c45e713.tar.gz crawl-ref-d6118194ace99a16d1a55cb7a93416892c45e713.zip | |
Backport melding fixes (shields and uncursing) and allow to cast spells
on slot 'I'.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10672 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/transfor.cc')
| -rw-r--r-- | crawl-ref/source/transfor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 799df4f74b..bfd4ef0403 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -65,7 +65,7 @@ bool transform_allows_wearing_item(const item_def& item, { // It's not jewellery, and it's worn, so it must be armour. const equipment_type eqslot = get_armour_slot(item); - const bool is_soft_helmet = is_helmet(item) && !is_hard_helmet(item); + const bool is_soft_helmet = is_helmet(item) && !is_hard_helmet(item); switch (transform) { @@ -143,7 +143,7 @@ static void _unwear_equipment_slot(equipment_type eqslot) if (eqslot == EQ_WEAPON) { - unwield_item(); + unwield_item(!you.duration[DUR_BERSERKER]); canned_msg(MSG_EMPTY_HANDED); you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = slot + 1; } |