diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-09 17:32:55 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-09 17:32:55 -0400 |
| commit | b423ccbb123f8d000cef4cac9a14d957839ecdb9 (patch) | |
| tree | fd04309410c3781d0e4572d936af18b0df6e20cf /crawl-ref/source/melee_attack.cc | |
| parent | 73a505eef1cf84386b15891ee12e59fc21665f7f (diff) | |
| download | crawl-ref-b423ccbb123f8d000cef4cac9a14d957839ecdb9.tar.gz crawl-ref-b423ccbb123f8d000cef4cac9a14d957839ecdb9.zip | |
Simplify (tswett)
Diffstat (limited to 'crawl-ref/source/melee_attack.cc')
| -rw-r--r-- | crawl-ref/source/melee_attack.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index 24c718a58f..95c596508d 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -3942,10 +3942,7 @@ int melee_attack::calc_your_to_hit_unarmed(int uattack, bool vampiric) bool melee_attack::using_weapon() { - return weapon && ((weapon->base_type == OBJ_WEAPONS - && !is_range_weapon(*weapon)) - || weapon->base_type == OBJ_RODS - || weapon->base_type == OBJ_STAVES); + return weapon && is_melee_weapon(*weapon); } int melee_attack::weapon_damage() |