diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-12 20:16:45 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-13 00:33:57 -0700 |
| commit | 9b6b733bccd0de2af35eb6c28e94e4708a92004d (patch) | |
| tree | 30400b1991c700b09fff5dc4644dc43a2c693121 /crawl-ref/source/player-act.cc | |
| parent | 3663d864c83a72c7cf624617e9a9a5b8b5deaf6a (diff) | |
| download | crawl-ref-9b6b733bccd0de2af35eb6c28e94e4708a92004d.tar.gz crawl-ref-9b6b733bccd0de2af35eb6c28e94e4708a92004d.zip | |
Refactor weapon_skill()
This function was misleadingly named (it only provided the skill
used for melee weapons, not ranged weapons), and incomplete;
code along the lines of "is_ranged_weapon(*it) ? range_skill(*it)
: weapon_skill(*it)" was scattered in about half a dozen different
functions. I've corrected both of those problems (renaming weapon_
skill() to melee_skill() and adding item_weapon_skill()), and also
possibly fixed two bugs in the process - an l_you.cc function that
claimed to provide the skill used for the starting weapon (but
actually only gave the melee skill), and unrand creation code that
checked if a potential unrand swap used the same (melee) skill as
the weapon type being generated.
Diffstat (limited to 'crawl-ref/source/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index c4b4c57e26..4890b519c6 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -320,9 +320,7 @@ random_var player::attack_delay(item_def *weap, item_def *projectile, || projectile && is_launched(this, weap, *projectile) == LRET_LAUNCHED)) { - const skill_type wpn_skill = is_range_weapon(*weap) - ? range_skill(*weap) - : weapon_skill(*weap); + const skill_type wpn_skill = item_attack_skill(*weap); attk_delay = constant(property(*weap, PWPN_SPEED)); attk_delay -= div_rand_round(constant(you.skill(wpn_skill, 10)), 20); |