summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dungeon.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-06-13 13:55:29 -0400
committerNeil Moore <neil@s-z.org>2014-06-13 15:04:43 -0400
commit474e196d370d63912d8a217ad7022c427afa3723 (patch)
treed7452a059609201cd22ca44321c43749a5d0b375 /crawl-ref/source/dungeon.cc
parentc271eae8558a0457b7fe8865c1ccba8503030758 (diff)
downloadcrawl-ref-474e196d370d63912d8a217ad7022c427afa3723.tar.gz
crawl-ref-474e196d370d63912d8a217ad7022c427afa3723.zip
Respect M_NO_GEN_DERIVED in a few more places.
Ghostly Flame spectrals, and Crypt level-gen zombies. For the latter, also respect M_NO_ZOMBIE just as we respect M_NO_SKELETON.
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
-rw-r--r--crawl-ref/source/dungeon.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 00ca154904..1b3c91dbcb 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3936,7 +3936,8 @@ static void _place_assorted_zombies()
monster_type z_base;
do
z_base = pick_random_zombie();
- while (skel && !mons_skeleton(z_base));
+ while (mons_class_flag(z_base, M_NO_GEN_DERIVED)
+ || !(skel ? mons_skeleton(z_base) : mons_zombifiable(z_base)));
mgen_data mg;
mg.cls = (skel ? MONS_SKELETON : MONS_ZOMBIE);