diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-16 21:08:32 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-27 17:02:33 -0600 |
| commit | fde016144d74dc363d43e65ef647e980391aeadc (patch) | |
| tree | 49d3673f03e94bc9c7cd3d9e52233b11288cb366 /crawl-ref/source/evoke.cc | |
| parent | ec5b00754ba4caf6cd637a454de3f9989dd7ea0f (diff) | |
| download | crawl-ref-fde016144d74dc363d43e65ef647e980391aeadc.tar.gz crawl-ref-fde016144d74dc363d43e65ef647e980391aeadc.zip | |
Ranged weapon delay.
Moves the delay calculations into player and monster respectively so
that it can properly be done at the start of the ranged attack; it
doesn't make sense to have them in attack or ranged_attack.
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 c675e081cf..dc44ede148 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))) |