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/main.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/main.cc')
| -rw-r--r-- | crawl-ref/source/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 3b5f5d4841..0e5fca3055 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -2580,7 +2580,7 @@ static bool _untrap_target(const coord_def move, bool check_confused) else { list<actor*> cleave_targets; - if (you.weapon() && weapon_skill(*you.weapon()) == SK_AXES + if (you.weapon() && melee_skill(*you.weapon()) == SK_AXES && !you.confused()) { get_all_cleave_targets(&you, target, cleave_targets); |