summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.h
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-12 15:26:53 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-13 00:33:57 -0700
commitfed8404d299063c153073816a5ed77a85c9c008c (patch)
tree71cb50c8ef1fea2881be777ffb2c44d95c5cb6a8 /crawl-ref/source/itemprop.h
parent533b47cd6b7ff87f5d17d41a5d414cb9f8f3a6f2 (diff)
downloadcrawl-ref-fed8404d299063c153073816a5ed77a85c9c008c.tar.gz
crawl-ref-fed8404d299063c153073816a5ed77a85c9c008c.zip
Refactor item handedness code
Instead of specifying HANDS_ONE or HANDS_TWO in Weapon_prop[] (which were... misleading at best), there's now a min_2h_size and min_1h_size field. The former controls the minimum size a player or monster must be to wield the weapon at all; the latter is the minimum size required to wield it with one hand. This means that giants can now wield daggers (unlike before); if necessary, a max_size field can be added, but this seems a low priority to preserve. This breaks formatting of Weapon_prop[] a bit; apologies.
Diffstat (limited to 'crawl-ref/source/itemprop.h')
-rw-r--r--crawl-ref/source/itemprop.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 272397917a..1a29f3f305 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -78,9 +78,7 @@ void ident_reflector(item_def *item);
int weapon_rarity(int w_type) IMMUTABLE;
int cmp_weapon_size(const item_def &item, size_type size) PURE;
-bool check_weapon_wieldable_size(const item_def &item, size_type size) PURE;
-
-size_type weapon_size(const item_def &item) PURE;
+bool is_weapon_wieldable(const item_def &item, size_type size) PURE;
hands_reqd_type basic_hands_reqd(const item_def &item, size_type size) PURE;
hands_reqd_type hands_reqd(const actor* ac, object_class_type base_type, int sub_type);