From 1de3f0a488030ac3c1508b840ee55756fa13b84f Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 24 Sep 2009 11:41:35 -0500 Subject: Simplify. --- crawl-ref/source/mon-util.cc | 2 +- crawl-ref/source/mstuff2.cc | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index ae70c01d18..2606cb7190 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -286,7 +286,7 @@ mon_resist_def get_mons_resists(const monsters *mon) { mon_resist_def resists; if (mons_is_ghost_demon(mon->type)) - resists = (mon->ghost->resists); + resists = mon->ghost->resists; else resists = mon_resist_def(); diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index cb88e2ea8e..7c618ff568 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -2672,10 +2672,14 @@ void mons_clear_trapping_net(monsters *mon) bool mons_clonable(const monsters* mon, bool needs_adjacent) { - // No uniques, pandemonium lords or player ghosts. Also, figuring - // out the name for the clone of a named monster isn't worth it. - if (mons_is_unique(mon->type) || mon->is_named() || mon->ghost.get()) + // No uniques or ghost demon monsters. Also, figuring out the name + // for the clone of a named monster isn't worth it. + if (mons_is_unique(mon->type) + || mons_is_ghost_demon(mon->type) + || mon->is_named()) + { return (false); + } if (needs_adjacent) { -- cgit v1.2.3-54-g00ecf