summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/itemprop.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index b63061565d..318cfa7207 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -676,7 +676,8 @@ void set_equip_race( item_def &item, unsigned long flags )
switch (item.base_type)
{
case OBJ_WEAPONS:
- if (weapon_skill(item) == SK_MACES_FLAILS
+ if ((weapon_skill(item) == SK_MACES_FLAILS
+ && item.sub_type != WPN_WHIP)
|| weapon_skill(item) == SK_AXES
|| (weapon_skill(item) == SK_POLEARMS
&& item.sub_type != WPN_SPEAR