summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index b213683e5d..66ce66797d 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1155,14 +1155,16 @@ bool acquirement(object_class_type class_wanted, int agent)
continue;
const item_def &doodad(mitm[thing_created]);
- if (doodad.base_type == OBJ_WEAPONS
- && !can_wield(&doodad, false, true))
+ if ((doodad.base_type == OBJ_WEAPONS
+ && !can_wield(&doodad, false, true))
+ || (doodad.base_type == OBJ_ARMOUR
+ && !can_wear_armour(doodad, false, true)))
{
destroy_item(thing_created);
thing_created = NON_ITEM;
continue;
}
-
+
// MT - Check: god-gifted weapons and armor shouldn't kill you.
// Except Xom.
if ((agent == GOD_TROG || agent == GOD_OKAWARU)