summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-gear.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-09 22:10:48 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-09 22:10:48 -0700
commit6992e545427e99a664a641ae3d48539829889b6a (patch)
tree19a8d74e9228824832b1abf55961a2c193309501 /crawl-ref/source/mon-gear.cc
parentb938532f5e844c74ce70ae9282c10cf00cbb8666 (diff)
downloadcrawl-ref-6992e545427e99a664a641ae3d48539829889b6a.tar.gz
crawl-ref-6992e545427e99a664a641ae3d48539829889b6a.zip
Make cherubs actually spawn with bucklers
If they're using slings. This appears to have been intended, but the code was looking in the wrong slot.
Diffstat (limited to 'crawl-ref/source/mon-gear.cc')
-rw-r--r--crawl-ref/source/mon-gear.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index 79f6316944..7980d94691 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -1811,8 +1811,8 @@ static void _give_shield(monster* mon, int level)
break;
case MONS_CHERUB:
- if (main_weap && main_weap->base_type == OBJ_WEAPONS
- && weapon_skill(*main_weap) == SK_SLINGS)
+ if ((!main_weap || mon->hands_reqd(*main_weap) == HANDS_ONE)
+ && (!alt_weap || mon->hands_reqd(*alt_weap) == HANDS_ONE))
{
// Big shields interfere with ranged combat, at least theme-wise.
make_item_for_monster(mon, OBJ_ARMOUR, ARM_BUCKLER, level, 1);