summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_item.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-12 20:16:45 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-13 00:33:57 -0700
commit9b6b733bccd0de2af35eb6c28e94e4708a92004d (patch)
tree30400b1991c700b09fff5dc4644dc43a2c693121 /crawl-ref/source/l_item.cc
parent3663d864c83a72c7cf624617e9a9a5b8b5deaf6a (diff)
downloadcrawl-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/l_item.cc')
-rw-r--r--crawl-ref/source/l_item.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc
index bfb47913da..413f086c4c 100644
--- a/crawl-ref/source/l_item.cc
+++ b/crawl-ref/source/l_item.cc
@@ -501,9 +501,7 @@ IDEF(weap_skill)
if (!item || !item->defined())
return 0;
- skill_type skill = range_skill(*item);
- if (skill == SK_THROWING)
- skill = weapon_skill(*item);
+ const skill_type skill = item_attack_skill(*item);
if (skill == SK_FIGHTING)
return 0;