diff options
| author | Neil Moore <neil@s-z.org> | 2013-06-19 16:11:44 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-06-19 16:41:17 -0400 |
| commit | 2c01c8d8359cf0953e57bfdde2c0fe9d57d35d34 (patch) | |
| tree | 1c63a10a18d7ec9f703bddf3d620e834da355d79 /crawl-ref/source/fight.h | |
| parent | 51996ca5c75be2e509ed5a0bc5af261fabf25153 (diff) | |
| download | crawl-ref-2c01c8d8359cf0953e57bfdde2c0fe9d57d35d34.tar.gz crawl-ref-2c01c8d8359cf0953e57bfdde2c0fe9d57d35d34.zip | |
Simplify is_melee_weapon and move it out of fight.cc
Also, make it take a reference rather than a pointer (like
is_{,ranged_}weapon) and use it in the berserk check.
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 6c026e95f3..3eb0736966 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -32,7 +32,6 @@ bool fight_melee(actor *attacker, actor *defender, bool *did_hit = NULL, int resist_adjust_damage(actor *defender, beam_type flavour, int res, int rawdamage, bool ranged = false); -bool is_melee_weapon(const item_def *weapon); bool wielded_weapon_check(item_def *weapon, bool no_message = false); int calc_heavy_armour_penalty(bool random_factor); |