diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-11-01 18:24:42 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-11-01 18:24:42 +0100 |
| commit | bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417 (patch) | |
| tree | 2d4f6b41f802401ba3f76e9f71e03ad25efd71e1 /crawl-ref/source/actor.cc | |
| parent | 3bf288448a8a98d7f1b2db89711c778cf335b18c (diff) | |
| parent | d201e361eac08bd032e84322fd2baef71ea63227 (diff) | |
| download | crawl-ref-bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417.tar.gz crawl-ref-bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417.zip | |
Merge branch 'master' into dwants
Diffstat (limited to 'crawl-ref/source/actor.cc')
| -rw-r--r-- | crawl-ref/source/actor.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc index e8aa1ae2cf..3d92ff3df4 100644 --- a/crawl-ref/source/actor.cc +++ b/crawl-ref/source/actor.cc @@ -344,12 +344,12 @@ bool actor::warding(bool calc_unid, bool items) const || wearing(EQ_STAFF, STAFF_SUMMONING, calc_unid)); } -bool actor::archmagi(bool calc_unid, bool items) const +int actor::archmagi(bool calc_unid, bool items) const { - if (suppressed()) - items = false; + if (suppressed() || !items) + return 0; - return items && wearing_ego(EQ_BODY_ARMOUR, SPARM_ARCHMAGI, calc_unid); + return wearing_ego(EQ_ALL_ARMOUR, SPARM_ARCHMAGI, calc_unid); } bool actor::no_cast(bool calc_unid, bool items) const @@ -393,6 +393,14 @@ int actor::evokable_flight(bool calc_unid) const + scan_artefacts(ARTP_FLY, calc_unid); } +int actor::evokable_jump(bool calc_unid) const +{ + if (suppressed()) + return 0; + + return wearing_ego(EQ_ALL_ARMOUR, SPARM_JUMPING, calc_unid); +} + int actor::spirit_shield(bool calc_unid, bool items) const { int ss = 0; |