diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-20 14:54:54 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-20 15:00:51 -0400 |
| commit | e4e15622d6dc5ef54af4f73848613013e2393a3b (patch) | |
| tree | bedfd3fda906692ef02d4ec87649e8b73460b591 /crawl-ref/source/player-act.cc | |
| parent | 28522026f31d56de63009c75b19dd5d4752a7a79 (diff) | |
| download | crawl-ref-e4e15622d6dc5ef54af4f73848613013e2393a3b.tar.gz crawl-ref-e4e15622d6dc5ef54af4f73848613013e2393a3b.zip | |
Simplify.
Diffstat (limited to 'crawl-ref/source/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index 04e6d8a58f..bc04ff89cb 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -21,6 +21,7 @@ #include "godconduct.h" #include "goditem.h" #include "hints.h" +#include "itemname.h" #include "itemprop.h" #include "items.h" #include "item_use.h" @@ -445,17 +446,10 @@ bool player::could_wield(const item_def &item, bool ignore_brand, // Most non-weapon objects can be wielded, though there's rarely a point if (!is_weapon(item)) { - if (item.base_type == OBJ_ARMOUR) + if (item.base_type == OBJ_ARMOUR || item.base_type == OBJ_JEWELLERY) { if (!quiet) - mpr("You can't wield armour."); - return false; - } - - if (item.base_type == OBJ_JEWELLERY) - { - if (!quiet) - mpr("You can't wield jewellery."); + mprf("You can't wield %s.", base_type_string(item).c_str()); return false; } |