summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-13 23:25:44 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-13 23:25:44 +0000
commit70e2038c42f1a232799922bc0c5256d5a36985d1 (patch)
tree58700d8b6b0425e88b2e0bae9f487105d1b2228d /crawl-ref/source/itemprop.cc
parent1e7e6030b8ed808202ece42f73b9bd7aba699ed3 (diff)
downloadcrawl-ref-70e2038c42f1a232799922bc0c5256d5a36985d1.tar.gz
crawl-ref-70e2038c42f1a232799922bc0c5256d5a36985d1.zip
Actually allow elven whips in set_equip_race().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3060 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-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