summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.h
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-17 19:51:48 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-17 19:51:48 +0000
commitc79074eb5aec50fd5b854f10d4377b4e988a696f (patch)
tree51d106e8f678b70de4a292d2e71bd443a2d999f9 /crawl-ref/source/itemprop.h
parent0297f504cb6467826e35d3c2a86d93d3964058f2 (diff)
downloadcrawl-ref-c79074eb5aec50fd5b854f10d4377b4e988a696f.tar.gz
crawl-ref-c79074eb5aec50fd5b854f10d4377b4e988a696f.zip
Make all the checks for throwable items consistent.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7465 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemprop.h')
-rw-r--r--crawl-ref/source/itemprop.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index d17a48510d..d60c62c201 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -683,15 +683,15 @@ skill_type range_skill( const item_def &item );
skill_type range_skill( object_class_type wclass, int wtype );
// launcher and ammo functions:
-bool is_range_weapon( const item_def &item );
-bool is_range_weapon_type( weapon_type wtype );
-missile_type fires_ammo_type( const item_def &item );
-missile_type fires_ammo_type( weapon_type wtype );
-const char * ammo_name( const item_def &bow );
-const char * ammo_name( missile_type mtyp );
-bool has_launcher( const item_def &ammo );
-bool is_throwable( const item_def &wpn,
- size_type bodysize = SIZE_MEDIUM );
+bool is_range_weapon(const item_def &item);
+bool is_range_weapon_type(weapon_type wtype);
+missile_type fires_ammo_type(const item_def &item);
+missile_type fires_ammo_type(weapon_type wtype);
+const char *ammo_name(missile_type ammo);
+const char *ammo_name(const item_def &bow);
+bool has_launcher(const item_def &ammo);
+bool is_throwable(const item_def &wpn, size_type bodysize = SIZE_MEDIUM,
+ bool force = false);
launch_retval is_launched(actor *actor, const item_def *launcher,
const item_def &missile);