diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-03 19:25:42 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-03 19:25:42 -0600 |
| commit | 0f93d02d5034dbf2bd699b281f681dc87a1035f9 (patch) | |
| tree | 95b7c02d1145aa2d737fbc34c3b866e5bb721137 /crawl-ref/source/evoke.cc | |
| parent | 875a5fb0aa8d592babb9576bd10582755a2fee0d (diff) | |
| parent | c25b44933056be6f2017e743b292699b9b859b0d (diff) | |
| download | crawl-ref-0f93d02d5034dbf2bd699b281f681dc87a1035f9.tar.gz crawl-ref-0f93d02d5034dbf2bd699b281f681dc87a1035f9.zip | |
Merge branch 'ranged_combat'
The implementation is done; from here on out it's all balance work, and
that's better done in trunk.
Release the ogre hordes!
Diffstat (limited to 'crawl-ref/source/evoke.cc')
| -rw-r--r-- | crawl-ref/source/evoke.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/evoke.cc b/crawl-ref/source/evoke.cc index d7322b8258..12f0b76234 100644 --- a/crawl-ref/source/evoke.cc +++ b/crawl-ref/source/evoke.cc @@ -140,8 +140,7 @@ static bool _reaching_weapon_attack(const item_def& wpn) } // Calculate attack delay now in case we have to apply it. - melee_attack attk(&you, NULL); - const int attack_delay = attk.calc_attack_delay(); + const int attack_delay = you.attack_delay(you.weapon()); if (!feat_is_reachable_past(grd(first_middle)) && !feat_is_reachable_past(grd(second_middle))) |