diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-04-06 15:56:02 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-04-06 15:56:02 +0100 |
| commit | 321726ba14f969ff5cdaf71463230e76712debe0 (patch) | |
| tree | 94888b93ba63bf20c5a5729b2ff12d304b6b9623 /crawl-ref/source/mon-util.cc | |
| parent | 5da97b904b4f704eb234c2262211556d95e959d5 (diff) | |
| download | crawl-ref-321726ba14f969ff5cdaf71463230e76712debe0.tar.gz crawl-ref-321726ba14f969ff5cdaf71463230e76712debe0.zip | |
Clean up a check for conjured monsters
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index b1ec3c8ef2..cf26f20b15 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1205,13 +1205,11 @@ bool mons_is_demonspawn(monster_type mc) bool mons_is_conjured(monster_type mc) { return mons_is_projectile(mc) + || mons_is_avatar(mc) || mc == MONS_FIRE_VORTEX || mc == MONS_SPATIAL_VORTEX || mc == MONS_BALL_LIGHTNING - || mc == MONS_BATTLESPHERE - || mc == MONS_SPECTRAL_WEAPON - || mc == MONS_FULMINANT_PRISM - || mc == MONS_GRAND_AVATAR; + || mc == MONS_FULMINANT_PRISM; } // Returns true if the given monster's foe is also a monster. |