summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-05-03 19:25:42 -0600
committerSteve Melenchuk <smelenchuk@gmail.com>2014-05-03 19:25:42 -0600
commit0f93d02d5034dbf2bd699b281f681dc87a1035f9 (patch)
tree95b7c02d1145aa2d737fbc34c3b866e5bb721137 /crawl-ref/source/fight.cc
parent875a5fb0aa8d592babb9576bd10582755a2fee0d (diff)
parentc25b44933056be6f2017e743b292699b9b859b0d (diff)
downloadcrawl-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/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 69de0765b4..53a911d78a 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -680,9 +680,6 @@ void attack_cleave_targets(actor* attacker, list<actor*> &targets,
int weapon_min_delay(const item_def &weapon)
{
- if (is_range_weapon(weapon))
- return range_skill(weapon) == SK_BOWS ? 6 : 7;
-
const int base = property(weapon, PWPN_SPEED);
int min_delay = base/2;