diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-13 16:26:34 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-13 16:31:26 -0400 |
| commit | bb605ee8c97a1a2e95ff60a834a8d5aa76a990dd (patch) | |
| tree | abed811a0c7eb1dfc901de249b798436de021a81 /crawl-ref/source/ranged_attack.cc | |
| parent | 5438851da1b9a448c384bbeb5e1589009808bbca (diff) | |
| download | crawl-ref-bb605ee8c97a1a2e95ff60a834a8d5aa76a990dd.tar.gz crawl-ref-bb605ee8c97a1a2e95ff60a834a8d5aa76a990dd.zip | |
Don't give launcher penetration to thrown missiles (#8679)
Diffstat (limited to 'crawl-ref/source/ranged_attack.cc')
| -rw-r--r-- | crawl-ref/source/ranged_attack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/ranged_attack.cc b/crawl-ref/source/ranged_attack.cc index 6e03cbee38..9ee36b2521 100644 --- a/crawl-ref/source/ranged_attack.cc +++ b/crawl-ref/source/ranged_attack.cc @@ -388,9 +388,9 @@ int ranged_attack::apply_damage_modifiers(int damage, int damage_max, bool ranged_attack::attack_ignores_shield(bool verbose) { if (is_launched(attacker, weapon, *projectile) != LRET_FUMBLED - && (weapon && get_weapon_brand(*weapon) == SPWPN_PENETRATION - || projectile->base_type == OBJ_MISSILES - && get_ammo_brand(*projectile) == SPMSL_PENETRATION)) + && projectile->base_type == OBJ_MISSILES + && get_ammo_brand(*projectile) == SPMSL_PENETRATION + || using_weapon() && get_weapon_brand(*weapon) == SPWPN_PENETRATION) { if (verbose) { |