diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-13 17:06:04 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-13 17:08:25 -0400 |
| commit | 91dc028910c0aad4d40d9866268e7c82b3b70b8f (patch) | |
| tree | bfa59ad2d2dfa0a150fbe135222f867fb84e2b6c | |
| parent | 6c00423bc04891695e3beb87e275ae67d15fff63 (diff) | |
| download | crawl-ref-91dc028910c0aad4d40d9866268e7c82b3b70b8f.tar.gz crawl-ref-91dc028910c0aad4d40d9866268e7c82b3b70b8f.zip | |
Simplify.
| -rw-r--r-- | crawl-ref/source/cloud.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-abil.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 9f3676dde6..cb04b7e4f8 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -867,7 +867,7 @@ static bool _actor_cloud_immune(const actor *act, const cloud_struct &cloud) case CLOUD_GHOSTLY_FLAME: return act->holiness() == MH_UNDEAD // Don't let these guys kill themselves. - || (!player && act->as_monster()->type == MONS_GHOST_CRAB); + || act->type == MONS_GHOST_CRAB; case CLOUD_ACID: return act->res_acid() > 0; case CLOUD_STORM: diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 035fb7d1ec..d8fefcd9b9 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -3804,9 +3804,7 @@ bool mon_special_ability(monster* mons, bolt & beem) { setup_mons_cast(mons, beem, spell); - if (mons->type == MONS_FIRE_CRAB - || mons->type == MONS_APOCALYPSE_CRAB - || mons->type == MONS_GHOST_CRAB) + if (mons_genus(mons->type) == MONS_CRAB) { beem.is_big_cloud = true; beem.damage = dice_def(1, (mons->hit_dice*3)/2); |