summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.h
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-10 21:08:23 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-10 22:57:26 -0700
commit7eaa6eb283b06be6c1441215e634d4566c99257f (patch)
tree9ceafbfda2bc978f9fcacedb536a0cd1d8e2fc22 /crawl-ref/source/itemprop.h
parent1cf06be6ea1471d9273a24fb7f95bde6938b7d3c (diff)
downloadcrawl-ref-7eaa6eb283b06be6c1441215e634d4566c99257f.tar.gz
crawl-ref-7eaa6eb283b06be6c1441215e634d4566c99257f.zip
Refactor
Make is_range_weapon and is_ranged_weapon_type use the same code.
Diffstat (limited to 'crawl-ref/source/itemprop.h')
-rw-r--r--crawl-ref/source/itemprop.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index e3620ceda5..9a4e8a5d26 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -91,6 +91,7 @@ bool is_blessed_weapon_type(int wpn_type) IMMUTABLE;
bool is_demonic_weapon_type(int wpn_type) IMMUTABLE;
bool is_magic_weapon_type(int wpn_type) IMMUTABLE;
+bool is_melee_weapon(const item_def &weapon) PURE;
bool is_demonic(const item_def &item) PURE;
bool is_blessed(const item_def &item) PURE;
bool is_blessed_convertible(const item_def &item) PURE;
@@ -123,7 +124,7 @@ bool is_throwable(const actor *actor, const item_def &wpn,
bool force = false) PURE;
launch_retval is_launched(const actor *actor, const item_def *launcher,
const item_def &missile) PURE;
-bool is_melee_weapon(const item_def &weapon) PURE;
+
reach_type weapon_reach(const item_def &item) PURE;