diff options
| author | Policarpo Caballero <policarpocp@gmail.com> | 2014-07-09 20:48:52 +0200 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-09 17:32:00 -0400 |
| commit | 73a505eef1cf84386b15891ee12e59fc21665f7f (patch) | |
| tree | a18929f93b7ab727c70a6cd0ddadebd74e6d038f /crawl-ref/source/melee_attack.cc | |
| parent | 8a68b8832c0205cbe584405a54a5ddbe0426e875 (diff) | |
| download | crawl-ref-73a505eef1cf84386b15891ee12e59fc21665f7f.tar.gz crawl-ref-73a505eef1cf84386b15891ee12e59fc21665f7f.zip | |
Fix magical staves always doing 0 damage (#8771)
Diffstat (limited to 'crawl-ref/source/melee_attack.cc')
| -rw-r--r-- | crawl-ref/source/melee_attack.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index 569e96e516..24c718a58f 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -3944,7 +3944,8 @@ 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_RODS + || weapon->base_type == OBJ_STAVES); } int melee_attack::weapon_damage() |