diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-28 14:13:10 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-04-28 14:13:10 -0600 |
| commit | 730cb5fe10b2ca919f970df9d0060cb200bd28f2 (patch) | |
| tree | c9a4c9896a624973c224721bd56c5872603560e5 /crawl-ref/source/ranged_attack.cc | |
| parent | 19d9593722dfe82112d23ee1b5122686c17eedfc (diff) | |
| download | crawl-ref-730cb5fe10b2ca919f970df9d0060cb200bd28f2.tar.gz crawl-ref-730cb5fe10b2ca919f970df9d0060cb200bd28f2.zip | |
Don't crash on throwing flame/frost projectiles without a weapon.
Diffstat (limited to 'crawl-ref/source/ranged_attack.cc')
| -rw-r--r-- | crawl-ref/source/ranged_attack.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/ranged_attack.cc b/crawl-ref/source/ranged_attack.cc index fb6126b652..72d8189b10 100644 --- a/crawl-ref/source/ranged_attack.cc +++ b/crawl-ref/source/ranged_attack.cc @@ -620,8 +620,9 @@ bool ranged_attack::apply_missile_brand() default: break; case SPMSL_FLAME: - if (get_weapon_brand(*weapon) == SPWPN_FROST - || get_weapon_brand(*weapon) == SPWPN_FREEZING) + if (weapon && using_weapon() + && (get_weapon_brand(*weapon) == SPWPN_FROST + || get_weapon_brand(*weapon) == SPWPN_FREEZING)) { break; } @@ -632,8 +633,9 @@ bool ranged_attack::apply_missile_brand() attacker->god_conduct(DID_FIRE, 1); break; case SPMSL_FROST: - if (get_weapon_brand(*weapon) == SPWPN_FLAME - || get_weapon_brand(*weapon) == SPWPN_FLAMING) + if (weapon && using_weapon() + && (get_weapon_brand(*weapon) == SPWPN_FLAME + || get_weapon_brand(*weapon) == SPWPN_FLAMING)) { break; } |