diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-02-25 15:04:32 +0000 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-02-25 15:19:46 +0000 |
| commit | 6057bb569af1c1f8a77e8359566da58dea4517a7 (patch) | |
| tree | ed68c0a570c36af2ec914524facc084e4d18b9f1 /crawl-ref/source/art-func.h | |
| parent | 34e5dbe409485d8f0a69f5d486c04bb055013fa6 (diff) | |
| download | crawl-ref-6057bb569af1c1f8a77e8359566da58dea4517a7.tar.gz crawl-ref-6057bb569af1c1f8a77e8359566da58dea4517a7.zip | |
Unduplicate an antimagic check
Since it's needed in a bunch of different places now.
Diffstat (limited to 'crawl-ref/source/art-func.h')
| -rw-r--r-- | crawl-ref/source/art-func.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index 7d1acb6723..c5a89120fc 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -971,9 +971,7 @@ static void _SPELLBINDER_melee_effects(item_def* weapon, actor* attacker, { // Only cause miscasts if the target has magic to disrupt. if ((defender->is_player() - || (defender->as_monster()->can_use_spells() - && !defender->as_monster()->is_priest() - && !mons_class_flag(defender->type, M_FAKE_SPELLS))) + || mons_antimagic_affected(defender->as_monster())) && !mondied) { int school = SPTYP_NONE; |