summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player-act.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-15 09:50:50 -0400
committerNeil Moore <neil@s-z.org>2014-07-15 10:02:03 -0400
commit3be80b4b66ba0cd025360de7a3f20401edf01a09 (patch)
tree18dcb4cf8305828eee30b74328c2ed0770d56e2a /crawl-ref/source/player-act.cc
parente243e68ce9f22afc8da69ceeff5405e4599ed066 (diff)
downloadcrawl-ref-3be80b4b66ba0cd025360de7a3f20401edf01a09.tar.gz
crawl-ref-3be80b4b66ba0cd025360de7a3f20401edf01a09.zip
Allow Felids to wield non-weapons again (#8797)
Diffstat (limited to 'crawl-ref/source/player-act.cc')
-rw-r--r--crawl-ref/source/player-act.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index 1a09a4fa6b..04e6d8a58f 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -433,13 +433,6 @@ bool player::could_wield(const item_def &item, bool ignore_brand,
{
const size_type bsize = body_size(PSIZE_TORSO, ignore_transform);
- if (species == SP_FELID)
- {
- if (!quiet)
- mpr("You can't use weapons.");
- return false;
- }
-
// Only ogres and trolls can wield large rocks (for sandblast).
if (bsize < SIZE_LARGE
&& item.base_type == OBJ_MISSILES && item.sub_type == MI_LARGE_ROCK)
@@ -468,6 +461,12 @@ bool player::could_wield(const item_def &item, bool ignore_brand,
return true;
}
+ else if (species == SP_FELID)
+ {
+ if (!quiet)
+ mpr("You can't use weapons.");
+ return false;
+ }
// Small species wielding large weapons...
if (!is_weapon_wieldable(item, bsize))